Generated javadoc
diff --git a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/AmaltheaIndex.html b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/AmaltheaIndex.html
index d547c96..cb74dbc 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/AmaltheaIndex.html
+++ b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/AmaltheaIndex.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Mon Apr 29 15:43:39 CEST 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:26:59 CEST 2019 -->
 <title>AmaltheaIndex</title>
-<meta name="date" content="2019-04-29">
+<meta name="date" content="2019-07-31">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 </head>
 <body>
@@ -56,6 +56,12 @@
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>static void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="#buildIndex-org.eclipse.emf.common.notify.Notifier-">buildIndex</a></span>(@NonNull Notifier&nbsp;context)</code>
+<div class="block">Creates the index explicitly.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>static void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#delete-org.eclipse.emf.ecore.EObject-">delete</a></span>(@NonNull EObject&nbsp;eObject)</code>
 <div class="block">Deletes the object from its <code>containing</code> resource
  and/or its <code>containing</code> object as well as from any
@@ -63,7 +69,7 @@
  (resource set, resource or root object).</div>
 </td>
 </tr>
-<tr id="i1" class="rowColor">
+<tr id="i2" class="altColor">
 <td class="colFirst"><code>static void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#deleteAll-java.util.Collection-">deleteAll</a></span>(@NonNull Collection&lt;? extends EObject&gt;&nbsp;eObjects)</code>
 <div class="block">Deletes the objects from their <code>containing</code> resource
@@ -72,7 +78,7 @@
  (resource set, resource or root object).</div>
 </td>
 </tr>
-<tr id="i2" class="altColor">
+<tr id="i3" class="rowColor">
 <td class="colFirst"><code>static void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#deleteAll-java.util.Collection-boolean-">deleteAll</a></span>(@NonNull Collection&lt;? extends EObject&gt;&nbsp;eObjects,
          boolean&nbsp;recursive)</code>
@@ -82,23 +88,31 @@
  (resource set, resource or root object).</div>
 </td>
 </tr>
-<tr id="i3" class="rowColor">
-<td class="colFirst"><code>static &lt;T extends INamed&gt;<br>Set&lt;? extends T&gt;</code></td>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>static void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="#dumpAdapterInfo-org.eclipse.emf.common.notify.Notifier-int-java.io.PrintStream-">dumpAdapterInfo</a></span>(@NonNull Notifier&nbsp;context,
+               int&nbsp;info,
+               @Nullable PrintStream&nbsp;stream)</code>
+<div class="block">Dumps adapter info to a print stream</div>
+</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>static &lt;T extends INamed&gt;<br>Set&lt;T&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#getElements-org.eclipse.emf.common.notify.Notifier-java.util.regex.Pattern-java.lang.Class-">getElements</a></span>(@NonNull Notifier&nbsp;context,
            @NonNull Pattern&nbsp;namePattern,
            @NonNull Class&lt;T&gt;&nbsp;targetClass)</code>
 <div class="block">Finds elements by name pattern and class</div>
 </td>
 </tr>
-<tr id="i4" class="altColor">
-<td class="colFirst"><code>static &lt;T extends INamed&gt;<br>Set&lt;? extends T&gt;</code></td>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>static &lt;T extends INamed&gt;<br>Set&lt;T&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#getElements-org.eclipse.emf.common.notify.Notifier-java.lang.String-java.lang.Class-">getElements</a></span>(@NonNull Notifier&nbsp;context,
            @NonNull String&nbsp;name,
            @NonNull Class&lt;T&gt;&nbsp;targetClass)</code>
 <div class="block">Finds elements by name and class</div>
 </td>
 </tr>
-<tr id="i5" class="rowColor">
+<tr id="i7" class="rowColor">
 <td class="colFirst"><code>static &lt;T&gt;&nbsp;EList&lt;T&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#getInverseReferences-org.eclipse.emf.ecore.EObject-org.eclipse.emf.ecore.EReference-java.util.Set-">getInverseReferences</a></span>(@NonNull EObject&nbsp;eObject,
                     @NonNull EReference&nbsp;resultEReference,
@@ -106,6 +120,37 @@
 <div class="block">Computes a list of objects that refer to an EObject via dedicated references.</div>
 </td>
 </tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><code>static List&lt;Set&lt;IReferable&gt;&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="#getObjectsWithConflictingNames-org.eclipse.emf.common.notify.Notifier-">getObjectsWithConflictingNames</a></span>(@NonNull Notifier&nbsp;context)</code>&nbsp;</td>
+</tr>
+<tr id="i9" class="rowColor">
+<td class="colFirst"><code>static Set&lt;EObject&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="#getReferringObjects-org.eclipse.emf.ecore.EObject-">getReferringObjects</a></span>(@NonNull EObject&nbsp;eObject)</code>
+<div class="block">Returns a set of objects that refer to the given <code>eObject</code>.</div>
+</td>
+</tr>
+<tr id="i10" class="altColor">
+<td class="colFirst"><code>static &lt;T extends EObject&gt;<br>Set&lt;T&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="#getReferringObjects-org.eclipse.emf.ecore.EObject-java.lang.Class-">getReferringObjects</a></span>(@NonNull EObject&nbsp;eObject,
+                   @NonNull Class&lt;T&gt;&nbsp;targetClass)</code>
+<div class="block">Returns a type filtered set of objects that refer to the given <code>eObject</code>.</div>
+</td>
+</tr>
+<tr id="i11" class="rowColor">
+<td class="colFirst"><code>static &lt;T extends EObject&gt;<br>Set&lt;T&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="#getReferringObjects-org.eclipse.emf.ecore.EObject-java.lang.Class-org.eclipse.emf.ecore.EReference-">getReferringObjects</a></span>(@NonNull EObject&nbsp;eObject,
+                   @NonNull Class&lt;T&gt;&nbsp;targetClass,
+                   @NonNull EReference&nbsp;targetEReference)</code>
+<div class="block">Returns a filtered set of objects that refer to the given <code>eObject</code>
+ 
+ Filters:
+ 
+ type (<code>targetClass</code>)
+ reference (<code>targetEReference</code>)
+ </div>
+</td>
+</tr>
 </table>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.Object">
@@ -151,6 +196,91 @@
 </dl>
 </li>
 </ul>
+<a name="getReferringObjects-org.eclipse.emf.ecore.EObject-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getReferringObjects</h4>
+<pre>public static&nbsp;Set&lt;EObject&gt;&nbsp;getReferringObjects(@NonNull EObject&nbsp;eObject)</pre>
+<div class="block">Returns a set of objects that refer to the given <code>eObject</code>.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>eObject</code> - </dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>Set of objects (EObject)</dd>
+</dl>
+</li>
+</ul>
+<a name="getReferringObjects-org.eclipse.emf.ecore.EObject-java.lang.Class-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getReferringObjects</h4>
+<pre>public static&nbsp;&lt;T extends EObject&gt;&nbsp;Set&lt;T&gt;&nbsp;getReferringObjects(@NonNull EObject&nbsp;eObject,
+                                                             @NonNull Class&lt;T&gt;&nbsp;targetClass)</pre>
+<div class="block">Returns a type filtered set of objects that refer to the given <code>eObject</code>.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>eObject</code> - </dd>
+<dd><code>targetClass</code> - </dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>Set of objects of given type <T extends EObject></dd>
+</dl>
+</li>
+</ul>
+<a name="getReferringObjects-org.eclipse.emf.ecore.EObject-java.lang.Class-org.eclipse.emf.ecore.EReference-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getReferringObjects</h4>
+<pre>public static&nbsp;&lt;T extends EObject&gt;&nbsp;Set&lt;T&gt;&nbsp;getReferringObjects(@NonNull EObject&nbsp;eObject,
+                                                             @NonNull Class&lt;T&gt;&nbsp;targetClass,
+                                                             @NonNull EReference&nbsp;targetEReference)</pre>
+<div class="block">Returns a filtered set of objects that refer to the given <code>eObject</code>
+ <p>
+ Filters:
+ <ul>
+ <li>type (<code>targetClass</code>)</li>
+ <li>reference (<code>targetEReference</code>)</li>
+ </ul></div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>eObject</code> - </dd>
+<dd><code>targetClass</code> - </dd>
+<dd><code>targetEReference</code> - </dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>Set of objects of given type <T extends EObject></dd>
+</dl>
+</li>
+</ul>
+<a name="getObjectsWithConflictingNames-org.eclipse.emf.common.notify.Notifier-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getObjectsWithConflictingNames</h4>
+<pre>public static&nbsp;List&lt;Set&lt;IReferable&gt;&gt;&nbsp;getObjectsWithConflictingNames(@NonNull Notifier&nbsp;context)</pre>
+</li>
+</ul>
+<a name="buildIndex-org.eclipse.emf.common.notify.Notifier-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>buildIndex</h4>
+<pre>public static&nbsp;void&nbsp;buildIndex(@NonNull Notifier&nbsp;context)</pre>
+<div class="block">Creates the index explicitly. If the index is already available the method will have no effect.
+ <p>
+ This method is optional. Normally the index will be built on demand.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>eObject</code> - </dd>
+</dl>
+</li>
+</ul>
 <a name="delete-org.eclipse.emf.ecore.EObject-">
 <!--   -->
 </a>
@@ -214,9 +344,9 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>getElements</h4>
-<pre>public static&nbsp;&lt;T extends INamed&gt;&nbsp;Set&lt;? extends T&gt;&nbsp;getElements(@NonNull Notifier&nbsp;context,
-                                                              @NonNull String&nbsp;name,
-                                                              @NonNull Class&lt;T&gt;&nbsp;targetClass)</pre>
+<pre>public static&nbsp;&lt;T extends INamed&gt;&nbsp;Set&lt;T&gt;&nbsp;getElements(@NonNull Notifier&nbsp;context,
+                                                    @NonNull String&nbsp;name,
+                                                    @NonNull Class&lt;T&gt;&nbsp;targetClass)</pre>
 <div class="block">Finds elements by name and class</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -231,12 +361,12 @@
 <a name="getElements-org.eclipse.emf.common.notify.Notifier-java.util.regex.Pattern-java.lang.Class-">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>getElements</h4>
-<pre>public static&nbsp;&lt;T extends INamed&gt;&nbsp;Set&lt;? extends T&gt;&nbsp;getElements(@NonNull Notifier&nbsp;context,
-                                                              @NonNull Pattern&nbsp;namePattern,
-                                                              @NonNull Class&lt;T&gt;&nbsp;targetClass)</pre>
+<pre>public static&nbsp;&lt;T extends INamed&gt;&nbsp;Set&lt;T&gt;&nbsp;getElements(@NonNull Notifier&nbsp;context,
+                                                    @NonNull Pattern&nbsp;namePattern,
+                                                    @NonNull Class&lt;T&gt;&nbsp;targetClass)</pre>
 <div class="block">Finds elements by name pattern and class</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -244,7 +374,28 @@
 <dd><code>namePattern</code> - for example: <code>Pattern.compile("Prefix_.*")</code></dd>
 <dd><code>targetClass</code> - for example: <code>Label.class</code></dd>
 <dt><span class="returnLabel">Returns:</span></dt>
-<dd>Set of named objects (IName)</dd>
+<dd>Set of named objects (INamed)</dd>
+</dl>
+</li>
+</ul>
+<a name="dumpAdapterInfo-org.eclipse.emf.common.notify.Notifier-int-java.io.PrintStream-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>dumpAdapterInfo</h4>
+<pre>public static&nbsp;void&nbsp;dumpAdapterInfo(@NonNull Notifier&nbsp;context,
+                                   int&nbsp;info,
+                                   @Nullable PrintStream&nbsp;stream)</pre>
+<div class="block">Dumps adapter info to a print stream</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>context</code> - EObject, Resource or ResourceSet</dd>
+<dd><code>info</code> - content selector <ul>
+                                        <li> 1 - basic adapter info (resources, size of maps)
+                                        <li> 2 - cross reference map
+                                        <li> 3 - name index </ul></dd>
+<dd><code>stream</code> - output stream (if undefined then <code>System.out</code> is used)</dd>
 </dl>
 </li>
 </ul>
diff --git a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/AmaltheaMerger.html b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/AmaltheaMerger.html
index a3ade3b..7a72f10 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/AmaltheaMerger.html
+++ b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/AmaltheaMerger.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Mon Apr 29 15:55:54 CEST 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:26:59 CEST 2019 -->
 <title>AmaltheaMerger</title>
-<meta name="date" content="2019-04-29">
+<meta name="date" content="2019-07-31">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/AmaltheaServices.html b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/AmaltheaServices.html
index 2380c94..9dd7ef0 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/AmaltheaServices.html
+++ b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/AmaltheaServices.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Mon Apr 29 15:55:54 CEST 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:26:59 CEST 2019 -->
 <title>AmaltheaServices</title>
-<meta name="date" content="2019-04-29">
+<meta name="date" content="2019-07-31">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/builder/AmaltheaBuilder.html b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/builder/AmaltheaBuilder.html
index 619bbc4..17c096f 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/builder/AmaltheaBuilder.html
+++ b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/builder/AmaltheaBuilder.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Mon Apr 29 15:55:54 CEST 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
 <title>AmaltheaBuilder</title>
-<meta name="date" content="2019-04-29">
+<meta name="date" content="2019-07-31">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/builder/CommonElementsBuilder.html b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/builder/CommonElementsBuilder.html
index 24d0b5e..a89b617 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/builder/CommonElementsBuilder.html
+++ b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/builder/CommonElementsBuilder.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Mon Apr 29 15:55:54 CEST 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
 <title>CommonElementsBuilder</title>
-<meta name="date" content="2019-04-29">
+<meta name="date" content="2019-07-31">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/builder/ConstraintsBuilder.html b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/builder/ConstraintsBuilder.html
index 7663ec0..c2cb232 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/builder/ConstraintsBuilder.html
+++ b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/builder/ConstraintsBuilder.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Mon Apr 29 15:55:54 CEST 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
 <title>ConstraintsBuilder</title>
-<meta name="date" content="2019-04-29">
+<meta name="date" content="2019-07-31">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
@@ -83,49 +83,64 @@
 </tr>
 <tr id="i3" class="rowColor">
 <td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="#eventChain-org.eclipse.app4mc.amalthea.model.ConstraintsModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">eventChain</a></span>(ConstraintsModel&nbsp;container,
+          Procedures.Procedure1&lt;EventChain&gt;&nbsp;initializer)</code>&nbsp;</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#limit_Count-org.eclipse.app4mc.amalthea.model.Requirement-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">limit_Count</a></span>(Requirement&nbsp;container,
            Procedures.Procedure1&lt;CountRequirementLimit&gt;&nbsp;initializer)</code>&nbsp;</td>
 </tr>
-<tr id="i4" class="altColor">
+<tr id="i5" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#limit_CPUPercentage-org.eclipse.app4mc.amalthea.model.Requirement-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">limit_CPUPercentage</a></span>(Requirement&nbsp;container,
                    Procedures.Procedure1&lt;CPUPercentageRequirementLimit&gt;&nbsp;initializer)</code>&nbsp;</td>
 </tr>
-<tr id="i5" class="rowColor">
+<tr id="i6" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#limit_Frequency-org.eclipse.app4mc.amalthea.model.Requirement-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">limit_Frequency</a></span>(Requirement&nbsp;container,
                Procedures.Procedure1&lt;FrequencyRequirementLimit&gt;&nbsp;initializer)</code>&nbsp;</td>
 </tr>
-<tr id="i6" class="altColor">
+<tr id="i7" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#limit_Percentage-org.eclipse.app4mc.amalthea.model.Requirement-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">limit_Percentage</a></span>(Requirement&nbsp;container,
                 Procedures.Procedure1&lt;PercentageRequirementLimit&gt;&nbsp;initializer)</code>&nbsp;</td>
 </tr>
-<tr id="i7" class="rowColor">
+<tr id="i8" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#limit_Time-org.eclipse.app4mc.amalthea.model.Requirement-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">limit_Time</a></span>(Requirement&nbsp;container,
           Procedures.Procedure1&lt;TimeRequirementLimit&gt;&nbsp;initializer)</code>&nbsp;</td>
 </tr>
-<tr id="i8" class="altColor">
+<tr id="i9" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#requirement_Architecture-org.eclipse.app4mc.amalthea.model.ConstraintsModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">requirement_Architecture</a></span>(ConstraintsModel&nbsp;container,
                         Procedures.Procedure1&lt;ArchitectureRequirement&gt;&nbsp;initializer)</code>&nbsp;</td>
 </tr>
-<tr id="i9" class="rowColor">
+<tr id="i10" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#requirement_Process-org.eclipse.app4mc.amalthea.model.ConstraintsModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">requirement_Process</a></span>(ConstraintsModel&nbsp;container,
                    Procedures.Procedure1&lt;ProcessRequirement&gt;&nbsp;initializer)</code>&nbsp;</td>
 </tr>
-<tr id="i10" class="altColor">
+<tr id="i11" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#requirement_ProcessChain-org.eclipse.app4mc.amalthea.model.ConstraintsModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">requirement_ProcessChain</a></span>(ConstraintsModel&nbsp;container,
                         Procedures.Procedure1&lt;ProcessChainRequirement&gt;&nbsp;initializer)</code>&nbsp;</td>
 </tr>
-<tr id="i11" class="rowColor">
+<tr id="i12" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#requirement_Runnable-org.eclipse.app4mc.amalthea.model.ConstraintsModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">requirement_Runnable</a></span>(ConstraintsModel&nbsp;container,
                     Procedures.Procedure1&lt;RunnableRequirement&gt;&nbsp;initializer)</code>&nbsp;</td>
 </tr>
+<tr id="i13" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="#segment_ref-org.eclipse.app4mc.amalthea.model.EventChain-org.eclipse.app4mc.amalthea.model.EventChain-">segment_ref</a></span>(EventChain&nbsp;container,
+           EventChain&nbsp;ref)</code>&nbsp;</td>
+</tr>
+<tr id="i14" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="#segment_subchain-org.eclipse.app4mc.amalthea.model.EventChain-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">segment_subchain</a></span>(EventChain&nbsp;container,
+                Procedures.Procedure1&lt;SubEventChain&gt;&nbsp;initializer)</code>&nbsp;</td>
+</tr>
 </table>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.Object">
@@ -280,13 +295,43 @@
 <a name="limit_CPUPercentage-org.eclipse.app4mc.amalthea.model.Requirement-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
 <!--   -->
 </a>
-<ul class="blockListLast">
+<ul class="blockList">
 <li class="blockList">
 <h4>limit_CPUPercentage</h4>
 <pre>public&nbsp;void&nbsp;limit_CPUPercentage(Requirement&nbsp;container,
                                 Procedures.Procedure1&lt;CPUPercentageRequirementLimit&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
+<a name="eventChain-org.eclipse.app4mc.amalthea.model.ConstraintsModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>eventChain</h4>
+<pre>public&nbsp;void&nbsp;eventChain(ConstraintsModel&nbsp;container,
+                       Procedures.Procedure1&lt;EventChain&gt;&nbsp;initializer)</pre>
+</li>
+</ul>
+<a name="segment_subchain-org.eclipse.app4mc.amalthea.model.EventChain-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>segment_subchain</h4>
+<pre>public&nbsp;void&nbsp;segment_subchain(EventChain&nbsp;container,
+                             Procedures.Procedure1&lt;SubEventChain&gt;&nbsp;initializer)</pre>
+</li>
+</ul>
+<a name="segment_ref-org.eclipse.app4mc.amalthea.model.EventChain-org.eclipse.app4mc.amalthea.model.EventChain-">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>segment_ref</h4>
+<pre>public&nbsp;void&nbsp;segment_ref(EventChain&nbsp;container,
+                        EventChain&nbsp;ref)</pre>
+</li>
+</ul>
 </li>
 </ul>
 </li>
diff --git a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/builder/DatatypeBuilder.html b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/builder/DatatypeBuilder.html
index 1aaf987..2d500fc 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/builder/DatatypeBuilder.html
+++ b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/builder/DatatypeBuilder.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Mon Apr 29 15:55:54 CEST 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
 <title>DatatypeBuilder</title>
-<meta name="date" content="2019-04-29">
+<meta name="date" content="2019-07-31">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/builder/HardwareBuilder.html b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/builder/HardwareBuilder.html
index d5191d3..dd3e54b 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/builder/HardwareBuilder.html
+++ b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/builder/HardwareBuilder.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Mon Apr 29 15:55:54 CEST 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
 <title>HardwareBuilder</title>
-<meta name="date" content="2019-04-29">
+<meta name="date" content="2019-07-31">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/builder/InstructionsBuilder.html b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/builder/InstructionsBuilder.html
index 6945b40..46aa21d 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/builder/InstructionsBuilder.html
+++ b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/builder/InstructionsBuilder.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Mon Apr 29 15:55:54 CEST 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
 <title>InstructionsBuilder</title>
-<meta name="date" content="2019-04-29">
+<meta name="date" content="2019-07-31">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/builder/MappingBuilder.html b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/builder/MappingBuilder.html
index 0ad2b01..b373a57 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/builder/MappingBuilder.html
+++ b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/builder/MappingBuilder.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Mon Apr 29 15:55:54 CEST 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
 <title>MappingBuilder</title>
-<meta name="date" content="2019-04-29">
+<meta name="date" content="2019-07-31">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/builder/OperatingSystemBuilder.html b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/builder/OperatingSystemBuilder.html
index a544378..ff6d876 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/builder/OperatingSystemBuilder.html
+++ b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/builder/OperatingSystemBuilder.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Mon Apr 29 15:55:55 CEST 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
 <title>OperatingSystemBuilder</title>
-<meta name="date" content="2019-04-29">
+<meta name="date" content="2019-07-31">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/builder/SoftwareBuilder.html b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/builder/SoftwareBuilder.html
index 671641a..b094361 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/builder/SoftwareBuilder.html
+++ b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/builder/SoftwareBuilder.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Mon Apr 29 15:55:55 CEST 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
 <title>SoftwareBuilder</title>
-<meta name="date" content="2019-04-29">
+<meta name="date" content="2019-07-31">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
@@ -96,393 +96,213 @@
 </tr>
 <tr id="i6" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#callSequence-org.eclipse.app4mc.amalthea.model.ModeSwitchDefault-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">callSequence</a></span>(ModeSwitchDefault&lt;GraphEntryBase&gt;&nbsp;container,
-            Procedures.Procedure1&lt;CallSequence&gt;&nbsp;initializer)</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="#asynchronousServerCall-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">asynchronousServerCall</a></span>(ICallGraphItemContainer&nbsp;container,
+                      Procedures.Procedure1&lt;AsynchronousServerCall&gt;&nbsp;initializer)</code>&nbsp;</td>
 </tr>
 <tr id="i7" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#callSequence-org.eclipse.app4mc.amalthea.model.ModeSwitchEntry-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">callSequence</a></span>(ModeSwitchEntry&lt;GraphEntryBase&gt;&nbsp;container,
-            Procedures.Procedure1&lt;CallSequence&gt;&nbsp;initializer)</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="#callGraph-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">callGraph</a></span>(Runnable&nbsp;container,
+         Procedures.Procedure1&lt;CallGraph&gt;&nbsp;initializer)</code>&nbsp;</td>
 </tr>
 <tr id="i8" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#callSequence-org.eclipse.app4mc.amalthea.model.ProbabilitySwitchEntry-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">callSequence</a></span>(ProbabilitySwitchEntry&lt;GraphEntryBase&gt;&nbsp;container,
-            Procedures.Procedure1&lt;CallSequence&gt;&nbsp;initializer)</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="#callGraph-org.eclipse.app4mc.amalthea.model.Task-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">callGraph</a></span>(Task&nbsp;container,
+         Procedures.Procedure1&lt;CallGraph&gt;&nbsp;initializer)</code>&nbsp;</td>
 </tr>
 <tr id="i9" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#callSequence-org.eclipse.app4mc.amalthea.model.Task-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">callSequence</a></span>(Task&nbsp;container,
-            Procedures.Procedure1&lt;CallSequence&gt;&nbsp;initializer)</code>&nbsp;</td>
-</tr>
-<tr id="i10" class="altColor">
-<td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#channel-org.eclipse.app4mc.amalthea.model.SWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">channel</a></span>(SWModel&nbsp;container,
        Procedures.Procedure1&lt;Channel&gt;&nbsp;initializer)</code>&nbsp;</td>
 </tr>
-<tr id="i11" class="rowColor">
+<tr id="i10" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#clearEvent-org.eclipse.app4mc.amalthea.model.CallSequence-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">clearEvent</a></span>(CallSequence&nbsp;container,
+<td class="colLast"><code><span class="memberNameLink"><a href="#clearEvent-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">clearEvent</a></span>(ICallGraphItemContainer&nbsp;container,
           Procedures.Procedure1&lt;ClearEvent&gt;&nbsp;initializer)</code>&nbsp;</td>
 </tr>
-<tr id="i12" class="altColor">
+<tr id="i11" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#defaultConstant-org.eclipse.app4mc.amalthea.model.Ticks-long-">defaultConstant</a></span>(Ticks&nbsp;container,
                long&nbsp;ticks)</code>&nbsp;</td>
 </tr>
-<tr id="i13" class="rowColor">
+<tr id="i12" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#defaultDeviation-org.eclipse.app4mc.amalthea.model.Ticks-org.eclipse.app4mc.amalthea.model.IDiscreteValueDeviation-">defaultDeviation</a></span>(Ticks&nbsp;container,
                 IDiscreteValueDeviation&nbsp;ticks)</code>&nbsp;</td>
 </tr>
-<tr id="i14" class="altColor">
+<tr id="i13" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#defaultEntry-org.eclipse.app4mc.amalthea.model.ModeSwitch-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">defaultEntry</a></span>(ModeSwitch&nbsp;container,
-            Procedures.Procedure1&lt;ModeSwitchDefault&lt;GraphEntryBase&gt;&gt;&nbsp;initializer)</code>&nbsp;</td>
+            Procedures.Procedure1&lt;ModeSwitchDefault&gt;&nbsp;initializer)</code>&nbsp;</td>
+</tr>
+<tr id="i14" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="#enforcedMigration-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">enforcedMigration</a></span>(ICallGraphItemContainer&nbsp;container,
+                 Procedures.Procedure1&lt;EnforcedMigration&gt;&nbsp;initializer)</code>&nbsp;</td>
 </tr>
 <tr id="i15" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#defaultEntry-org.eclipse.app4mc.amalthea.model.RunnableModeSwitch-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">defaultEntry</a></span>(RunnableModeSwitch&nbsp;container,
-            Procedures.Procedure1&lt;ModeSwitchDefault&lt;RunnableItem&gt;&gt;&nbsp;initializer)</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="#entry-org.eclipse.app4mc.amalthea.model.ModeSwitch-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">entry</a></span>(ModeSwitch&nbsp;container,
+     Procedures.Procedure1&lt;ModeSwitchEntry&gt;&nbsp;initializer)</code>&nbsp;</td>
 </tr>
 <tr id="i16" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#enforcedMigration-org.eclipse.app4mc.amalthea.model.CallSequence-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">enforcedMigration</a></span>(CallSequence&nbsp;container,
-                 Procedures.Procedure1&lt;EnforcedMigration&gt;&nbsp;initializer)</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="#entry-org.eclipse.app4mc.amalthea.model.ProbabilitySwitch-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">entry</a></span>(ProbabilitySwitch&nbsp;container,
+     Procedures.Procedure1&lt;ProbabilitySwitchEntry&gt;&nbsp;initializer)</code>&nbsp;</td>
 </tr>
 <tr id="i17" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#entry-org.eclipse.app4mc.amalthea.model.ModeSwitch-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">entry</a></span>(ModeSwitch&nbsp;container,
-     Procedures.Procedure1&lt;ModeSwitchEntry&lt;GraphEntryBase&gt;&gt;&nbsp;initializer)</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="#eventMask-org.eclipse.app4mc.amalthea.model.ClearEvent-org.eclipse.app4mc.amalthea.model.OsEvent...-">eventMask</a></span>(ClearEvent&nbsp;clearEvent,
+         OsEvent...&nbsp;osEvents)</code>&nbsp;</td>
 </tr>
 <tr id="i18" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#entry-org.eclipse.app4mc.amalthea.model.ProbabilitySwitch-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">entry</a></span>(ProbabilitySwitch&nbsp;container,
-     Procedures.Procedure1&lt;ProbabilitySwitchEntry&lt;GraphEntryBase&gt;&gt;&nbsp;initializer)</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="#eventMask-org.eclipse.app4mc.amalthea.model.SetEvent-org.eclipse.app4mc.amalthea.model.OsEvent...-">eventMask</a></span>(SetEvent&nbsp;setEvent,
+         OsEvent...&nbsp;osEvents)</code>&nbsp;</td>
 </tr>
 <tr id="i19" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#entry-org.eclipse.app4mc.amalthea.model.RunnableModeSwitch-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">entry</a></span>(RunnableModeSwitch&nbsp;container,
-     Procedures.Procedure1&lt;ModeSwitchEntry&lt;RunnableItem&gt;&gt;&nbsp;initializer)</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="#eventMask-org.eclipse.app4mc.amalthea.model.WaitEvent-org.eclipse.app4mc.amalthea.model.OsEvent...-">eventMask</a></span>(WaitEvent&nbsp;waitEvent,
+         OsEvent...&nbsp;osEvents)</code>&nbsp;</td>
 </tr>
 <tr id="i20" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#entry-org.eclipse.app4mc.amalthea.model.RunnableProbabilitySwitch-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">entry</a></span>(RunnableProbabilitySwitch&nbsp;container,
-     Procedures.Procedure1&lt;ProbabilitySwitchEntry&lt;RunnableItem&gt;&gt;&nbsp;initializer)</code>&nbsp;</td>
+<td class="colLast"><code><span class="memberNameLink"><a href="#execNeed-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">execNeed</a></span>(ICallGraphItemContainer&nbsp;container,
+        Procedures.Procedure1&lt;ExecutionNeed&gt;&nbsp;initializer)</code>&nbsp;</td>
 </tr>
 <tr id="i21" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#execNeed-org.eclipse.app4mc.amalthea.model.Group-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">execNeed</a></span>(Group&nbsp;container,
-        Procedures.Procedure1&lt;ExecutionNeed&gt;&nbsp;initializer)</code>&nbsp;</td>
-</tr>
-<tr id="i22" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#execNeed-org.eclipse.app4mc.amalthea.model.ModeSwitchDefault-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">execNeed</a></span>(ModeSwitchDefault&lt;RunnableItem&gt;&nbsp;container,
-        Procedures.Procedure1&lt;ExecutionNeed&gt;&nbsp;initializer)</code>&nbsp;</td>
-</tr>
-<tr id="i23" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#execNeed-org.eclipse.app4mc.amalthea.model.ModeSwitchEntry-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">execNeed</a></span>(ModeSwitchEntry&lt;RunnableItem&gt;&nbsp;container,
-        Procedures.Procedure1&lt;ExecutionNeed&gt;&nbsp;initializer)</code>&nbsp;</td>
-</tr>
-<tr id="i24" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#execNeed-org.eclipse.app4mc.amalthea.model.ProbabilitySwitchEntry-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">execNeed</a></span>(ProbabilitySwitchEntry&lt;RunnableItem&gt;&nbsp;container,
-        Procedures.Procedure1&lt;ExecutionNeed&gt;&nbsp;initializer)</code>&nbsp;</td>
-</tr>
-<tr id="i25" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#execNeed-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">execNeed</a></span>(Runnable&nbsp;container,
-        Procedures.Procedure1&lt;ExecutionNeed&gt;&nbsp;initializer)</code>&nbsp;</td>
-</tr>
-<tr id="i26" class="altColor">
-<td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#extended-org.eclipse.app4mc.amalthea.model.Ticks-org.eclipse.app4mc.amalthea.model.ProcessingUnitDefinition-org.eclipse.app4mc.amalthea.model.IDiscreteValueDeviation-">extended</a></span>(Ticks&nbsp;container,
         ProcessingUnitDefinition&nbsp;puDef,
         IDiscreteValueDeviation&nbsp;ticks)</code>&nbsp;</td>
 </tr>
-<tr id="i27" class="rowColor">
+<tr id="i22" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#group-org.eclipse.app4mc.amalthea.model.Group-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">group</a></span>(Group&nbsp;container,
+<td class="colLast"><code><span class="memberNameLink"><a href="#group-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">group</a></span>(ICallGraphItemContainer&nbsp;container,
      Procedures.Procedure1&lt;Group&gt;&nbsp;initializer)</code>&nbsp;</td>
 </tr>
-<tr id="i28" class="altColor">
+<tr id="i23" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#group-org.eclipse.app4mc.amalthea.model.ModeSwitchDefault-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">group</a></span>(ModeSwitchDefault&lt;RunnableItem&gt;&nbsp;container,
-     Procedures.Procedure1&lt;Group&gt;&nbsp;initializer)</code>&nbsp;</td>
-</tr>
-<tr id="i29" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#group-org.eclipse.app4mc.amalthea.model.ModeSwitchEntry-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">group</a></span>(ModeSwitchEntry&lt;RunnableItem&gt;&nbsp;container,
-     Procedures.Procedure1&lt;Group&gt;&nbsp;initializer)</code>&nbsp;</td>
-</tr>
-<tr id="i30" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#group-org.eclipse.app4mc.amalthea.model.ProbabilitySwitchEntry-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">group</a></span>(ProbabilitySwitchEntry&lt;RunnableItem&gt;&nbsp;container,
-     Procedures.Procedure1&lt;Group&gt;&nbsp;initializer)</code>&nbsp;</td>
-</tr>
-<tr id="i31" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#group-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">group</a></span>(Runnable&nbsp;container,
-     Procedures.Procedure1&lt;Group&gt;&nbsp;initializer)</code>&nbsp;</td>
-</tr>
-<tr id="i32" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#interProcessTrigger-org.eclipse.app4mc.amalthea.model.CallSequence-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">interProcessTrigger</a></span>(CallSequence&nbsp;container,
+<td class="colLast"><code><span class="memberNameLink"><a href="#interProcessTrigger-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">interProcessTrigger</a></span>(ICallGraphItemContainer&nbsp;container,
                    Procedures.Procedure1&lt;InterProcessTrigger&gt;&nbsp;initializer)</code>&nbsp;</td>
 </tr>
-<tr id="i33" class="rowColor">
+<tr id="i24" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#isr-org.eclipse.app4mc.amalthea.model.SWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">isr</a></span>(SWModel&nbsp;container,
    Procedures.Procedure1&lt;ISR&gt;&nbsp;initializer)</code>&nbsp;</td>
 </tr>
-<tr id="i34" class="altColor">
+<tr id="i25" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#label-org.eclipse.app4mc.amalthea.model.SWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">label</a></span>(SWModel&nbsp;container,
      Procedures.Procedure1&lt;Label&gt;&nbsp;initializer)</code>&nbsp;</td>
 </tr>
-<tr id="i35" class="rowColor">
+<tr id="i26" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#labelAccess-org.eclipse.app4mc.amalthea.model.Group-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">labelAccess</a></span>(Group&nbsp;container,
+<td class="colLast"><code><span class="memberNameLink"><a href="#labelAccess-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">labelAccess</a></span>(ICallGraphItemContainer&nbsp;container,
            Procedures.Procedure1&lt;LabelAccess&gt;&nbsp;initializer)</code>&nbsp;</td>
 </tr>
-<tr id="i36" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#labelAccess-org.eclipse.app4mc.amalthea.model.ModeSwitchDefault-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">labelAccess</a></span>(ModeSwitchDefault&lt;RunnableItem&gt;&nbsp;container,
-           Procedures.Procedure1&lt;LabelAccess&gt;&nbsp;initializer)</code>&nbsp;</td>
-</tr>
-<tr id="i37" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#labelAccess-org.eclipse.app4mc.amalthea.model.ModeSwitchEntry-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">labelAccess</a></span>(ModeSwitchEntry&lt;RunnableItem&gt;&nbsp;container,
-           Procedures.Procedure1&lt;LabelAccess&gt;&nbsp;initializer)</code>&nbsp;</td>
-</tr>
-<tr id="i38" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#labelAccess-org.eclipse.app4mc.amalthea.model.ProbabilitySwitchEntry-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">labelAccess</a></span>(ProbabilitySwitchEntry&lt;RunnableItem&gt;&nbsp;container,
-           Procedures.Procedure1&lt;LabelAccess&gt;&nbsp;initializer)</code>&nbsp;</td>
-</tr>
-<tr id="i39" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#labelAccess-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">labelAccess</a></span>(Runnable&nbsp;container,
-           Procedures.Procedure1&lt;LabelAccess&gt;&nbsp;initializer)</code>&nbsp;</td>
-</tr>
-<tr id="i40" class="altColor">
+<tr id="i27" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#literal-org.eclipse.app4mc.amalthea.model.EnumMode-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">literal</a></span>(EnumMode&nbsp;container,
        Procedures.Procedure1&lt;ModeLiteral&gt;&nbsp;initializer)</code>&nbsp;</td>
 </tr>
-<tr id="i41" class="rowColor">
+<tr id="i28" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#mode_Enum-org.eclipse.app4mc.amalthea.model.SWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">mode_Enum</a></span>(SWModel&nbsp;container,
          Procedures.Procedure1&lt;EnumMode&gt;&nbsp;initializer)</code>&nbsp;</td>
 </tr>
-<tr id="i42" class="altColor">
+<tr id="i29" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#mode_Numeric-org.eclipse.app4mc.amalthea.model.SWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">mode_Numeric</a></span>(SWModel&nbsp;container,
             Procedures.Procedure1&lt;NumericMode&gt;&nbsp;initializer)</code>&nbsp;</td>
 </tr>
-<tr id="i43" class="rowColor">
+<tr id="i30" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#modeLabel-org.eclipse.app4mc.amalthea.model.SWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">modeLabel</a></span>(SWModel&nbsp;container,
          Procedures.Procedure1&lt;ModeLabel&gt;&nbsp;initializer)</code>&nbsp;</td>
 </tr>
-<tr id="i44" class="altColor">
+<tr id="i31" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#modeSwitch-org.eclipse.app4mc.amalthea.model.ModeSwitchDefault-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">modeSwitch</a></span>(ModeSwitchDefault&lt;GraphEntryBase&gt;&nbsp;container,
+<td class="colLast"><code><span class="memberNameLink"><a href="#modeLabelAccess-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">modeLabelAccess</a></span>(ICallGraphItemContainer&nbsp;container,
+               Procedures.Procedure1&lt;ModeLabelAccess&gt;&nbsp;initializer)</code>&nbsp;</td>
+</tr>
+<tr id="i32" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="#modeSwitch-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">modeSwitch</a></span>(ICallGraphItemContainer&nbsp;container,
           Procedures.Procedure1&lt;ModeSwitch&gt;&nbsp;initializer)</code>&nbsp;</td>
 </tr>
-<tr id="i45" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#modeSwitch-org.eclipse.app4mc.amalthea.model.ModeSwitchEntry-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">modeSwitch</a></span>(ModeSwitchEntry&lt;GraphEntryBase&gt;&nbsp;container,
-          Procedures.Procedure1&lt;ModeSwitch&gt;&nbsp;initializer)</code>&nbsp;</td>
-</tr>
-<tr id="i46" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#modeSwitch-org.eclipse.app4mc.amalthea.model.ProbabilitySwitchEntry-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">modeSwitch</a></span>(ProbabilitySwitchEntry&lt;GraphEntryBase&gt;&nbsp;container,
-          Procedures.Procedure1&lt;ModeSwitch&gt;&nbsp;initializer)</code>&nbsp;</td>
-</tr>
-<tr id="i47" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#modeSwitch-org.eclipse.app4mc.amalthea.model.Task-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">modeSwitch</a></span>(Task&nbsp;container,
-          Procedures.Procedure1&lt;ModeSwitch&gt;&nbsp;initializer)</code>&nbsp;</td>
-</tr>
-<tr id="i48" class="altColor">
+<tr id="i33" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#need-org.eclipse.app4mc.amalthea.model.ExecutionNeed-java.lang.String-org.eclipse.app4mc.amalthea.model.IDiscreteValueDeviation-">need</a></span>(ExecutionNeed&nbsp;container,
     String&nbsp;key,
     IDiscreteValueDeviation&nbsp;need)</code>&nbsp;</td>
 </tr>
-<tr id="i49" class="rowColor">
+<tr id="i34" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="#osEvent-org.eclipse.app4mc.amalthea.model.SWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">osEvent</a></span>(SWModel&nbsp;container,
+       Procedures.Procedure1&lt;OsEvent&gt;&nbsp;initializer)</code>&nbsp;</td>
+</tr>
+<tr id="i35" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#parameter-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">parameter</a></span>(Runnable&nbsp;container,
          Procedures.Procedure1&lt;RunnableParameter&gt;&nbsp;initializer)</code>&nbsp;</td>
 </tr>
-<tr id="i50" class="altColor">
+<tr id="i36" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#probabilitySwitch-org.eclipse.app4mc.amalthea.model.ModeSwitchDefault-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">probabilitySwitch</a></span>(ModeSwitchDefault&lt;GraphEntryBase&gt;&nbsp;container,
+<td class="colLast"><code><span class="memberNameLink"><a href="#probabilitySwitch-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">probabilitySwitch</a></span>(ICallGraphItemContainer&nbsp;container,
                  Procedures.Procedure1&lt;ProbabilitySwitch&gt;&nbsp;initializer)</code>&nbsp;</td>
 </tr>
-<tr id="i51" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#probabilitySwitch-org.eclipse.app4mc.amalthea.model.ModeSwitchEntry-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">probabilitySwitch</a></span>(ModeSwitchEntry&lt;GraphEntryBase&gt;&nbsp;container,
-                 Procedures.Procedure1&lt;ProbabilitySwitch&gt;&nbsp;initializer)</code>&nbsp;</td>
-</tr>
-<tr id="i52" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#probabilitySwitch-org.eclipse.app4mc.amalthea.model.ProbabilitySwitchEntry-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">probabilitySwitch</a></span>(ProbabilitySwitchEntry&lt;GraphEntryBase&gt;&nbsp;container,
-                 Procedures.Procedure1&lt;ProbabilitySwitch&gt;&nbsp;initializer)</code>&nbsp;</td>
-</tr>
-<tr id="i53" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#probabilitySwitch-org.eclipse.app4mc.amalthea.model.Task-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">probabilitySwitch</a></span>(Task&nbsp;container,
-                 Procedures.Procedure1&lt;ProbabilitySwitch&gt;&nbsp;initializer)</code>&nbsp;</td>
-</tr>
-<tr id="i54" class="altColor">
+<tr id="i37" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#processPrototype-org.eclipse.app4mc.amalthea.model.SWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">processPrototype</a></span>(SWModel&nbsp;container,
                 Procedures.Procedure1&lt;ProcessPrototype&gt;&nbsp;initializer)</code>&nbsp;</td>
 </tr>
-<tr id="i55" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#runModeSwitch-org.eclipse.app4mc.amalthea.model.Group-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">runModeSwitch</a></span>(Group&nbsp;container,
-             Procedures.Procedure1&lt;RunnableModeSwitch&gt;&nbsp;initializer)</code>&nbsp;</td>
-</tr>
-<tr id="i56" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#runModeSwitch-org.eclipse.app4mc.amalthea.model.ModeSwitchDefault-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">runModeSwitch</a></span>(ModeSwitchDefault&lt;RunnableItem&gt;&nbsp;container,
-             Procedures.Procedure1&lt;RunnableModeSwitch&gt;&nbsp;initializer)</code>&nbsp;</td>
-</tr>
-<tr id="i57" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#runModeSwitch-org.eclipse.app4mc.amalthea.model.ModeSwitchEntry-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">runModeSwitch</a></span>(ModeSwitchEntry&lt;RunnableItem&gt;&nbsp;container,
-             Procedures.Procedure1&lt;RunnableModeSwitch&gt;&nbsp;initializer)</code>&nbsp;</td>
-</tr>
-<tr id="i58" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#runModeSwitch-org.eclipse.app4mc.amalthea.model.ProbabilitySwitchEntry-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">runModeSwitch</a></span>(ProbabilitySwitchEntry&lt;RunnableItem&gt;&nbsp;container,
-             Procedures.Procedure1&lt;RunnableModeSwitch&gt;&nbsp;initializer)</code>&nbsp;</td>
-</tr>
-<tr id="i59" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#runModeSwitch-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">runModeSwitch</a></span>(Runnable&nbsp;container,
-             Procedures.Procedure1&lt;RunnableModeSwitch&gt;&nbsp;initializer)</code>&nbsp;</td>
-</tr>
-<tr id="i60" class="altColor">
+<tr id="i38" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#runnable-org.eclipse.app4mc.amalthea.model.SWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">runnable</a></span>(SWModel&nbsp;container,
         Procedures.Procedure1&lt;Runnable&gt;&nbsp;initializer)</code>&nbsp;</td>
 </tr>
-<tr id="i61" class="rowColor">
+<tr id="i39" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#runnableCall-org.eclipse.app4mc.amalthea.model.CallSequence-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">runnableCall</a></span>(CallSequence&nbsp;container,
-            Procedures.Procedure1&lt;TaskRunnableCall&gt;&nbsp;initializer)</code>&nbsp;</td>
-</tr>
-<tr id="i62" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#runnableCall-org.eclipse.app4mc.amalthea.model.Group-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">runnableCall</a></span>(Group&nbsp;container,
+<td class="colLast"><code><span class="memberNameLink"><a href="#runnableCall-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">runnableCall</a></span>(ICallGraphItemContainer&nbsp;container,
             Procedures.Procedure1&lt;RunnableCall&gt;&nbsp;initializer)</code>&nbsp;</td>
 </tr>
-<tr id="i63" class="rowColor">
+<tr id="i40" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#runnableCall-org.eclipse.app4mc.amalthea.model.ModeSwitchDefault-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">runnableCall</a></span>(ModeSwitchDefault&lt;RunnableItem&gt;&nbsp;container,
-            Procedures.Procedure1&lt;RunnableCall&gt;&nbsp;initializer)</code>&nbsp;</td>
-</tr>
-<tr id="i64" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#runnableCall-org.eclipse.app4mc.amalthea.model.ModeSwitchEntry-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">runnableCall</a></span>(ModeSwitchEntry&lt;RunnableItem&gt;&nbsp;container,
-            Procedures.Procedure1&lt;RunnableCall&gt;&nbsp;initializer)</code>&nbsp;</td>
-</tr>
-<tr id="i65" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#runnableCall-org.eclipse.app4mc.amalthea.model.ProbabilitySwitchEntry-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">runnableCall</a></span>(ProbabilitySwitchEntry&lt;RunnableItem&gt;&nbsp;container,
-            Procedures.Procedure1&lt;RunnableCall&gt;&nbsp;initializer)</code>&nbsp;</td>
-</tr>
-<tr id="i66" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#runnableCall-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">runnableCall</a></span>(Runnable&nbsp;container,
-            Procedures.Procedure1&lt;RunnableCall&gt;&nbsp;initializer)</code>&nbsp;</td>
-</tr>
-<tr id="i67" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#runProbabilitySwitch-org.eclipse.app4mc.amalthea.model.Group-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">runProbabilitySwitch</a></span>(Group&nbsp;container,
-                    Procedures.Procedure1&lt;RunnableProbabilitySwitch&gt;&nbsp;initializer)</code>&nbsp;</td>
-</tr>
-<tr id="i68" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#runProbabilitySwitch-org.eclipse.app4mc.amalthea.model.ModeSwitchDefault-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">runProbabilitySwitch</a></span>(ModeSwitchDefault&lt;RunnableItem&gt;&nbsp;container,
-                    Procedures.Procedure1&lt;RunnableProbabilitySwitch&gt;&nbsp;initializer)</code>&nbsp;</td>
-</tr>
-<tr id="i69" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#runProbabilitySwitch-org.eclipse.app4mc.amalthea.model.ModeSwitchEntry-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">runProbabilitySwitch</a></span>(ModeSwitchEntry&lt;RunnableItem&gt;&nbsp;container,
-                    Procedures.Procedure1&lt;RunnableProbabilitySwitch&gt;&nbsp;initializer)</code>&nbsp;</td>
-</tr>
-<tr id="i70" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#runProbabilitySwitch-org.eclipse.app4mc.amalthea.model.ProbabilitySwitchEntry-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">runProbabilitySwitch</a></span>(ProbabilitySwitchEntry&lt;RunnableItem&gt;&nbsp;container,
-                    Procedures.Procedure1&lt;RunnableProbabilitySwitch&gt;&nbsp;initializer)</code>&nbsp;</td>
-</tr>
-<tr id="i71" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#runProbabilitySwitch-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">runProbabilitySwitch</a></span>(Runnable&nbsp;container,
-                    Procedures.Procedure1&lt;RunnableProbabilitySwitch&gt;&nbsp;initializer)</code>&nbsp;</td>
-</tr>
-<tr id="i72" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#schedulePoint-org.eclipse.app4mc.amalthea.model.CallSequence-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">schedulePoint</a></span>(CallSequence&nbsp;container,
+<td class="colLast"><code><span class="memberNameLink"><a href="#schedulePoint-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">schedulePoint</a></span>(ICallGraphItemContainer&nbsp;container,
              Procedures.Procedure1&lt;SchedulePoint&gt;&nbsp;initializer)</code>&nbsp;</td>
 </tr>
-<tr id="i73" class="rowColor">
+<tr id="i41" class="rowColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#section-org.eclipse.app4mc.amalthea.model.SWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">section</a></span>(SWModel&nbsp;container,
        Procedures.Procedure1&lt;Section&gt;&nbsp;initializer)</code>&nbsp;</td>
 </tr>
-<tr id="i74" class="altColor">
+<tr id="i42" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#setEvent-org.eclipse.app4mc.amalthea.model.CallSequence-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">setEvent</a></span>(CallSequence&nbsp;container,
+<td class="colLast"><code><span class="memberNameLink"><a href="#setEvent-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">setEvent</a></span>(ICallGraphItemContainer&nbsp;container,
         Procedures.Procedure1&lt;SetEvent&gt;&nbsp;initializer)</code>&nbsp;</td>
 </tr>
-<tr id="i75" class="rowColor">
+<tr id="i43" class="rowColor">
 <td class="colFirst"><code>SWModel</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#softwareModelRoot-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">softwareModelRoot</a></span>(Procedures.Procedure1&lt;SWModel&gt;&nbsp;initializer)</code>&nbsp;</td>
 </tr>
-<tr id="i76" class="altColor">
+<tr id="i44" class="altColor">
 <td class="colFirst"><code>void</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#task-org.eclipse.app4mc.amalthea.model.SWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">task</a></span>(SWModel&nbsp;container,
     Procedures.Procedure1&lt;Task&gt;&nbsp;initializer)</code>&nbsp;</td>
 </tr>
-<tr id="i77" class="rowColor">
+<tr id="i45" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#terminateProcess-org.eclipse.app4mc.amalthea.model.CallSequence-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">terminateProcess</a></span>(CallSequence&nbsp;container,
+<td class="colLast"><code><span class="memberNameLink"><a href="#terminateProcess-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">terminateProcess</a></span>(ICallGraphItemContainer&nbsp;container,
                 Procedures.Procedure1&lt;TerminateProcess&gt;&nbsp;initializer)</code>&nbsp;</td>
 </tr>
-<tr id="i78" class="altColor">
+<tr id="i46" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#ticks-org.eclipse.app4mc.amalthea.model.Group-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">ticks</a></span>(Group&nbsp;container,
+<td class="colLast"><code><span class="memberNameLink"><a href="#ticks-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">ticks</a></span>(ICallGraphItemContainer&nbsp;container,
      Procedures.Procedure1&lt;Ticks&gt;&nbsp;initializer)</code>&nbsp;</td>
 </tr>
-<tr id="i79" class="rowColor">
+<tr id="i47" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#ticks-org.eclipse.app4mc.amalthea.model.ModeSwitchDefault-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">ticks</a></span>(ModeSwitchDefault&lt;RunnableItem&gt;&nbsp;container,
-     Procedures.Procedure1&lt;Ticks&gt;&nbsp;initializer)</code>&nbsp;</td>
-</tr>
-<tr id="i80" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#ticks-org.eclipse.app4mc.amalthea.model.ModeSwitchEntry-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">ticks</a></span>(ModeSwitchEntry&lt;RunnableItem&gt;&nbsp;container,
-     Procedures.Procedure1&lt;Ticks&gt;&nbsp;initializer)</code>&nbsp;</td>
-</tr>
-<tr id="i81" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#ticks-org.eclipse.app4mc.amalthea.model.ProbabilitySwitchEntry-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">ticks</a></span>(ProbabilitySwitchEntry&lt;RunnableItem&gt;&nbsp;container,
-     Procedures.Procedure1&lt;Ticks&gt;&nbsp;initializer)</code>&nbsp;</td>
-</tr>
-<tr id="i82" class="altColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#ticks-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">ticks</a></span>(Runnable&nbsp;container,
-     Procedures.Procedure1&lt;Ticks&gt;&nbsp;initializer)</code>&nbsp;</td>
-</tr>
-<tr id="i83" class="rowColor">
-<td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#waitEvent-org.eclipse.app4mc.amalthea.model.CallSequence-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">waitEvent</a></span>(CallSequence&nbsp;container,
+<td class="colLast"><code><span class="memberNameLink"><a href="#waitEvent-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">waitEvent</a></span>(ICallGraphItemContainer&nbsp;container,
          Procedures.Procedure1&lt;WaitEvent&gt;&nbsp;initializer)</code>&nbsp;</td>
 </tr>
 </table>
@@ -693,6 +513,16 @@
                       Procedures.Procedure1&lt;ModeLabel&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
+<a name="osEvent-org.eclipse.app4mc.amalthea.model.SWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>osEvent</h4>
+<pre>public&nbsp;void&nbsp;osEvent(SWModel&nbsp;container,
+                    Procedures.Procedure1&lt;OsEvent&gt;&nbsp;initializer)</pre>
+</li>
+</ul>
 <a name="literal-org.eclipse.app4mc.amalthea.model.EnumMode-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
 <!--   -->
 </a>
@@ -703,83 +533,33 @@
                     Procedures.Procedure1&lt;ModeLiteral&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="callSequence-org.eclipse.app4mc.amalthea.model.Task-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a name="callGraph-org.eclipse.app4mc.amalthea.model.Task-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>callSequence</h4>
-<pre>public&nbsp;void&nbsp;callSequence(Task&nbsp;container,
-                         Procedures.Procedure1&lt;CallSequence&gt;&nbsp;initializer)</pre>
+<h4>callGraph</h4>
+<pre>public&nbsp;void&nbsp;callGraph(Task&nbsp;container,
+                      Procedures.Procedure1&lt;CallGraph&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="callSequence-org.eclipse.app4mc.amalthea.model.ModeSwitchDefault-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a name="callGraph-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>callSequence</h4>
-<pre>public&nbsp;void&nbsp;callSequence(ModeSwitchDefault&lt;GraphEntryBase&gt;&nbsp;container,
-                         Procedures.Procedure1&lt;CallSequence&gt;&nbsp;initializer)</pre>
+<h4>callGraph</h4>
+<pre>public&nbsp;void&nbsp;callGraph(Runnable&nbsp;container,
+                      Procedures.Procedure1&lt;CallGraph&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="callSequence-org.eclipse.app4mc.amalthea.model.ModeSwitchEntry-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>callSequence</h4>
-<pre>public&nbsp;void&nbsp;callSequence(ModeSwitchEntry&lt;GraphEntryBase&gt;&nbsp;container,
-                         Procedures.Procedure1&lt;CallSequence&gt;&nbsp;initializer)</pre>
-</li>
-</ul>
-<a name="callSequence-org.eclipse.app4mc.amalthea.model.ProbabilitySwitchEntry-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>callSequence</h4>
-<pre>public&nbsp;void&nbsp;callSequence(ProbabilitySwitchEntry&lt;GraphEntryBase&gt;&nbsp;container,
-                         Procedures.Procedure1&lt;CallSequence&gt;&nbsp;initializer)</pre>
-</li>
-</ul>
-<a name="modeSwitch-org.eclipse.app4mc.amalthea.model.Task-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a name="modeSwitch-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>modeSwitch</h4>
-<pre>public&nbsp;void&nbsp;modeSwitch(Task&nbsp;container,
-                       Procedures.Procedure1&lt;ModeSwitch&gt;&nbsp;initializer)</pre>
-</li>
-</ul>
-<a name="modeSwitch-org.eclipse.app4mc.amalthea.model.ModeSwitchDefault-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>modeSwitch</h4>
-<pre>public&nbsp;void&nbsp;modeSwitch(ModeSwitchDefault&lt;GraphEntryBase&gt;&nbsp;container,
-                       Procedures.Procedure1&lt;ModeSwitch&gt;&nbsp;initializer)</pre>
-</li>
-</ul>
-<a name="modeSwitch-org.eclipse.app4mc.amalthea.model.ModeSwitchEntry-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>modeSwitch</h4>
-<pre>public&nbsp;void&nbsp;modeSwitch(ModeSwitchEntry&lt;GraphEntryBase&gt;&nbsp;container,
-                       Procedures.Procedure1&lt;ModeSwitch&gt;&nbsp;initializer)</pre>
-</li>
-</ul>
-<a name="modeSwitch-org.eclipse.app4mc.amalthea.model.ProbabilitySwitchEntry-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>modeSwitch</h4>
-<pre>public&nbsp;void&nbsp;modeSwitch(ProbabilitySwitchEntry&lt;GraphEntryBase&gt;&nbsp;container,
+<pre>public&nbsp;void&nbsp;modeSwitch(ICallGraphItemContainer&nbsp;container,
                        Procedures.Procedure1&lt;ModeSwitch&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
@@ -790,7 +570,7 @@
 <li class="blockList">
 <h4>entry</h4>
 <pre>public&nbsp;void&nbsp;entry(ModeSwitch&nbsp;container,
-                  Procedures.Procedure1&lt;ModeSwitchEntry&lt;GraphEntryBase&gt;&gt;&nbsp;initializer)</pre>
+                  Procedures.Procedure1&lt;ModeSwitchEntry&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
 <a name="defaultEntry-org.eclipse.app4mc.amalthea.model.ModeSwitch-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
@@ -800,46 +580,16 @@
 <li class="blockList">
 <h4>defaultEntry</h4>
 <pre>public&nbsp;void&nbsp;defaultEntry(ModeSwitch&nbsp;container,
-                         Procedures.Procedure1&lt;ModeSwitchDefault&lt;GraphEntryBase&gt;&gt;&nbsp;initializer)</pre>
+                         Procedures.Procedure1&lt;ModeSwitchDefault&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="probabilitySwitch-org.eclipse.app4mc.amalthea.model.Task-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a name="probabilitySwitch-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>probabilitySwitch</h4>
-<pre>public&nbsp;void&nbsp;probabilitySwitch(Task&nbsp;container,
-                              Procedures.Procedure1&lt;ProbabilitySwitch&gt;&nbsp;initializer)</pre>
-</li>
-</ul>
-<a name="probabilitySwitch-org.eclipse.app4mc.amalthea.model.ModeSwitchDefault-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>probabilitySwitch</h4>
-<pre>public&nbsp;void&nbsp;probabilitySwitch(ModeSwitchDefault&lt;GraphEntryBase&gt;&nbsp;container,
-                              Procedures.Procedure1&lt;ProbabilitySwitch&gt;&nbsp;initializer)</pre>
-</li>
-</ul>
-<a name="probabilitySwitch-org.eclipse.app4mc.amalthea.model.ModeSwitchEntry-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>probabilitySwitch</h4>
-<pre>public&nbsp;void&nbsp;probabilitySwitch(ModeSwitchEntry&lt;GraphEntryBase&gt;&nbsp;container,
-                              Procedures.Procedure1&lt;ProbabilitySwitch&gt;&nbsp;initializer)</pre>
-</li>
-</ul>
-<a name="probabilitySwitch-org.eclipse.app4mc.amalthea.model.ProbabilitySwitchEntry-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>probabilitySwitch</h4>
-<pre>public&nbsp;void&nbsp;probabilitySwitch(ProbabilitySwitchEntry&lt;GraphEntryBase&gt;&nbsp;container,
+<pre>public&nbsp;void&nbsp;probabilitySwitch(ICallGraphItemContainer&nbsp;container,
                               Procedures.Procedure1&lt;ProbabilitySwitch&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
@@ -850,89 +600,109 @@
 <li class="blockList">
 <h4>entry</h4>
 <pre>public&nbsp;void&nbsp;entry(ProbabilitySwitch&nbsp;container,
-                  Procedures.Procedure1&lt;ProbabilitySwitchEntry&lt;GraphEntryBase&gt;&gt;&nbsp;initializer)</pre>
+                  Procedures.Procedure1&lt;ProbabilitySwitchEntry&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="runnableCall-org.eclipse.app4mc.amalthea.model.CallSequence-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>runnableCall</h4>
-<pre>public&nbsp;void&nbsp;runnableCall(CallSequence&nbsp;container,
-                         Procedures.Procedure1&lt;TaskRunnableCall&gt;&nbsp;initializer)</pre>
-</li>
-</ul>
-<a name="schedulePoint-org.eclipse.app4mc.amalthea.model.CallSequence-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a name="schedulePoint-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>schedulePoint</h4>
-<pre>public&nbsp;void&nbsp;schedulePoint(CallSequence&nbsp;container,
+<pre>public&nbsp;void&nbsp;schedulePoint(ICallGraphItemContainer&nbsp;container,
                           Procedures.Procedure1&lt;SchedulePoint&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="interProcessTrigger-org.eclipse.app4mc.amalthea.model.CallSequence-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a name="interProcessTrigger-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>interProcessTrigger</h4>
-<pre>public&nbsp;void&nbsp;interProcessTrigger(CallSequence&nbsp;container,
+<pre>public&nbsp;void&nbsp;interProcessTrigger(ICallGraphItemContainer&nbsp;container,
                                 Procedures.Procedure1&lt;InterProcessTrigger&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="enforcedMigration-org.eclipse.app4mc.amalthea.model.CallSequence-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a name="enforcedMigration-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>enforcedMigration</h4>
-<pre>public&nbsp;void&nbsp;enforcedMigration(CallSequence&nbsp;container,
+<pre>public&nbsp;void&nbsp;enforcedMigration(ICallGraphItemContainer&nbsp;container,
                               Procedures.Procedure1&lt;EnforcedMigration&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="terminateProcess-org.eclipse.app4mc.amalthea.model.CallSequence-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a name="terminateProcess-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>terminateProcess</h4>
-<pre>public&nbsp;void&nbsp;terminateProcess(CallSequence&nbsp;container,
+<pre>public&nbsp;void&nbsp;terminateProcess(ICallGraphItemContainer&nbsp;container,
                              Procedures.Procedure1&lt;TerminateProcess&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="clearEvent-org.eclipse.app4mc.amalthea.model.CallSequence-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a name="clearEvent-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>clearEvent</h4>
-<pre>public&nbsp;void&nbsp;clearEvent(CallSequence&nbsp;container,
+<pre>public&nbsp;void&nbsp;clearEvent(ICallGraphItemContainer&nbsp;container,
                        Procedures.Procedure1&lt;ClearEvent&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="waitEvent-org.eclipse.app4mc.amalthea.model.CallSequence-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a name="waitEvent-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>waitEvent</h4>
-<pre>public&nbsp;void&nbsp;waitEvent(CallSequence&nbsp;container,
+<pre>public&nbsp;void&nbsp;waitEvent(ICallGraphItemContainer&nbsp;container,
                       Procedures.Procedure1&lt;WaitEvent&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="setEvent-org.eclipse.app4mc.amalthea.model.CallSequence-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a name="setEvent-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>setEvent</h4>
-<pre>public&nbsp;void&nbsp;setEvent(CallSequence&nbsp;container,
+<pre>public&nbsp;void&nbsp;setEvent(ICallGraphItemContainer&nbsp;container,
                      Procedures.Procedure1&lt;SetEvent&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
+<a name="eventMask-org.eclipse.app4mc.amalthea.model.ClearEvent-org.eclipse.app4mc.amalthea.model.OsEvent...-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>eventMask</h4>
+<pre>public&nbsp;void&nbsp;eventMask(ClearEvent&nbsp;clearEvent,
+                      OsEvent...&nbsp;osEvents)</pre>
+</li>
+</ul>
+<a name="eventMask-org.eclipse.app4mc.amalthea.model.WaitEvent-org.eclipse.app4mc.amalthea.model.OsEvent...-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>eventMask</h4>
+<pre>public&nbsp;void&nbsp;eventMask(WaitEvent&nbsp;waitEvent,
+                      OsEvent...&nbsp;osEvents)</pre>
+</li>
+</ul>
+<a name="eventMask-org.eclipse.app4mc.amalthea.model.SetEvent-org.eclipse.app4mc.amalthea.model.OsEvent...-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>eventMask</h4>
+<pre>public&nbsp;void&nbsp;eventMask(SetEvent&nbsp;setEvent,
+                      OsEvent...&nbsp;osEvents)</pre>
+</li>
+</ul>
 <a name="parameter-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
 <!--   -->
 </a>
@@ -943,333 +713,63 @@
                       Procedures.Procedure1&lt;RunnableParameter&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="group-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a name="group-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>group</h4>
-<pre>public&nbsp;void&nbsp;group(Runnable&nbsp;container,
+<pre>public&nbsp;void&nbsp;group(ICallGraphItemContainer&nbsp;container,
                   Procedures.Procedure1&lt;Group&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="group-org.eclipse.app4mc.amalthea.model.Group-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>group</h4>
-<pre>public&nbsp;void&nbsp;group(Group&nbsp;container,
-                  Procedures.Procedure1&lt;Group&gt;&nbsp;initializer)</pre>
-</li>
-</ul>
-<a name="group-org.eclipse.app4mc.amalthea.model.ModeSwitchDefault-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>group</h4>
-<pre>public&nbsp;void&nbsp;group(ModeSwitchDefault&lt;RunnableItem&gt;&nbsp;container,
-                  Procedures.Procedure1&lt;Group&gt;&nbsp;initializer)</pre>
-</li>
-</ul>
-<a name="group-org.eclipse.app4mc.amalthea.model.ModeSwitchEntry-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>group</h4>
-<pre>public&nbsp;void&nbsp;group(ModeSwitchEntry&lt;RunnableItem&gt;&nbsp;container,
-                  Procedures.Procedure1&lt;Group&gt;&nbsp;initializer)</pre>
-</li>
-</ul>
-<a name="group-org.eclipse.app4mc.amalthea.model.ProbabilitySwitchEntry-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>group</h4>
-<pre>public&nbsp;void&nbsp;group(ProbabilitySwitchEntry&lt;RunnableItem&gt;&nbsp;container,
-                  Procedures.Procedure1&lt;Group&gt;&nbsp;initializer)</pre>
-</li>
-</ul>
-<a name="runModeSwitch-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>runModeSwitch</h4>
-<pre>public&nbsp;void&nbsp;runModeSwitch(Runnable&nbsp;container,
-                          Procedures.Procedure1&lt;RunnableModeSwitch&gt;&nbsp;initializer)</pre>
-</li>
-</ul>
-<a name="runModeSwitch-org.eclipse.app4mc.amalthea.model.Group-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>runModeSwitch</h4>
-<pre>public&nbsp;void&nbsp;runModeSwitch(Group&nbsp;container,
-                          Procedures.Procedure1&lt;RunnableModeSwitch&gt;&nbsp;initializer)</pre>
-</li>
-</ul>
-<a name="runModeSwitch-org.eclipse.app4mc.amalthea.model.ModeSwitchDefault-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>runModeSwitch</h4>
-<pre>public&nbsp;void&nbsp;runModeSwitch(ModeSwitchDefault&lt;RunnableItem&gt;&nbsp;container,
-                          Procedures.Procedure1&lt;RunnableModeSwitch&gt;&nbsp;initializer)</pre>
-</li>
-</ul>
-<a name="runModeSwitch-org.eclipse.app4mc.amalthea.model.ModeSwitchEntry-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>runModeSwitch</h4>
-<pre>public&nbsp;void&nbsp;runModeSwitch(ModeSwitchEntry&lt;RunnableItem&gt;&nbsp;container,
-                          Procedures.Procedure1&lt;RunnableModeSwitch&gt;&nbsp;initializer)</pre>
-</li>
-</ul>
-<a name="runModeSwitch-org.eclipse.app4mc.amalthea.model.ProbabilitySwitchEntry-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>runModeSwitch</h4>
-<pre>public&nbsp;void&nbsp;runModeSwitch(ProbabilitySwitchEntry&lt;RunnableItem&gt;&nbsp;container,
-                          Procedures.Procedure1&lt;RunnableModeSwitch&gt;&nbsp;initializer)</pre>
-</li>
-</ul>
-<a name="entry-org.eclipse.app4mc.amalthea.model.RunnableModeSwitch-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>entry</h4>
-<pre>public&nbsp;void&nbsp;entry(RunnableModeSwitch&nbsp;container,
-                  Procedures.Procedure1&lt;ModeSwitchEntry&lt;RunnableItem&gt;&gt;&nbsp;initializer)</pre>
-</li>
-</ul>
-<a name="defaultEntry-org.eclipse.app4mc.amalthea.model.RunnableModeSwitch-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>defaultEntry</h4>
-<pre>public&nbsp;void&nbsp;defaultEntry(RunnableModeSwitch&nbsp;container,
-                         Procedures.Procedure1&lt;ModeSwitchDefault&lt;RunnableItem&gt;&gt;&nbsp;initializer)</pre>
-</li>
-</ul>
-<a name="runProbabilitySwitch-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>runProbabilitySwitch</h4>
-<pre>public&nbsp;void&nbsp;runProbabilitySwitch(Runnable&nbsp;container,
-                                 Procedures.Procedure1&lt;RunnableProbabilitySwitch&gt;&nbsp;initializer)</pre>
-</li>
-</ul>
-<a name="runProbabilitySwitch-org.eclipse.app4mc.amalthea.model.Group-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>runProbabilitySwitch</h4>
-<pre>public&nbsp;void&nbsp;runProbabilitySwitch(Group&nbsp;container,
-                                 Procedures.Procedure1&lt;RunnableProbabilitySwitch&gt;&nbsp;initializer)</pre>
-</li>
-</ul>
-<a name="runProbabilitySwitch-org.eclipse.app4mc.amalthea.model.ModeSwitchDefault-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>runProbabilitySwitch</h4>
-<pre>public&nbsp;void&nbsp;runProbabilitySwitch(ModeSwitchDefault&lt;RunnableItem&gt;&nbsp;container,
-                                 Procedures.Procedure1&lt;RunnableProbabilitySwitch&gt;&nbsp;initializer)</pre>
-</li>
-</ul>
-<a name="runProbabilitySwitch-org.eclipse.app4mc.amalthea.model.ModeSwitchEntry-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>runProbabilitySwitch</h4>
-<pre>public&nbsp;void&nbsp;runProbabilitySwitch(ModeSwitchEntry&lt;RunnableItem&gt;&nbsp;container,
-                                 Procedures.Procedure1&lt;RunnableProbabilitySwitch&gt;&nbsp;initializer)</pre>
-</li>
-</ul>
-<a name="runProbabilitySwitch-org.eclipse.app4mc.amalthea.model.ProbabilitySwitchEntry-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>runProbabilitySwitch</h4>
-<pre>public&nbsp;void&nbsp;runProbabilitySwitch(ProbabilitySwitchEntry&lt;RunnableItem&gt;&nbsp;container,
-                                 Procedures.Procedure1&lt;RunnableProbabilitySwitch&gt;&nbsp;initializer)</pre>
-</li>
-</ul>
-<a name="entry-org.eclipse.app4mc.amalthea.model.RunnableProbabilitySwitch-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>entry</h4>
-<pre>public&nbsp;void&nbsp;entry(RunnableProbabilitySwitch&nbsp;container,
-                  Procedures.Procedure1&lt;ProbabilitySwitchEntry&lt;RunnableItem&gt;&gt;&nbsp;initializer)</pre>
-</li>
-</ul>
-<a name="labelAccess-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a name="labelAccess-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>labelAccess</h4>
-<pre>public&nbsp;void&nbsp;labelAccess(Runnable&nbsp;container,
+<pre>public&nbsp;void&nbsp;labelAccess(ICallGraphItemContainer&nbsp;container,
                         Procedures.Procedure1&lt;LabelAccess&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="labelAccess-org.eclipse.app4mc.amalthea.model.Group-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a name="modeLabelAccess-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>labelAccess</h4>
-<pre>public&nbsp;void&nbsp;labelAccess(Group&nbsp;container,
-                        Procedures.Procedure1&lt;LabelAccess&gt;&nbsp;initializer)</pre>
+<h4>modeLabelAccess</h4>
+<pre>public&nbsp;void&nbsp;modeLabelAccess(ICallGraphItemContainer&nbsp;container,
+                            Procedures.Procedure1&lt;ModeLabelAccess&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="labelAccess-org.eclipse.app4mc.amalthea.model.ModeSwitchDefault-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>labelAccess</h4>
-<pre>public&nbsp;void&nbsp;labelAccess(ModeSwitchDefault&lt;RunnableItem&gt;&nbsp;container,
-                        Procedures.Procedure1&lt;LabelAccess&gt;&nbsp;initializer)</pre>
-</li>
-</ul>
-<a name="labelAccess-org.eclipse.app4mc.amalthea.model.ModeSwitchEntry-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>labelAccess</h4>
-<pre>public&nbsp;void&nbsp;labelAccess(ModeSwitchEntry&lt;RunnableItem&gt;&nbsp;container,
-                        Procedures.Procedure1&lt;LabelAccess&gt;&nbsp;initializer)</pre>
-</li>
-</ul>
-<a name="labelAccess-org.eclipse.app4mc.amalthea.model.ProbabilitySwitchEntry-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>labelAccess</h4>
-<pre>public&nbsp;void&nbsp;labelAccess(ProbabilitySwitchEntry&lt;RunnableItem&gt;&nbsp;container,
-                        Procedures.Procedure1&lt;LabelAccess&gt;&nbsp;initializer)</pre>
-</li>
-</ul>
-<a name="runnableCall-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a name="runnableCall-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>runnableCall</h4>
-<pre>public&nbsp;void&nbsp;runnableCall(Runnable&nbsp;container,
+<pre>public&nbsp;void&nbsp;runnableCall(ICallGraphItemContainer&nbsp;container,
                          Procedures.Procedure1&lt;RunnableCall&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="runnableCall-org.eclipse.app4mc.amalthea.model.Group-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a name="asynchronousServerCall-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>runnableCall</h4>
-<pre>public&nbsp;void&nbsp;runnableCall(Group&nbsp;container,
-                         Procedures.Procedure1&lt;RunnableCall&gt;&nbsp;initializer)</pre>
+<h4>asynchronousServerCall</h4>
+<pre>public&nbsp;void&nbsp;asynchronousServerCall(ICallGraphItemContainer&nbsp;container,
+                                   Procedures.Procedure1&lt;AsynchronousServerCall&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="runnableCall-org.eclipse.app4mc.amalthea.model.ModeSwitchDefault-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>runnableCall</h4>
-<pre>public&nbsp;void&nbsp;runnableCall(ModeSwitchDefault&lt;RunnableItem&gt;&nbsp;container,
-                         Procedures.Procedure1&lt;RunnableCall&gt;&nbsp;initializer)</pre>
-</li>
-</ul>
-<a name="runnableCall-org.eclipse.app4mc.amalthea.model.ModeSwitchEntry-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>runnableCall</h4>
-<pre>public&nbsp;void&nbsp;runnableCall(ModeSwitchEntry&lt;RunnableItem&gt;&nbsp;container,
-                         Procedures.Procedure1&lt;RunnableCall&gt;&nbsp;initializer)</pre>
-</li>
-</ul>
-<a name="runnableCall-org.eclipse.app4mc.amalthea.model.ProbabilitySwitchEntry-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>runnableCall</h4>
-<pre>public&nbsp;void&nbsp;runnableCall(ProbabilitySwitchEntry&lt;RunnableItem&gt;&nbsp;container,
-                         Procedures.Procedure1&lt;RunnableCall&gt;&nbsp;initializer)</pre>
-</li>
-</ul>
-<a name="execNeed-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a name="execNeed-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>execNeed</h4>
-<pre>public&nbsp;void&nbsp;execNeed(Runnable&nbsp;container,
-                     Procedures.Procedure1&lt;ExecutionNeed&gt;&nbsp;initializer)</pre>
-</li>
-</ul>
-<a name="execNeed-org.eclipse.app4mc.amalthea.model.Group-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>execNeed</h4>
-<pre>public&nbsp;void&nbsp;execNeed(Group&nbsp;container,
-                     Procedures.Procedure1&lt;ExecutionNeed&gt;&nbsp;initializer)</pre>
-</li>
-</ul>
-<a name="execNeed-org.eclipse.app4mc.amalthea.model.ModeSwitchDefault-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>execNeed</h4>
-<pre>public&nbsp;void&nbsp;execNeed(ModeSwitchDefault&lt;RunnableItem&gt;&nbsp;container,
-                     Procedures.Procedure1&lt;ExecutionNeed&gt;&nbsp;initializer)</pre>
-</li>
-</ul>
-<a name="execNeed-org.eclipse.app4mc.amalthea.model.ModeSwitchEntry-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>execNeed</h4>
-<pre>public&nbsp;void&nbsp;execNeed(ModeSwitchEntry&lt;RunnableItem&gt;&nbsp;container,
-                     Procedures.Procedure1&lt;ExecutionNeed&gt;&nbsp;initializer)</pre>
-</li>
-</ul>
-<a name="execNeed-org.eclipse.app4mc.amalthea.model.ProbabilitySwitchEntry-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>execNeed</h4>
-<pre>public&nbsp;void&nbsp;execNeed(ProbabilitySwitchEntry&lt;RunnableItem&gt;&nbsp;container,
+<pre>public&nbsp;void&nbsp;execNeed(ICallGraphItemContainer&nbsp;container,
                      Procedures.Procedure1&lt;ExecutionNeed&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
@@ -1284,53 +784,13 @@
                  IDiscreteValueDeviation&nbsp;need)</pre>
 </li>
 </ul>
-<a name="ticks-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a name="ticks-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>ticks</h4>
-<pre>public&nbsp;void&nbsp;ticks(Runnable&nbsp;container,
-                  Procedures.Procedure1&lt;Ticks&gt;&nbsp;initializer)</pre>
-</li>
-</ul>
-<a name="ticks-org.eclipse.app4mc.amalthea.model.Group-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>ticks</h4>
-<pre>public&nbsp;void&nbsp;ticks(Group&nbsp;container,
-                  Procedures.Procedure1&lt;Ticks&gt;&nbsp;initializer)</pre>
-</li>
-</ul>
-<a name="ticks-org.eclipse.app4mc.amalthea.model.ModeSwitchDefault-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>ticks</h4>
-<pre>public&nbsp;void&nbsp;ticks(ModeSwitchDefault&lt;RunnableItem&gt;&nbsp;container,
-                  Procedures.Procedure1&lt;Ticks&gt;&nbsp;initializer)</pre>
-</li>
-</ul>
-<a name="ticks-org.eclipse.app4mc.amalthea.model.ModeSwitchEntry-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>ticks</h4>
-<pre>public&nbsp;void&nbsp;ticks(ModeSwitchEntry&lt;RunnableItem&gt;&nbsp;container,
-                  Procedures.Procedure1&lt;Ticks&gt;&nbsp;initializer)</pre>
-</li>
-</ul>
-<a name="ticks-org.eclipse.app4mc.amalthea.model.ProbabilitySwitchEntry-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>ticks</h4>
-<pre>public&nbsp;void&nbsp;ticks(ProbabilitySwitchEntry&lt;RunnableItem&gt;&nbsp;container,
+<pre>public&nbsp;void&nbsp;ticks(ICallGraphItemContainer&nbsp;container,
                   Procedures.Procedure1&lt;Ticks&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
diff --git a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/builder/package-summary.html b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/builder/package-summary.html
index 525ab90..23ea62f 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/builder/package-summary.html
+++ b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/builder/package-summary.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Mon Apr 29 15:55:55 CEST 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
 <title>org.eclipse.app4mc.amalthea.model.builder</title>
-<meta name="date" content="2019-04-29">
+<meta name="date" content="2019-07-31">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/io/AmaltheaLoader.html b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/io/AmaltheaLoader.html
index f11385c..6af0177 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/io/AmaltheaLoader.html
+++ b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/io/AmaltheaLoader.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Mon Apr 29 15:55:55 CEST 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
 <title>AmaltheaLoader</title>
-<meta name="date" content="2019-04-29">
+<meta name="date" content="2019-07-31">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/io/AmaltheaWriter.html b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/io/AmaltheaWriter.html
index bc23d29..d5ce5ca 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/io/AmaltheaWriter.html
+++ b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/io/AmaltheaWriter.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Mon Apr 29 15:55:55 CEST 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
 <title>AmaltheaWriter</title>
-<meta name="date" content="2019-04-29">
+<meta name="date" content="2019-07-31">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/io/package-summary.html b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/io/package-summary.html
index a8057a8..bde6e85 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/io/package-summary.html
+++ b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/io/package-summary.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Mon Apr 29 15:55:55 CEST 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
 <title>org.eclipse.app4mc.amalthea.model.io</title>
-<meta name="date" content="2019-04-29">
+<meta name="date" content="2019-07-31">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/package-summary.html b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/package-summary.html
index c158fb1..04b5bbf 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/package-summary.html
+++ b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/package-summary.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Mon Apr 29 15:55:55 CEST 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
 <title>org.eclipse.app4mc.amalthea.model</title>
-<meta name="date" content="2019-04-29">
+<meta name="date" content="2019-07-31">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/CustomPropertyUtil.html b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/CustomPropertyUtil.html
index 1d572c1..2888494 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/CustomPropertyUtil.html
+++ b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/CustomPropertyUtil.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Mon Apr 29 15:55:54 CEST 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:26:59 CEST 2019 -->
 <title>CustomPropertyUtil</title>
-<meta name="date" content="2019-04-29">
+<meta name="date" content="2019-07-31">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/DeploymentUtil.html b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/DeploymentUtil.html
index 3885531..da4ef1a 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/DeploymentUtil.html
+++ b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/DeploymentUtil.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Mon Apr 29 15:55:54 CEST 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
 <title>DeploymentUtil</title>
-<meta name="date" content="2019-04-29">
+<meta name="date" content="2019-07-31">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/FactoryUtil.html b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/FactoryUtil.html
index 9c8e6d0..d34cbfa 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/FactoryUtil.html
+++ b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/FactoryUtil.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Mon Apr 29 15:55:54 CEST 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
 <title>FactoryUtil</title>
-<meta name="date" content="2019-04-29">
+<meta name="date" content="2019-07-31">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
@@ -65,155 +65,217 @@
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
+<td class="colFirst"><code>static ClockStep</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="#createClockStep-double-org.eclipse.app4mc.amalthea.model.FrequencyUnit-long-java.lang.String-">createClockStep</a></span>(double&nbsp;freqValue,
+               FrequencyUnit&nbsp;freqUnit,
+               long&nbsp;timeValue,
+               String&nbsp;timeUnit)</code>&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>static Counter</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="#createCounter-long-">createCounter</a></span>(long&nbsp;prescaler)</code>
+<div class="block">Creates a counter (with offset = 0)</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>static Counter</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="#createCounter-long-long-">createCounter</a></span>(long&nbsp;prescaler,
+             long&nbsp;offset)</code>
+<div class="block">Creates a counter</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
 <td class="colFirst"><code>static DataRate</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#createDataRate--">createDataRate</a></span>()</code>
 <div class="block">Creates a data rate (initialized with zero value and base unit)</div>
 </td>
 </tr>
-<tr id="i1" class="rowColor">
+<tr id="i4" class="altColor">
 <td class="colFirst"><code>static DataRate</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#createDataRate-long-org.eclipse.app4mc.amalthea.model.DataRateUnit-">createDataRate</a></span>(long&nbsp;value,
               DataRateUnit&nbsp;unit)</code>
 <div class="block">Creates a data rate out of a value and a unit</div>
 </td>
 </tr>
-<tr id="i2" class="altColor">
+<tr id="i5" class="rowColor">
 <td class="colFirst"><code>static DataSize</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#createDataSize--">createDataSize</a></span>()</code>
 <div class="block">Creates a data size (initialized with zero value and base unit)</div>
 </td>
 </tr>
-<tr id="i3" class="rowColor">
+<tr id="i6" class="altColor">
 <td class="colFirst"><code>static DataSize</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#createDataSize-long-org.eclipse.app4mc.amalthea.model.DataSizeUnit-">createDataSize</a></span>(long&nbsp;value,
               DataSizeUnit&nbsp;unit)</code>
 <div class="block">Creates a data size out of a value and a unit</div>
 </td>
 </tr>
-<tr id="i4" class="altColor">
+<tr id="i7" class="rowColor">
 <td class="colFirst"><code>static DiscreteValueBoundaries</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#createDiscreteValueBoundaries-long-long-">createDiscreteValueBoundaries</a></span>(long&nbsp;min,
                              long&nbsp;max)</code>&nbsp;</td>
 </tr>
-<tr id="i5" class="rowColor">
+<tr id="i8" class="altColor">
 <td class="colFirst"><code>static DiscreteValueConstant</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#createDiscreteValueConstant-long-">createDiscreteValueConstant</a></span>(long&nbsp;value)</code>&nbsp;</td>
 </tr>
-<tr id="i6" class="altColor">
+<tr id="i9" class="rowColor">
 <td class="colFirst"><code>static DiscreteValueGaussDistribution</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#createDiscreteValueGaussDistribution-double-double-">createDiscreteValueGaussDistribution</a></span>(double&nbsp;mean,
                                     double&nbsp;sd)</code>&nbsp;</td>
 </tr>
-<tr id="i7" class="rowColor">
+<tr id="i10" class="altColor">
 <td class="colFirst"><code>static DiscreteValueGaussDistribution</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#createDiscreteValueGaussDistribution-double-double-java.lang.Long-java.lang.Long-">createDiscreteValueGaussDistribution</a></span>(double&nbsp;mean,
                                     double&nbsp;sd,
                                     Long&nbsp;min,
                                     Long&nbsp;max)</code>&nbsp;</td>
 </tr>
-<tr id="i8" class="altColor">
+<tr id="i11" class="rowColor">
 <td class="colFirst"><code>static ExecutionNeed</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#createExecutionNeed-org.eclipse.app4mc.amalthea.model.HwFeature-org.eclipse.app4mc.amalthea.model.IDiscreteValueDeviation-">createExecutionNeed</a></span>(HwFeature&nbsp;feature,
                    IDiscreteValueDeviation&nbsp;usages)</code>
 <div class="block">Creates ExecutionNeed for a feature, need set.</div>
 </td>
 </tr>
-<tr id="i9" class="rowColor">
+<tr id="i12" class="altColor">
 <td class="colFirst"><code>static ExecutionNeed</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#createExecutionNeed-java.lang.String-org.eclipse.app4mc.amalthea.model.IDiscreteValueDeviation-">createExecutionNeed</a></span>(String&nbsp;featureCategory,
                    IDiscreteValueDeviation&nbsp;usages)</code>
 <div class="block">Creates ExecutionNeed for a featureCategoryName, need set.</div>
 </td>
 </tr>
-<tr id="i10" class="altColor">
+<tr id="i13" class="rowColor">
 <td class="colFirst"><code>static Frequency</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#createFrequency--">createFrequency</a></span>()</code>
 <div class="block">Creates a frequency (initialized with zero value and base unit)</div>
 </td>
 </tr>
-<tr id="i11" class="rowColor">
+<tr id="i14" class="altColor">
 <td class="colFirst"><code>static Frequency</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#createFrequency-double-org.eclipse.app4mc.amalthea.model.FrequencyUnit-">createFrequency</a></span>(double&nbsp;value,
                FrequencyUnit&nbsp;unit)</code>
 <div class="block">Creates a frequency out of a value and a unit</div>
 </td>
 </tr>
-<tr id="i12" class="altColor">
+<tr id="i15" class="rowColor">
 <td class="colFirst"><code>static DiscreteValueConstant</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#createLatency-long-">createLatency</a></span>(long&nbsp;value)</code>&nbsp;</td>
 </tr>
-<tr id="i13" class="rowColor">
+<tr id="i16" class="altColor">
 <td class="colFirst"><code>static Time</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#createTime--">createTime</a></span>()</code>
 <div class="block">Creates a time (initialized with zero value and base unit)</div>
 </td>
 </tr>
-<tr id="i14" class="altColor">
+<tr id="i17" class="rowColor">
 <td class="colFirst"><code>static Time</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#createTime-java.math.BigInteger-java.lang.String-">createTime</a></span>(BigInteger&nbsp;value,
           String&nbsp;unit)</code>
 <div class="block">Creates a time out of a value and a unit given as String.</div>
 </td>
 </tr>
-<tr id="i15" class="rowColor">
+<tr id="i18" class="altColor">
 <td class="colFirst"><code>static Time</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#createTime-java.math.BigInteger-org.eclipse.app4mc.amalthea.model.TimeUnit-">createTime</a></span>(BigInteger&nbsp;value,
           TimeUnit&nbsp;unit)</code>
 <div class="block">Creates a time out of a value and a unit</div>
 </td>
 </tr>
-<tr id="i16" class="altColor">
+<tr id="i19" class="rowColor">
+<td class="colFirst"><code>static Time</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="#createTime-double-java.lang.String-">createTime</a></span>(double&nbsp;value,
+          String&nbsp;unit)</code>
+<div class="block">Creates a time out of a value and a unit given as String.</div>
+</td>
+</tr>
+<tr id="i20" class="altColor">
+<td class="colFirst"><code>static Time</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="#createTime-double-org.eclipse.app4mc.amalthea.model.TimeUnit-">createTime</a></span>(double&nbsp;value,
+          TimeUnit&nbsp;unit)</code>
+<div class="block">Creates a time out of a value and a unit (converted to pico seconds)</div>
+</td>
+</tr>
+<tr id="i21" class="rowColor">
 <td class="colFirst"><code>static Time</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#createTime-long-java.lang.String-">createTime</a></span>(long&nbsp;value,
           String&nbsp;unit)</code>
 <div class="block">Creates a time out of a value and a unit given as String.</div>
 </td>
 </tr>
-<tr id="i17" class="rowColor">
+<tr id="i22" class="altColor">
 <td class="colFirst"><code>static Time</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#createTime-long-org.eclipse.app4mc.amalthea.model.TimeUnit-">createTime</a></span>(long&nbsp;value,
           TimeUnit&nbsp;unit)</code>
 <div class="block">Creates a time out of a value and a unit</div>
 </td>
 </tr>
-<tr id="i18" class="altColor">
+<tr id="i23" class="rowColor">
 <td class="colFirst"><code>static Time</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#createTime-java.lang.String-">createTime</a></span>(String&nbsp;timeString)</code>
 <div class="block">Creates a Time object parsed from a text representation.</div>
 </td>
 </tr>
-<tr id="i19" class="rowColor">
+<tr id="i24" class="altColor">
 <td class="colFirst"><code>static Time</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#createTime-org.eclipse.app4mc.amalthea.model.Time-">createTime</a></span>(Time&nbsp;inputTime)</code>
 <div class="block">Creates a new time based on a time</div>
 </td>
 </tr>
-<tr id="i20" class="altColor">
+<tr id="i25" class="rowColor">
+<td class="colFirst"><code>static TimeBoundaries</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="#createTimeBoundaries-org.eclipse.app4mc.amalthea.model.Time-org.eclipse.app4mc.amalthea.model.Time-">createTimeBoundaries</a></span>(Time&nbsp;min,
+                    Time&nbsp;max)</code>&nbsp;</td>
+</tr>
+<tr id="i26" class="altColor">
+<td class="colFirst"><code>static TimeConstant</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="#createTimeConstant-org.eclipse.app4mc.amalthea.model.Time-">createTimeConstant</a></span>(Time&nbsp;value)</code>&nbsp;</td>
+</tr>
+<tr id="i27" class="rowColor">
+<td class="colFirst"><code>static TimeGaussDistribution</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="#createTimeGaussDistribution-org.eclipse.app4mc.amalthea.model.Time-org.eclipse.app4mc.amalthea.model.Time-">createTimeGaussDistribution</a></span>(Time&nbsp;mean,
+                           Time&nbsp;sd)</code>&nbsp;</td>
+</tr>
+<tr id="i28" class="altColor">
+<td class="colFirst"><code>static TimeGaussDistribution</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="#createTimeGaussDistribution-org.eclipse.app4mc.amalthea.model.Time-org.eclipse.app4mc.amalthea.model.Time-org.eclipse.app4mc.amalthea.model.Time-org.eclipse.app4mc.amalthea.model.Time-">createTimeGaussDistribution</a></span>(Time&nbsp;mean,
+                           Time&nbsp;sd,
+                           Time&nbsp;min,
+                           Time&nbsp;max)</code>&nbsp;</td>
+</tr>
+<tr id="i29" class="rowColor">
 <td class="colFirst"><code>static TypeRef</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#createTypeRef-org.eclipse.app4mc.amalthea.model.TypeDefinition-">createTypeRef</a></span>(TypeDefinition&nbsp;typeDefinition)</code>
 <div class="block">Creates a TypeRef object that refers to a type definition</div>
 </td>
 </tr>
-<tr id="i21" class="rowColor">
+<tr id="i30" class="altColor">
 <td class="colFirst"><code>static Voltage</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#createVoltage--">createVoltage</a></span>()</code>
 <div class="block">Creates a voltage (initialized with zero value and base unit)</div>
 </td>
 </tr>
-<tr id="i22" class="altColor">
+<tr id="i31" class="rowColor">
 <td class="colFirst"><code>static Voltage</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#createVoltage-double-org.eclipse.app4mc.amalthea.model.VoltageUnit-">createVoltage</a></span>(double&nbsp;value,
              VoltageUnit&nbsp;unit)</code>
 <div class="block">Creates a voltage out of a value and a unit</div>
 </td>
 </tr>
-<tr id="i23" class="rowColor">
+<tr id="i32" class="altColor">
 <td class="colFirst"><code>static DiscreteValueWeibullEstimatorsDistribution</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#createWeibullDistribution-long-double-long-double-">createWeibullDistribution</a></span>(long&nbsp;min,
                          double&nbsp;avg,
                          long&nbsp;max,
                          double&nbsp;promille)</code>&nbsp;</td>
 </tr>
+<tr id="i33" class="rowColor">
+<td class="colFirst"><code>static TimeWeibullEstimatorsDistribution</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="#createWeibullDistribution-org.eclipse.app4mc.amalthea.model.Time-org.eclipse.app4mc.amalthea.model.Time-org.eclipse.app4mc.amalthea.model.Time-double-">createWeibullDistribution</a></span>(Time&nbsp;min,
+                         Time&nbsp;avg,
+                         Time&nbsp;max,
+                         double&nbsp;promille)</code>&nbsp;</td>
+</tr>
 </table>
 <ul class="blockList">
 <li class="blockList"><a name="methods.inherited.from.class.Object">
@@ -253,6 +315,27 @@
 <!--   -->
 </a>
 <h3>Method Detail</h3>
+<a name="createCounter-long-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>createCounter</h4>
+<pre>public static&nbsp;Counter&nbsp;createCounter(long&nbsp;prescaler)</pre>
+<div class="block">Creates a counter (with offset = 0)</div>
+</li>
+</ul>
+<a name="createCounter-long-long-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>createCounter</h4>
+<pre>public static&nbsp;Counter&nbsp;createCounter(long&nbsp;prescaler,
+                                    long&nbsp;offset)</pre>
+<div class="block">Creates a counter</div>
+</li>
+</ul>
 <a name="createDataSize--">
 <!--   -->
 </a>
@@ -374,6 +457,17 @@
 <div class="block">Creates a time out of a value and a unit</div>
 </li>
 </ul>
+<a name="createTime-double-org.eclipse.app4mc.amalthea.model.TimeUnit-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>createTime</h4>
+<pre>public static&nbsp;Time&nbsp;createTime(double&nbsp;value,
+                              TimeUnit&nbsp;unit)</pre>
+<div class="block">Creates a time out of a value and a unit (converted to pico seconds)</div>
+</li>
+</ul>
 <a name="createTime-java.math.BigInteger-org.eclipse.app4mc.amalthea.model.TimeUnit-">
 <!--   -->
 </a>
@@ -396,6 +490,17 @@
 <div class="block">Creates a time out of a value and a unit given as String.</div>
 </li>
 </ul>
+<a name="createTime-double-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>createTime</h4>
+<pre>public static&nbsp;Time&nbsp;createTime(double&nbsp;value,
+                              String&nbsp;unit)</pre>
+<div class="block">Creates a time out of a value and a unit given as String.</div>
+</li>
+</ul>
 <a name="createTime-java.math.BigInteger-java.lang.String-">
 <!--   -->
 </a>
@@ -423,6 +528,18 @@
 </dl>
 </li>
 </ul>
+<a name="createClockStep-double-org.eclipse.app4mc.amalthea.model.FrequencyUnit-long-java.lang.String-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>createClockStep</h4>
+<pre>public static&nbsp;ClockStep&nbsp;createClockStep(double&nbsp;freqValue,
+                                        FrequencyUnit&nbsp;freqUnit,
+                                        long&nbsp;timeValue,
+                                        String&nbsp;timeUnit)</pre>
+</li>
+</ul>
 <a name="createTypeRef-org.eclipse.app4mc.amalthea.model.TypeDefinition-">
 <!--   -->
 </a>
@@ -486,6 +603,59 @@
                                                                                    double&nbsp;promille)</pre>
 </li>
 </ul>
+<a name="createTimeConstant-org.eclipse.app4mc.amalthea.model.Time-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>createTimeConstant</h4>
+<pre>public static&nbsp;TimeConstant&nbsp;createTimeConstant(Time&nbsp;value)</pre>
+</li>
+</ul>
+<a name="createTimeBoundaries-org.eclipse.app4mc.amalthea.model.Time-org.eclipse.app4mc.amalthea.model.Time-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>createTimeBoundaries</h4>
+<pre>public static&nbsp;TimeBoundaries&nbsp;createTimeBoundaries(Time&nbsp;min,
+                                                  Time&nbsp;max)</pre>
+</li>
+</ul>
+<a name="createTimeGaussDistribution-org.eclipse.app4mc.amalthea.model.Time-org.eclipse.app4mc.amalthea.model.Time-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>createTimeGaussDistribution</h4>
+<pre>public static&nbsp;TimeGaussDistribution&nbsp;createTimeGaussDistribution(Time&nbsp;mean,
+                                                                Time&nbsp;sd)</pre>
+</li>
+</ul>
+<a name="createTimeGaussDistribution-org.eclipse.app4mc.amalthea.model.Time-org.eclipse.app4mc.amalthea.model.Time-org.eclipse.app4mc.amalthea.model.Time-org.eclipse.app4mc.amalthea.model.Time-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>createTimeGaussDistribution</h4>
+<pre>public static&nbsp;TimeGaussDistribution&nbsp;createTimeGaussDistribution(Time&nbsp;mean,
+                                                                Time&nbsp;sd,
+                                                                Time&nbsp;min,
+                                                                Time&nbsp;max)</pre>
+</li>
+</ul>
+<a name="createWeibullDistribution-org.eclipse.app4mc.amalthea.model.Time-org.eclipse.app4mc.amalthea.model.Time-org.eclipse.app4mc.amalthea.model.Time-double-">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>createWeibullDistribution</h4>
+<pre>public static&nbsp;TimeWeibullEstimatorsDistribution&nbsp;createWeibullDistribution(Time&nbsp;min,
+                                                                          Time&nbsp;avg,
+                                                                          Time&nbsp;max,
+                                                                          double&nbsp;promille)</pre>
+</li>
+</ul>
 <a name="createExecutionNeed-java.lang.String-org.eclipse.app4mc.amalthea.model.IDiscreteValueDeviation-">
 <!--   -->
 </a>
diff --git a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/HardwareUtil.html b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/HardwareUtil.html
index 50be420..7fffd85 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/HardwareUtil.html
+++ b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/HardwareUtil.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Mon Apr 29 15:55:54 CEST 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
 <title>HardwareUtil</title>
-<meta name="date" content="2019-04-29">
+<meta name="date" content="2019-07-31">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/ModelUtil.html b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/ModelUtil.html
index e7ccd8e..79af8a1 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/ModelUtil.html
+++ b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/ModelUtil.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Mon Apr 29 15:55:54 CEST 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
 <title>ModelUtil</title>
-<meta name="date" content="2019-04-29">
+<meta name="date" content="2019-07-31">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/RuntimeUtil.AccessDirection.html b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/RuntimeUtil.AccessDirection.html
index a4b08c0..c80bc6d 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/RuntimeUtil.AccessDirection.html
+++ b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/RuntimeUtil.AccessDirection.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Mon Apr 29 15:55:54 CEST 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
 <title>RuntimeUtil.AccessDirection</title>
-<meta name="date" content="2019-04-29">
+<meta name="date" content="2019-07-31">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/RuntimeUtil.PositionType.html b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/RuntimeUtil.PositionType.html
index acd8a23..7dcc939 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/RuntimeUtil.PositionType.html
+++ b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/RuntimeUtil.PositionType.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Mon Apr 29 15:55:54 CEST 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
 <title>RuntimeUtil.PositionType</title>
-<meta name="date" content="2019-04-29">
+<meta name="date" content="2019-07-31">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/RuntimeUtil.TimeType.html b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/RuntimeUtil.TimeType.html
index e203014..80bbf3b 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/RuntimeUtil.TimeType.html
+++ b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/RuntimeUtil.TimeType.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Mon Apr 29 15:55:54 CEST 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
 <title>RuntimeUtil.TimeType</title>
-<meta name="date" content="2019-04-29">
+<meta name="date" content="2019-07-31">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/RuntimeUtil.html b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/RuntimeUtil.html
index c90adc6..9e85068 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/RuntimeUtil.html
+++ b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/RuntimeUtil.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Mon Apr 29 15:55:54 CEST 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
 <title>RuntimeUtil</title>
-<meta name="date" content="2019-04-29">
+<meta name="date" content="2019-07-31">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
@@ -97,8 +97,7 @@
                                 ExecutionNeed&nbsp;need,
                                 String&nbsp;runnableName,
                                 <a href="RuntimeUtil.PositionType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.PositionType</a>&nbsp;positon)</code>
-<div class="block">Creates a new Runnable with the given runtime and create a CallSequence at
- beginning / end of the given process</div>
+<div class="block">Creates a new Runnable with the given runtime at beginning / end of the given process</div>
 </td>
 </tr>
 <tr id="i1" class="rowColor">
@@ -106,7 +105,9 @@
 <td class="colLast"><code><span class="memberNameLink"><a href="#addRuntimeToProcessAsNewRunnable-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.app4mc.amalthea.model.Ticks-java.lang.String-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.PositionType-">addRuntimeToProcessAsNewRunnable</a></span>(Process&nbsp;process,
                                 Ticks&nbsp;ticks,
                                 String&nbsp;runnableName,
-                                <a href="RuntimeUtil.PositionType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.PositionType</a>&nbsp;positon)</code>&nbsp;</td>
+                                <a href="RuntimeUtil.PositionType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.PositionType</a>&nbsp;positon)</code>
+<div class="block">Creates a new Runnable with the given runtime at beginning / end of the given process</div>
+</td>
 </tr>
 <tr id="i2" class="altColor">
 <td class="colFirst"><code>static void</code></td>
diff --git a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/SoftwareUtil.html b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/SoftwareUtil.html
index 2a3034b..2b73a19 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/SoftwareUtil.html
+++ b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/SoftwareUtil.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Mon Apr 29 15:55:54 CEST 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
 <title>SoftwareUtil</title>
-<meta name="date" content="2019-04-29">
+<meta name="date" content="2019-07-31">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
@@ -65,41 +65,41 @@
 <th class="colLast" scope="col">Method and Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>static EList&lt;CallSequenceItem&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#collectCalls-org.eclipse.app4mc.amalthea.model.Process-">collectCalls</a></span>(Process&nbsp;process)</code>
-<div class="block">Traverse the call graph of a process and collect all items of the call sequences.</div>
+<td class="colFirst"><code>static EList&lt;CallGraphItem&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="#collectCallGraphItems-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-">collectCallGraphItems</a></span>(ICallGraphItemContainer&nbsp;container)</code>
+<div class="block">Traverse the contained call graph items and collect all items.</div>
 </td>
 </tr>
 <tr id="i1" class="rowColor">
-<td class="colFirst"><code>static EList&lt;CallSequenceItem&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#collectCalls-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-">collectCalls</a></span>(Process&nbsp;process,
-            EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
-<div class="block">Traverse the call graph of a process and collect all items of the call sequences.</div>
+<td class="colFirst"><code>static EList&lt;CallGraphItem&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="#collectCallGraphItems-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.emf.common.util.EMap-">collectCallGraphItems</a></span>(ICallGraphItemContainer&nbsp;container,
+                     EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
+<div class="block">Traverse the contained call graph items and collect all items.</div>
 </td>
 </tr>
 <tr id="i2" class="altColor">
-<td class="colFirst"><code>static &lt;T extends CallSequenceItem&gt;<br>EList&lt;T&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#collectCalls-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-java.lang.Class-">collectCalls</a></span>(Process&nbsp;process,
-            EMap&lt;ModeLabel,String&gt;&nbsp;modes,
-            Class&lt;T&gt;&nbsp;targetClass)</code>
-<div class="block">Traverse the call graph of a process and collect all items of the call sequences.</div>
+<td class="colFirst"><code>static &lt;T extends CallGraphItem&gt;<br>EList&lt;T&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="#collectCallGraphItems-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.emf.common.util.EMap-java.lang.Class-">collectCallGraphItems</a></span>(ICallGraphItemContainer&nbsp;container,
+                     EMap&lt;ModeLabel,String&gt;&nbsp;modes,
+                     Class&lt;T&gt;&nbsp;targetClass)</code>
+<div class="block">Traverse the runnable items graph of a runnable and collect all items.</div>
 </td>
 </tr>
 <tr id="i3" class="rowColor">
-<td class="colFirst"><code>static &lt;T extends CallSequenceItem&gt;<br>EList&lt;T&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#collectCalls-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-java.lang.Class-java.util.function.Function-">collectCalls</a></span>(Process&nbsp;process,
-            EMap&lt;ModeLabel,String&gt;&nbsp;modes,
-            Class&lt;T&gt;&nbsp;targetClass,
-            Function&lt;T,Boolean&gt;&nbsp;filter)</code>
-<div class="block">Traverse the call graph of a process and collect all items of the call sequences.</div>
+<td class="colFirst"><code>static &lt;T extends CallGraphItem&gt;<br>EList&lt;T&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="#collectCallGraphItems-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.emf.common.util.EMap-java.lang.Class-java.util.function.Function-">collectCallGraphItems</a></span>(ICallGraphItemContainer&nbsp;container,
+                     EMap&lt;ModeLabel,String&gt;&nbsp;modes,
+                     Class&lt;T&gt;&nbsp;targetClass,
+                     Function&lt;T,Boolean&gt;&nbsp;filter)</code>
+<div class="block">Traverse the runnable items graph of a runnable and collect all items.</div>
 </td>
 </tr>
 <tr id="i4" class="altColor">
-<td class="colFirst"><code>static EList&lt;CallSequenceItem&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#collectCalls-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-java.util.function.Function-">collectCalls</a></span>(Process&nbsp;process,
-            EMap&lt;ModeLabel,String&gt;&nbsp;modes,
-            Function&lt;CallSequenceItem,Boolean&gt;&nbsp;filter)</code>
-<div class="block">Traverse the call graph of a process and collect all items of the call sequences.</div>
+<td class="colFirst"><code>static EList&lt;CallGraphItem&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="#collectCallGraphItems-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.emf.common.util.EMap-java.util.function.Function-">collectCallGraphItems</a></span>(ICallGraphItemContainer&nbsp;container,
+                     EMap&lt;ModeLabel,String&gt;&nbsp;modes,
+                     Function&lt;CallGraphItem,Boolean&gt;&nbsp;filter)</code>
+<div class="block">Traverse the contained call graph items and collect all items.</div>
 </td>
 </tr>
 <tr id="i5" class="rowColor">
@@ -110,100 +110,76 @@
 </td>
 </tr>
 <tr id="i6" class="altColor">
-<td class="colFirst"><code>static List&lt;CallSequenceItem&gt;</code></td>
+<td class="colFirst"><code>static List&lt;CallGraphItem&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#collectEventsOfProcess-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-">collectEventsOfProcess</a></span>(Process&nbsp;process,
                       EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
 <div class="block">Collects a list of event calls (clear, set or wait) of a process</div>
 </td>
 </tr>
 <tr id="i7" class="rowColor">
-<td class="colFirst"><code>static EList&lt;RunnableItem&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#collectRunnableItems-org.eclipse.app4mc.amalthea.model.Runnable-">collectRunnableItems</a></span>(Runnable&nbsp;runnable)</code>
-<div class="block">Traverse the runnable items graph of a runnable and collect all items.</div>
-</td>
-</tr>
-<tr id="i8" class="altColor">
-<td class="colFirst"><code>static EList&lt;RunnableItem&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#collectRunnableItems-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.emf.common.util.EMap-">collectRunnableItems</a></span>(Runnable&nbsp;runnable,
-                    EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
-<div class="block">Traverse the runnable items graph of a runnable and collect all items.</div>
-</td>
-</tr>
-<tr id="i9" class="rowColor">
-<td class="colFirst"><code>static &lt;T extends RunnableItem&gt;<br>EList&lt;T&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#collectRunnableItems-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.emf.common.util.EMap-java.lang.Class-">collectRunnableItems</a></span>(Runnable&nbsp;runnable,
-                    EMap&lt;ModeLabel,String&gt;&nbsp;modes,
-                    Class&lt;T&gt;&nbsp;targetClass)</code>
-<div class="block">Traverse the runnable items graph of a runnable and collect all items.</div>
-</td>
-</tr>
-<tr id="i10" class="altColor">
-<td class="colFirst"><code>static &lt;T extends RunnableItem&gt;<br>EList&lt;T&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#collectRunnableItems-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.emf.common.util.EMap-java.lang.Class-java.util.function.Function-">collectRunnableItems</a></span>(Runnable&nbsp;runnable,
-                    EMap&lt;ModeLabel,String&gt;&nbsp;modes,
-                    Class&lt;T&gt;&nbsp;targetClass,
-                    Function&lt;T,Boolean&gt;&nbsp;filter)</code>
-<div class="block">Traverse the runnable items graph of a runnable and collect all items.</div>
-</td>
-</tr>
-<tr id="i11" class="rowColor">
-<td class="colFirst"><code>static EList&lt;RunnableItem&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#collectRunnableItems-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.emf.common.util.EMap-java.util.function.Function-">collectRunnableItems</a></span>(Runnable&nbsp;runnable,
-                    EMap&lt;ModeLabel,String&gt;&nbsp;modes,
-                    Function&lt;RunnableItem,Boolean&gt;&nbsp;filter)</code>
-<div class="block">Traverse the runnable items graph of a runnable and collect all items.</div>
-</td>
-</tr>
-<tr id="i12" class="altColor">
 <td class="colFirst"><code>static List&lt;SetEvent&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#collectSetEvents-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-">collectSetEvents</a></span>(Process&nbsp;process,
                 EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
 <div class="block">Collects a list of set events calls for a process</div>
 </td>
 </tr>
-<tr id="i13" class="rowColor">
+<tr id="i8" class="altColor">
 <td class="colFirst"><code>static List&lt;WaitEvent&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#collectWaitEvents-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-">collectWaitEvents</a></span>(Process&nbsp;process,
                  EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
 <div class="block">Collects a list of wait event calls for a process</div>
 </td>
 </tr>
-<tr id="i14" class="altColor">
+<tr id="i9" class="rowColor">
 <td class="colFirst"><code>static Set&lt;Label&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#getAccessedLabelSet-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-">getAccessedLabelSet</a></span>(Process&nbsp;process,
                    EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
 <div class="block">Returns a set of labels accessed by the process</div>
 </td>
 </tr>
-<tr id="i15" class="rowColor">
+<tr id="i10" class="altColor">
 <td class="colFirst"><code>static Set&lt;Label&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#getAccessedLabelSet-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.emf.common.util.EMap-">getAccessedLabelSet</a></span>(Runnable&nbsp;runnable,
                    EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
 <div class="block">Returns a set of labels accessed from the runnable</div>
 </td>
 </tr>
-<tr id="i16" class="altColor">
+<tr id="i11" class="rowColor">
 <td class="colFirst"><code>static List&lt;Runnable&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#getCalledRunnables-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.emf.common.util.EMap-">getCalledRunnables</a></span>(Runnable&nbsp;runnable,
                   EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
 <div class="block">Returns a list of runnables directly called by the runnable</div>
 </td>
 </tr>
-<tr id="i17" class="rowColor">
+<tr id="i12" class="altColor">
+<td class="colFirst"><code>static List&lt;Process&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="#getCallingProcesses-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.emf.common.util.EMap-">getCallingProcesses</a></span>(Runnable&nbsp;runnable,
+                   EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
+<div class="block">Returns a list of processes calling the runnable</div>
+</td>
+</tr>
+<tr id="i13" class="rowColor">
+<td class="colFirst"><code>static List&lt;Runnable&gt;</code></td>
+<td class="colLast"><code><span class="memberNameLink"><a href="#getCallingRunnables-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.emf.common.util.EMap-">getCallingRunnables</a></span>(Runnable&nbsp;runnable,
+                   EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
+<div class="block">Returns a list of runnables directly calling the runnable</div>
+</td>
+</tr>
+<tr id="i14" class="altColor">
 <td class="colFirst"><code>static List&lt;ExecutionNeed&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#getExecutionNeeds-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-">getExecutionNeeds</a></span>(Process&nbsp;process,
                  EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
 <div class="block">Returns a list of all execution needs for a given process</div>
 </td>
 </tr>
-<tr id="i18" class="altColor">
+<tr id="i15" class="rowColor">
 <td class="colFirst"><code>static List&lt;ExecutionNeed&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#getExecutionNeeds-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.emf.common.util.EMap-">getExecutionNeeds</a></span>(Runnable&nbsp;runnable,
                  EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
 <div class="block">Returns a list of all execution needs for a given runnable</div>
 </td>
 </tr>
-<tr id="i19" class="rowColor">
+<tr id="i16" class="altColor">
 <td class="colFirst"><code>static List&lt;Label&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#getInterTaskCommunication-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-">getInterTaskCommunication</a></span>(Process&nbsp;sender,
                          Process&nbsp;receiver,
@@ -211,42 +187,42 @@
 <div class="block">Returns a list of all exchanged labels that are written by the sender process and read by the receiver process</div>
 </td>
 </tr>
-<tr id="i20" class="altColor">
+<tr id="i17" class="rowColor">
 <td class="colFirst"><code>static float</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#getLabelAccessCountFromStatistics-org.eclipse.app4mc.amalthea.model.LabelAccess-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType-">getLabelAccessCountFromStatistics</a></span>(LabelAccess&nbsp;labelAcc,
                                  <a href="../../../../../../org/eclipse/app4mc/amalthea/model/util/RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;accType)</code>
 <div class="block">Returns the number of label accesses from a statistic.</div>
 </td>
 </tr>
-<tr id="i21" class="rowColor">
+<tr id="i18" class="altColor">
 <td class="colFirst"><code>static List&lt;LabelAccess&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#getLabelAccessList-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-">getLabelAccessList</a></span>(Process&nbsp;process,
                   EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
 <div class="block">Returns a list of all label accesses of the process</div>
 </td>
 </tr>
-<tr id="i22" class="altColor">
+<tr id="i19" class="rowColor">
 <td class="colFirst"><code>static List&lt;LabelAccess&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#getLabelAccessList-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.emf.common.util.EMap-">getLabelAccessList</a></span>(Runnable&nbsp;runnable,
                   EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
 <div class="block">Returns a list of all label accesses of the runnable</div>
 </td>
 </tr>
-<tr id="i23" class="rowColor">
+<tr id="i20" class="altColor">
 <td class="colFirst"><code>static Map&lt;Label,List&lt;LabelAccessStatistic&gt;&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#getLabelAccessStatisticsMap-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-">getLabelAccessStatisticsMap</a></span>(Process&nbsp;process,
                            EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
 <div class="block">Returns a map: labels accessed by the process -&gt; the corresponding label access statistics</div>
 </td>
 </tr>
-<tr id="i24" class="altColor">
+<tr id="i21" class="rowColor">
 <td class="colFirst"><code>static Map&lt;Label,List&lt;LabelAccessStatistic&gt;&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#getLabelAccessStatisticsMap-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.emf.common.util.EMap-">getLabelAccessStatisticsMap</a></span>(Runnable&nbsp;runnable,
                            EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
 <div class="block">Returns a map: labels accessed by the runnable -&gt; the corresponding LabelAccessStatistics</div>
 </td>
 </tr>
-<tr id="i25" class="rowColor">
+<tr id="i22" class="altColor">
 <td class="colFirst"><code>static float</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#getLabelReadCount-org.eclipse.app4mc.amalthea.model.Label-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType-">getLabelReadCount</a></span>(Label&nbsp;label,
                  Process&nbsp;process,
@@ -255,21 +231,21 @@
 <div class="block">Returns the reads from a process to a certain label.</div>
 </td>
 </tr>
-<tr id="i26" class="altColor">
+<tr id="i23" class="rowColor">
 <td class="colFirst"><code>static Map&lt;Label,List&lt;LabelAccess&gt;&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#getLabelToLabelAccessMap-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-">getLabelToLabelAccessMap</a></span>(Process&nbsp;process,
                         EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
 <div class="block">Returns a map: accessed labels of the process -&gt; the corresponding label accesses</div>
 </td>
 </tr>
-<tr id="i27" class="rowColor">
+<tr id="i24" class="altColor">
 <td class="colFirst"><code>static Map&lt;Label,List&lt;LabelAccess&gt;&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#getLabelToLabelAccessMap-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.emf.common.util.EMap-">getLabelToLabelAccessMap</a></span>(Runnable&nbsp;runnable,
                         EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
 <div class="block">Returns a map: labels accessed from runnable -&gt; the corresponding label accesses</div>
 </td>
 </tr>
-<tr id="i28" class="altColor">
+<tr id="i25" class="rowColor">
 <td class="colFirst"><code>static float</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#getLabelWriteCount-org.eclipse.app4mc.amalthea.model.Label-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType-">getLabelWriteCount</a></span>(Label&nbsp;label,
                   Process&nbsp;process,
@@ -278,154 +254,140 @@
 <div class="block">Returns the writes from a process to a certain label.</div>
 </td>
 </tr>
-<tr id="i29" class="rowColor">
-<td class="colFirst"><code>static List&lt;Process&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getProcesses-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.emf.common.util.EMap-">getProcesses</a></span>(Runnable&nbsp;runnable,
-            EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
-<div class="block">Returns a list of processes calling the runnable</div>
-</td>
-</tr>
-<tr id="i30" class="altColor">
+<tr id="i26" class="altColor">
 <td class="colFirst"><code>static List&lt;Runnable&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#getReaderListOfLabel-org.eclipse.app4mc.amalthea.model.Label-org.eclipse.emf.common.util.EMap-">getReaderListOfLabel</a></span>(Label&nbsp;label,
                     EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
 <div class="block">Returns a list of runnables reading the label</div>
 </td>
 </tr>
-<tr id="i31" class="rowColor">
+<tr id="i27" class="rowColor">
 <td class="colFirst"><code>static Set&lt;Runnable&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#getReadersSetOfLabel-org.eclipse.app4mc.amalthea.model.Label-org.eclipse.emf.common.util.EMap-">getReadersSetOfLabel</a></span>(Label&nbsp;label,
                     EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
 <div class="block">Returns a set of runnables reading the label</div>
 </td>
 </tr>
-<tr id="i32" class="altColor">
+<tr id="i28" class="altColor">
 <td class="colFirst"><code>static List&lt;LabelAccess&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#getReadLabelAccessList-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.emf.common.util.EMap-">getReadLabelAccessList</a></span>(Runnable&nbsp;runnable,
                       EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
 <div class="block">Returns a list of read label accesses of the runnable</div>
 </td>
 </tr>
-<tr id="i33" class="rowColor">
+<tr id="i29" class="rowColor">
 <td class="colFirst"><code>static Map&lt;Label,List&lt;LabelAccessStatistic&gt;&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#getReadLabelAccessStatisticsMap-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-">getReadLabelAccessStatisticsMap</a></span>(Process&nbsp;process,
                                EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
 <div class="block">Returns a map: labels read the process -&gt; the corresponding label access statistics</div>
 </td>
 </tr>
-<tr id="i34" class="altColor">
+<tr id="i30" class="altColor">
 <td class="colFirst"><code>static Map&lt;Label,List&lt;LabelAccessStatistic&gt;&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#getReadLabelAccessStatisticsMap-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.emf.common.util.EMap-">getReadLabelAccessStatisticsMap</a></span>(Runnable&nbsp;runnable,
                                EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
 <div class="block">Returns a map: labels read by the runnable -&gt; the corresponding LabelAccessStatistics</div>
 </td>
 </tr>
-<tr id="i35" class="rowColor">
+<tr id="i31" class="rowColor">
 <td class="colFirst"><code>static Set&lt;Label&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#getReadLabelSet-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-">getReadLabelSet</a></span>(Process&nbsp;process,
                EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
 <div class="block">Returns a set of labels read by the process</div>
 </td>
 </tr>
-<tr id="i36" class="altColor">
+<tr id="i32" class="altColor">
 <td class="colFirst"><code>static Set&lt;Label&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#getReadLabelSet-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.emf.common.util.EMap-">getReadLabelSet</a></span>(Runnable&nbsp;runnable,
                EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
 <div class="block">Returns a set of labels read by the runnable</div>
 </td>
 </tr>
-<tr id="i37" class="rowColor">
-<td class="colFirst"><code>static List&lt;Runnable&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getRunnableCallParents-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.emf.common.util.EMap-">getRunnableCallParents</a></span>(Runnable&nbsp;runnable,
-                      EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
-<div class="block">Returns a list of runnables directly calling the runnable</div>
-</td>
-</tr>
-<tr id="i38" class="altColor">
+<tr id="i33" class="rowColor">
 <td class="colFirst"><code>static List&lt;Runnable&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#getRunnableList-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-">getRunnableList</a></span>(Process&nbsp;process,
                EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
 <div class="block">Returns a list of runnables called by the process</div>
 </td>
 </tr>
-<tr id="i39" class="rowColor">
+<tr id="i34" class="altColor">
 <td class="colFirst"><code>static Set&lt;Runnable&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#getRunnableSet-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-">getRunnableSet</a></span>(Process&nbsp;process,
               EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
 <div class="block">Returns a set of runnables called by the process - no duplicates</div>
 </td>
 </tr>
-<tr id="i40" class="altColor">
+<tr id="i35" class="rowColor">
 <td class="colFirst"><code>static Set&lt;ServerCall&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#getServerCallSet-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-">getServerCallSet</a></span>(Process&nbsp;process,
                 EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
 <div class="block">Returns a set of server calls for a process</div>
 </td>
 </tr>
-<tr id="i41" class="rowColor">
+<tr id="i36" class="altColor">
 <td class="colFirst"><code>static Set&lt;ServerCall&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#getServerCallSet-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.emf.common.util.EMap-">getServerCallSet</a></span>(Runnable&nbsp;runnable,
                 EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
 <div class="block">Returns a set of server calls for a runnable</div>
 </td>
 </tr>
-<tr id="i42" class="altColor">
+<tr id="i37" class="rowColor">
 <td class="colFirst"><code>static List&lt;Ticks&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#getTicks-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-">getTicks</a></span>(Process&nbsp;process,
         EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
 <div class="block">Returns a list of all ticks for a given process</div>
 </td>
 </tr>
-<tr id="i43" class="rowColor">
+<tr id="i38" class="altColor">
 <td class="colFirst"><code>static List&lt;Ticks&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#getTicks-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.emf.common.util.EMap-">getTicks</a></span>(Runnable&nbsp;runnable,
         EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
 <div class="block">Returns a list of all ticks for a given runnable</div>
 </td>
 </tr>
-<tr id="i44" class="altColor">
+<tr id="i39" class="rowColor">
 <td class="colFirst"><code>static List&lt;LabelAccess&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#getWriteLabelAccessList-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.emf.common.util.EMap-">getWriteLabelAccessList</a></span>(Runnable&nbsp;runnable,
                        EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
 <div class="block">Returns a list of write label accesses of the runnable</div>
 </td>
 </tr>
-<tr id="i45" class="rowColor">
+<tr id="i40" class="altColor">
 <td class="colFirst"><code>static Map&lt;Label,List&lt;LabelAccessStatistic&gt;&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#getWriteLabelAccessStatisticsMap-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-">getWriteLabelAccessStatisticsMap</a></span>(Process&nbsp;process,
                                 EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
 <div class="block">Returns a map: labels written by the process -&gt; the corresponding label access statistics</div>
 </td>
 </tr>
-<tr id="i46" class="altColor">
+<tr id="i41" class="rowColor">
 <td class="colFirst"><code>static Map&lt;Label,List&lt;LabelAccessStatistic&gt;&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#getWriteLabelAccessStatisticsMap-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.emf.common.util.EMap-">getWriteLabelAccessStatisticsMap</a></span>(Runnable&nbsp;runnable,
                                 EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
 <div class="block">Returns a map: labels written by the runnable -&gt; the corresponding LabelAccessStatistics</div>
 </td>
 </tr>
-<tr id="i47" class="rowColor">
+<tr id="i42" class="altColor">
 <td class="colFirst"><code>static Set&lt;Label&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#getWriteLabelSet-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-">getWriteLabelSet</a></span>(Process&nbsp;process,
                 EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
 <div class="block">Returns a set of labels written by the process</div>
 </td>
 </tr>
-<tr id="i48" class="altColor">
+<tr id="i43" class="rowColor">
 <td class="colFirst"><code>static Set&lt;Label&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#getWriteLabelSet-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.emf.common.util.EMap-">getWriteLabelSet</a></span>(Runnable&nbsp;runnable,
                 EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
 <div class="block">Returns a set of labels written by the runnable</div>
 </td>
 </tr>
-<tr id="i49" class="rowColor">
+<tr id="i44" class="altColor">
 <td class="colFirst"><code>static List&lt;Runnable&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#getWriterListOfLabel-org.eclipse.app4mc.amalthea.model.Label-org.eclipse.emf.common.util.EMap-">getWriterListOfLabel</a></span>(Label&nbsp;label,
                     EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
 <div class="block">Returns a list of runnables writing the label</div>
 </td>
 </tr>
-<tr id="i50" class="altColor">
+<tr id="i45" class="rowColor">
 <td class="colFirst"><code>static Set&lt;Runnable&gt;</code></td>
 <td class="colLast"><code><span class="memberNameLink"><a href="#getWriterSetOfLabel-org.eclipse.app4mc.amalthea.model.Label-org.eclipse.emf.common.util.EMap-">getWriterSetOfLabel</a></span>(Label&nbsp;label,
                    EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
@@ -471,203 +433,103 @@
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="collectCalls-org.eclipse.app4mc.amalthea.model.Process-">
+<a name="collectCallGraphItems-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>collectCalls</h4>
-<pre>public static&nbsp;EList&lt;CallSequenceItem&gt;&nbsp;collectCalls(Process&nbsp;process)</pre>
-<div class="block">Traverse the call graph of a process and collect all items of the call sequences.</div>
+<h4>collectCallGraphItems</h4>
+<pre>public static&nbsp;EList&lt;CallGraphItem&gt;&nbsp;collectCallGraphItems(ICallGraphItemContainer&nbsp;container)</pre>
+<div class="block">Traverse the contained call graph items and collect all items.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>process</code> - process (Task or ISR)</dd>
+<dd><code>container</code> - call graph, group, ...</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
-<dd>List of CallSequenceItems</dd>
+<dd>List of CallGraphItems</dd>
 </dl>
 </li>
 </ul>
-<a name="collectCalls-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-">
+<a name="collectCallGraphItems-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.emf.common.util.EMap-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>collectCalls</h4>
-<pre>public static&nbsp;EList&lt;CallSequenceItem&gt;&nbsp;collectCalls(Process&nbsp;process,
-                                                   EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
-<div class="block">Traverse the call graph of a process and collect all items of the call sequences.
+<h4>collectCallGraphItems</h4>
+<pre>public static&nbsp;EList&lt;CallGraphItem&gt;&nbsp;collectCallGraphItems(ICallGraphItemContainer&nbsp;container,
+                                                         EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<div class="block">Traverse the contained call graph items and collect all items.
  Collection can be restricted to specific modes.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>process</code> - process (Task or ISR)</dd>
-<dd><code>modes</code> - list of mode literals that should be considered</dd>
+<dd><code>container</code> - call graph, group, ...</dd>
+<dd><code>modes</code> - (optional) - null works</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
-<dd>List of CallSequenceItems</dd>
+<dd>List of CallGraphItems</dd>
 </dl>
 </li>
 </ul>
-<a name="collectCalls-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-java.util.function.Function-">
+<a name="collectCallGraphItems-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.emf.common.util.EMap-java.util.function.Function-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>collectCalls</h4>
-<pre>public static&nbsp;EList&lt;CallSequenceItem&gt;&nbsp;collectCalls(Process&nbsp;process,
-                                                   EMap&lt;ModeLabel,String&gt;&nbsp;modes,
-                                                   Function&lt;CallSequenceItem,Boolean&gt;&nbsp;filter)</pre>
-<div class="block">Traverse the call graph of a process and collect all items of the call sequences.
+<h4>collectCallGraphItems</h4>
+<pre>public static&nbsp;EList&lt;CallGraphItem&gt;&nbsp;collectCallGraphItems(ICallGraphItemContainer&nbsp;container,
+                                                         EMap&lt;ModeLabel,String&gt;&nbsp;modes,
+                                                         Function&lt;CallGraphItem,Boolean&gt;&nbsp;filter)</pre>
+<div class="block">Traverse the contained call graph items and collect all items.
  Collection can be restricted to specific modes and filtered by a lambda expression.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>process</code> - process (Task or ISR)</dd>
-<dd><code>modes</code> - list of mode literals that should be considered</dd>
-<dd><code>filter</code> - lambda expression (e.g. "a -&gt; a instanceof TaskRunnableCall")</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>List of CallSequenceItems</dd>
-</dl>
-</li>
-</ul>
-<a name="collectCalls-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-java.lang.Class-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>collectCalls</h4>
-<pre>public static&nbsp;&lt;T extends CallSequenceItem&gt;&nbsp;EList&lt;T&gt;&nbsp;collectCalls(Process&nbsp;process,
-                                                                 EMap&lt;ModeLabel,String&gt;&nbsp;modes,
-                                                                 Class&lt;T&gt;&nbsp;targetClass)</pre>
-<div class="block">Traverse the call graph of a process and collect all items of the call sequences.
- Collection can be restricted to specific modes and filtered by class.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>process</code> - Process (Task or ISR)</dd>
-<dd><code>modes</code> - list of mode literals that should be considered</dd>
-<dd><code>targetClass</code> - subclass of CallSequenceItem that restricts the result</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>List of T extends CallSequenceItems</dd>
-</dl>
-</li>
-</ul>
-<a name="collectCalls-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-java.lang.Class-java.util.function.Function-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>collectCalls</h4>
-<pre>public static&nbsp;&lt;T extends CallSequenceItem&gt;&nbsp;EList&lt;T&gt;&nbsp;collectCalls(Process&nbsp;process,
-                                                                 EMap&lt;ModeLabel,String&gt;&nbsp;modes,
-                                                                 Class&lt;T&gt;&nbsp;targetClass,
-                                                                 Function&lt;T,Boolean&gt;&nbsp;filter)</pre>
-<div class="block">Traverse the call graph of a process and collect all items of the call sequences.
- Collection can be restricted to specific modes and filtered by class and lambda expression.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>process</code> - process (Task or ISR)</dd>
-<dd><code>modes</code> - list of mode literals that should be considered</dd>
-<dd><code>targetClass</code> - subclass of CallSequenceItem that restricts the result</dd>
-<dd><code>filter</code> - lambda expression (e.g. "a -&gt; a instanceof TaskRunnableCall")</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>List of T extends CallSequenceItems</dd>
-</dl>
-</li>
-</ul>
-<a name="collectRunnableItems-org.eclipse.app4mc.amalthea.model.Runnable-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>collectRunnableItems</h4>
-<pre>public static&nbsp;EList&lt;RunnableItem&gt;&nbsp;collectRunnableItems(Runnable&nbsp;runnable)</pre>
-<div class="block">Traverse the runnable items graph of a runnable and collect all items.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>runnable</code> - runnable</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>List of RunnableItems</dd>
-</dl>
-</li>
-</ul>
-<a name="collectRunnableItems-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.emf.common.util.EMap-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>collectRunnableItems</h4>
-<pre>public static&nbsp;EList&lt;RunnableItem&gt;&nbsp;collectRunnableItems(Runnable&nbsp;runnable,
-                                                       EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
-<div class="block">Traverse the runnable items graph of a runnable and collect all items.
- Collection can be restricted to specific modes.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>runnable</code> - runnable</dd>
-<dd><code>modes</code> - list of mode literals that should be considered</dd>
-<dt><span class="returnLabel">Returns:</span></dt>
-<dd>List of RunnableItems</dd>
-</dl>
-</li>
-</ul>
-<a name="collectRunnableItems-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.emf.common.util.EMap-java.util.function.Function-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>collectRunnableItems</h4>
-<pre>public static&nbsp;EList&lt;RunnableItem&gt;&nbsp;collectRunnableItems(Runnable&nbsp;runnable,
-                                                       EMap&lt;ModeLabel,String&gt;&nbsp;modes,
-                                                       Function&lt;RunnableItem,Boolean&gt;&nbsp;filter)</pre>
-<div class="block">Traverse the runnable items graph of a runnable and collect all items.
- Collection can be restricted to specific modes and filtered by a lambda expression.</div>
-<dl>
-<dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>runnable</code> - runnable</dd>
-<dd><code>modes</code> - list of mode literals that should be considered</dd>
+<dd><code>container</code> - call graph, group, ...</dd>
+<dd><code>modes</code> - (optional) - null works</dd>
 <dd><code>filter</code> - lambda expression (e.g. "a -&gt; a instanceof LabelAccess")</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
-<dd>List of RunnableItems</dd>
+<dd>List of CallGraphItems</dd>
 </dl>
 </li>
 </ul>
-<a name="collectRunnableItems-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.emf.common.util.EMap-java.lang.Class-">
+<a name="collectCallGraphItems-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.emf.common.util.EMap-java.lang.Class-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>collectRunnableItems</h4>
-<pre>public static&nbsp;&lt;T extends RunnableItem&gt;&nbsp;EList&lt;T&gt;&nbsp;collectRunnableItems(Runnable&nbsp;runnable,
-                                                                     EMap&lt;ModeLabel,String&gt;&nbsp;modes,
-                                                                     Class&lt;T&gt;&nbsp;targetClass)</pre>
+<h4>collectCallGraphItems</h4>
+<pre>public static&nbsp;&lt;T extends CallGraphItem&gt;&nbsp;EList&lt;T&gt;&nbsp;collectCallGraphItems(ICallGraphItemContainer&nbsp;container,
+                                                                       EMap&lt;ModeLabel,String&gt;&nbsp;modes,
+                                                                       Class&lt;T&gt;&nbsp;targetClass)</pre>
 <div class="block">Traverse the runnable items graph of a runnable and collect all items.
  Collection can be restricted to specific modes and filtered by class.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>runnable</code> - runnable</dd>
-<dd><code>modes</code> - list of mode literals that should be considered</dd>
-<dd><code>targetClass</code> - subclass of RunnableItem that restricts the result</dd>
+<dd><code>container</code> - call graph, group, ...</dd>
+<dd><code>modes</code> - (optional) - null works</dd>
+<dd><code>targetClass</code> - subclass of CallGraphItem that restricts the result</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
-<dd>List of T extends RunnableItems</dd>
+<dd>List of T extends CallGraphItems</dd>
 </dl>
 </li>
 </ul>
-<a name="collectRunnableItems-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.emf.common.util.EMap-java.lang.Class-java.util.function.Function-">
+<a name="collectCallGraphItems-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.emf.common.util.EMap-java.lang.Class-java.util.function.Function-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>collectRunnableItems</h4>
-<pre>public static&nbsp;&lt;T extends RunnableItem&gt;&nbsp;EList&lt;T&gt;&nbsp;collectRunnableItems(Runnable&nbsp;runnable,
-                                                                     EMap&lt;ModeLabel,String&gt;&nbsp;modes,
-                                                                     Class&lt;T&gt;&nbsp;targetClass,
-                                                                     Function&lt;T,Boolean&gt;&nbsp;filter)</pre>
+<h4>collectCallGraphItems</h4>
+<pre>public static&nbsp;&lt;T extends CallGraphItem&gt;&nbsp;EList&lt;T&gt;&nbsp;collectCallGraphItems(ICallGraphItemContainer&nbsp;container,
+                                                                       EMap&lt;ModeLabel,String&gt;&nbsp;modes,
+                                                                       Class&lt;T&gt;&nbsp;targetClass,
+                                                                       Function&lt;T,Boolean&gt;&nbsp;filter)</pre>
 <div class="block">Traverse the runnable items graph of a runnable and collect all items.
  Collection can be restricted to specific modes and filtered by class and lambda expression.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>runnable</code> - runnable</dd>
-<dd><code>modes</code> - list of mode literals that should be considered</dd>
-<dd><code>targetClass</code> - subclass of RunnableItem that restricts the result</dd>
+<dd><code>container</code> - call graph, group, ...</dd>
+<dd><code>modes</code> - (optional) - null works</dd>
+<dd><code>targetClass</code> - subclass of CallGraphItem that restricts the result</dd>
 <dd><code>filter</code> - lambda expression (e.g. "a -&gt; a instanceof LabelAccess")</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
-<dd>List of T extends RunnableItems</dd>
+<dd>List of T extends CallGraphItems</dd>
 </dl>
 </li>
 </ul>
@@ -1204,8 +1066,8 @@
 <ul class="blockList">
 <li class="blockList">
 <h4>collectEventsOfProcess</h4>
-<pre>public static&nbsp;List&lt;CallSequenceItem&gt;&nbsp;collectEventsOfProcess(Process&nbsp;process,
-                                                            EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<pre>public static&nbsp;List&lt;CallGraphItem&gt;&nbsp;collectEventsOfProcess(Process&nbsp;process,
+                                                         EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
 <div class="block">Collects a list of event calls (clear, set or wait) of a process</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1236,14 +1098,14 @@
 </dl>
 </li>
 </ul>
-<a name="getProcesses-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.emf.common.util.EMap-">
+<a name="getCallingProcesses-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.emf.common.util.EMap-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>getProcesses</h4>
-<pre>public static&nbsp;List&lt;Process&gt;&nbsp;getProcesses(Runnable&nbsp;runnable,
-                                         EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<h4>getCallingProcesses</h4>
+<pre>public static&nbsp;List&lt;Process&gt;&nbsp;getCallingProcesses(Runnable&nbsp;runnable,
+                                                EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
 <div class="block">Returns a list of processes calling the runnable</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1254,14 +1116,14 @@
 </dl>
 </li>
 </ul>
-<a name="getRunnableCallParents-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.emf.common.util.EMap-">
+<a name="getCallingRunnables-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.emf.common.util.EMap-">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>getRunnableCallParents</h4>
-<pre>public static&nbsp;List&lt;Runnable&gt;&nbsp;getRunnableCallParents(Runnable&nbsp;runnable,
-                                                    EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<h4>getCallingRunnables</h4>
+<pre>public static&nbsp;List&lt;Runnable&gt;&nbsp;getCallingRunnables(Runnable&nbsp;runnable,
+                                                 EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
 <div class="block">Returns a list of runnables directly calling the runnable</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
diff --git a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/TimeUtil.html b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/TimeUtil.html
index ceb9ebb..7e08057 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/TimeUtil.html
+++ b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/TimeUtil.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Mon Apr 29 15:55:54 CEST 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
 <title>TimeUtil</title>
-<meta name="date" content="2019-04-29">
+<meta name="date" content="2019-07-31">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/package-summary.html b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/package-summary.html
index 7f6392e..43806a6 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/package-summary.html
+++ b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/package-summary.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_191) on Mon Apr 29 15:55:55 CEST 2019 -->
+<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
 <title>org.eclipse.app4mc.amalthea.model.util</title>
-<meta name="date" content="2019-04-29">
+<meta name="date" content="2019-07-31">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>