Updated Help: Regenerated 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 cb74dbc..e3e8157 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
@@ -1,16 +1,18 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML>
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:26:59 CEST 2019 -->
+<!-- Generated by javadoc (11.0.8) on Mon Nov 30 13:15:36 CET 2020 -->
 <title>AmaltheaIndex</title>
-<meta name="date" content="2019-07-31">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-11-30">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 </head>
 <body>
 <!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
 <div class="header">
-<div class="subTitle">org.eclipse.app4mc.amalthea.model</div>
+<div class="subTitle"><span class="packageLabelInType">Package</span>&nbsp;<a href="package-summary.html">org.eclipse.app4mc.amalthea.model</a></div>
 <h2 title="Class AmaltheaIndex" class="title">Class AmaltheaIndex</h2>
 </div>
 <div class="contentContainer">
@@ -26,15 +28,14 @@
 <ul class="blockList">
 <li class="blockList">
 <hr>
-<br>
 <pre>public final class <span class="typeNameLabel">AmaltheaIndex</span>
 extends Object</pre>
 <div class="block">This class provides static methods for efficient model navigation, search and delete.
  <p>
- An <code>AmaltheaCrossReferenceAdapter</code> is created and attached to the root context of the model.
+ An <a href="AmaltheaCrossReferenceAdapter.html" title="class in org.eclipse.app4mc.amalthea.model"><code>AmaltheaCrossReferenceAdapter</code></a> is created and attached to the root context of the model.
  The adapter maintains an index that allows fast access to inverse references and an index based on object name.
  <p>
- The method <a href="#getInverseReferences-org.eclipse.emf.ecore.EObject-org.eclipse.emf.ecore.EReference-java.util.Set-"><code>getInverseReferences</code></a> is called from several
+ The method <a href="#getInverseReferences(org.eclipse.emf.ecore.EObject,org.eclipse.emf.ecore.EReference,java.util.Set)"><code>getInverseReferences</code></a> is called from several
  generated model objects to compute inverse transient references based on the incoming references.</div>
 </li>
 </ul>
@@ -43,26 +44,30 @@
 <ul class="blockList">
 <li class="blockList">
 <!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a id="method.summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<table class="memberSummary">
 <caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
 </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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#buildIndex(org.eclipse.emf.common.notify.Notifier)">buildIndex</a></span>&#8203;(@NonNull Notifier&nbsp;context)</code></th>
+<td class="colLast">
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#delete(org.eclipse.emf.ecore.EObject)">delete</a></span>&#8203;(@NonNull EObject&nbsp;eObject)</code></th>
+<td class="colLast">
 <div class="block">Deletes the object from its <code>containing</code> resource
  and/or its <code>containing</code> object as well as from any
  other feature that references it within the enclosing root context
@@ -71,7 +76,8 @@
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#deleteAll(java.util.Collection)">deleteAll</a></span>&#8203;(@NonNull Collection&lt;? extends EObject&gt;&nbsp;eObjects)</code></th>
+<td class="colLast">
 <div class="block">Deletes the objects from their <code>containing</code> resource
  and/or their <code>containing</code> object as well as from any
  other feature that references it within the enclosing root context
@@ -80,8 +86,9 @@
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#deleteAll(java.util.Collection,boolean)">deleteAll</a></span>&#8203;(@NonNull Collection&lt;? extends EObject&gt;&nbsp;eObjects,
+         boolean&nbsp;recursive)</code></th>
+<td class="colLast">
 <div class="block">Deletes the objects from their <code>containing</code> resource
  and/or their <code>containing</code> object as well as from any
  other feature that references it within the enclosing root context
@@ -90,70 +97,78 @@
 </tr>
 <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,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#dumpAdapterInfo(org.eclipse.emf.common.notify.Notifier,int,java.io.PrintStream)">dumpAdapterInfo</a></span>&#8203;(@NonNull Notifier&nbsp;context,
                int&nbsp;info,
-               @Nullable PrintStream&nbsp;stream)</code>
+               @NonNull PrintStream&nbsp;stream)</code></th>
+<td class="colLast">
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getElements(org.eclipse.emf.common.notify.Notifier,java.lang.String,java.lang.Class)">getElements</a></span>&#8203;(@NonNull Notifier&nbsp;context,
+           @NonNull String&nbsp;name,
+           @NonNull Class&lt;T&gt;&nbsp;targetClass)</code></th>
+<td class="colLast">
+<div class="block">Finds elements by name and class</div>
 </td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getElements(org.eclipse.emf.common.notify.Notifier,java.util.regex.Pattern,java.lang.Class)">getElements</a></span>&#8203;(@NonNull Notifier&nbsp;context,
+           @NonNull Pattern&nbsp;namePattern,
+           @NonNull Class&lt;T&gt;&nbsp;targetClass)</code></th>
+<td class="colLast">
+<div class="block">Finds elements by name pattern and class</div>
 </td>
 </tr>
 <tr id="i7" class="rowColor">
+<td class="colFirst"><code>static IReferable</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getEObjectByID(org.eclipse.emf.common.notify.Notifier,java.lang.String)">getEObjectByID</a></span>&#8203;(@NonNull Notifier&nbsp;context,
+              @Nullable String&nbsp;id)</code></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr id="i8" class="altColor">
 <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,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getInverseReferences(org.eclipse.emf.ecore.EObject,org.eclipse.emf.ecore.EReference,java.util.Set)">getInverseReferences</a></span>&#8203;(@NonNull EObject&nbsp;eObject,
                     @NonNull EReference&nbsp;resultEReference,
-                    @NonNull Set&lt;EReference&gt;&nbsp;targetEReferences)</code>
+                    @NonNull Set&lt;@NonNull EReference&gt;&nbsp;targetEReferences)</code></th>
+<td class="colLast">
 <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>
+<td class="colFirst"><code>static List&lt;Set&lt;IReferable&gt;&gt;</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getObjectsWithConflictingNames(org.eclipse.emf.common.notify.Notifier)">getObjectsWithConflictingNames</a></span>&#8203;(@NonNull Notifier&nbsp;context)</code></th>
+<td class="colLast">&nbsp;</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 class="colFirst"><code>static Set&lt;EObject&gt;</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getReferringObjects(org.eclipse.emf.ecore.EObject)">getReferringObjects</a></span>&#8203;(@NonNull EObject&nbsp;eObject)</code></th>
+<td class="colLast">
+<div class="block">Returns a 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,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getReferringObjects(org.eclipse.emf.ecore.EObject,java.lang.Class)">getReferringObjects</a></span>&#8203;(@NonNull EObject&nbsp;eObject,
+                   @NonNull Class&lt;T&gt;&nbsp;targetClass)</code></th>
+<td class="colLast">
+<div class="block">Returns a type filtered set of objects that refer to the given <code>eObject</code>.</div>
+</td>
+</tr>
+<tr id="i12" class="altColor">
+<td class="colFirst"><code>static &lt;T extends EObject&gt;<br>Set&lt;T&gt;</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getReferringObjects(org.eclipse.emf.ecore.EObject,java.lang.Class,org.eclipse.emf.ecore.EReference)">getReferringObjects</a></span>&#8203;(@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>
+                   @NonNull EReference&nbsp;targetEReference)</code></th>
+<td class="colLast">
+<div class="block">Returns a filtered set of objects that refer to the given <code>eObject</code></div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.Object">
+<li class="blockList"><a id="methods.inherited.from.class.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;Object</h3>
@@ -161,6 +176,7 @@
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
@@ -168,20 +184,21 @@
 <ul class="blockList">
 <li class="blockList">
 <!-- ============ METHOD DETAIL ========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a id="method.detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="getInverseReferences-org.eclipse.emf.ecore.EObject-org.eclipse.emf.ecore.EReference-java.util.Set-">
+<a id="getInverseReferences(org.eclipse.emf.ecore.EObject,org.eclipse.emf.ecore.EReference,java.util.Set)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getInverseReferences</h4>
-<pre>public static&nbsp;&lt;T&gt;&nbsp;EList&lt;T&gt;&nbsp;getInverseReferences(@NonNull EObject&nbsp;eObject,
+<pre class="methodSignature">public static&nbsp;&lt;T&gt;&nbsp;EList&lt;T&gt;&nbsp;getInverseReferences&#8203;(@NonNull EObject&nbsp;eObject,
                                                 @NonNull EReference&nbsp;resultEReference,
-                                                @NonNull Set&lt;EReference&gt;&nbsp;targetEReferences)</pre>
+                                                @NonNull Set&lt;@NonNull EReference&gt;&nbsp;targetEReferences)</pre>
 <div class="block">Computes a list of objects that refer to an EObject via dedicated references.
  <p>
  This method is called from several generated model objects to compute
@@ -196,13 +213,13 @@
 </dl>
 </li>
 </ul>
-<a name="getReferringObjects-org.eclipse.emf.ecore.EObject-">
+<a id="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>
+<pre class="methodSignature">public static&nbsp;Set&lt;EObject&gt;&nbsp;getReferringObjects&#8203;(@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>
@@ -212,13 +229,13 @@
 </dl>
 </li>
 </ul>
-<a name="getReferringObjects-org.eclipse.emf.ecore.EObject-java.lang.Class-">
+<a id="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,
+<pre class="methodSignature">public static&nbsp;&lt;T extends EObject&gt;&nbsp;Set&lt;T&gt;&nbsp;getReferringObjects&#8203;(@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>
@@ -230,13 +247,13 @@
 </dl>
 </li>
 </ul>
-<a name="getReferringObjects-org.eclipse.emf.ecore.EObject-java.lang.Class-org.eclipse.emf.ecore.EReference-">
+<a id="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,
+<pre class="methodSignature">public static&nbsp;&lt;T extends EObject&gt;&nbsp;Set&lt;T&gt;&nbsp;getReferringObjects&#8203;(@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>
@@ -256,22 +273,32 @@
 </dl>
 </li>
 </ul>
-<a name="getObjectsWithConflictingNames-org.eclipse.emf.common.notify.Notifier-">
+<a id="getEObjectByID(org.eclipse.emf.common.notify.Notifier,java.lang.String)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getEObjectByID</h4>
+<pre class="methodSignature">public static&nbsp;IReferable&nbsp;getEObjectByID&#8203;(@NonNull Notifier&nbsp;context,
+                                        @Nullable String&nbsp;id)</pre>
+</li>
+</ul>
+<a id="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>
+<pre class="methodSignature">public static&nbsp;List&lt;Set&lt;IReferable&gt;&gt;&nbsp;getObjectsWithConflictingNames&#8203;(@NonNull Notifier&nbsp;context)</pre>
 </li>
 </ul>
-<a name="buildIndex-org.eclipse.emf.common.notify.Notifier-">
+<a id="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>
+<pre class="methodSignature">public static&nbsp;void&nbsp;buildIndex&#8203;(@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>
@@ -281,13 +308,13 @@
 </dl>
 </li>
 </ul>
-<a name="delete-org.eclipse.emf.ecore.EObject-">
+<a id="delete(org.eclipse.emf.ecore.EObject)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>delete</h4>
-<pre>public static&nbsp;void&nbsp;delete(@NonNull EObject&nbsp;eObject)</pre>
+<pre class="methodSignature">public static&nbsp;void&nbsp;delete&#8203;(@NonNull EObject&nbsp;eObject)</pre>
 <div class="block">Deletes the object from its <code>containing</code> resource
  and/or its <code>containing</code> object as well as from any
  other feature that references it within the enclosing root context
@@ -299,13 +326,13 @@
 </dl>
 </li>
 </ul>
-<a name="deleteAll-java.util.Collection-">
+<a id="deleteAll(java.util.Collection)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>deleteAll</h4>
-<pre>public static&nbsp;void&nbsp;deleteAll(@NonNull Collection&lt;? extends EObject&gt;&nbsp;eObjects)</pre>
+<pre class="methodSignature">public static&nbsp;void&nbsp;deleteAll&#8203;(@NonNull Collection&lt;? extends EObject&gt;&nbsp;eObjects)</pre>
 <div class="block">Deletes the objects from their <code>containing</code> resource
  and/or their <code>containing</code> object as well as from any
  other feature that references it within the enclosing root context
@@ -317,13 +344,13 @@
 </dl>
 </li>
 </ul>
-<a name="deleteAll-java.util.Collection-boolean-">
+<a id="deleteAll(java.util.Collection,boolean)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>deleteAll</h4>
-<pre>public static&nbsp;void&nbsp;deleteAll(@NonNull Collection&lt;? extends EObject&gt;&nbsp;eObjects,
+<pre class="methodSignature">public static&nbsp;void&nbsp;deleteAll&#8203;(@NonNull Collection&lt;? extends EObject&gt;&nbsp;eObjects,
                              boolean&nbsp;recursive)</pre>
 <div class="block">Deletes the objects from their <code>containing</code> resource
  and/or their <code>containing</code> object as well as from any
@@ -338,13 +365,13 @@
 </dl>
 </li>
 </ul>
-<a name="getElements-org.eclipse.emf.common.notify.Notifier-java.lang.String-java.lang.Class-">
+<a id="getElements(org.eclipse.emf.common.notify.Notifier,java.lang.String,java.lang.Class)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getElements</h4>
-<pre>public static&nbsp;&lt;T extends INamed&gt;&nbsp;Set&lt;T&gt;&nbsp;getElements(@NonNull Notifier&nbsp;context,
+<pre class="methodSignature">public static&nbsp;&lt;T extends INamed&gt;&nbsp;Set&lt;T&gt;&nbsp;getElements&#8203;(@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>
@@ -358,13 +385,13 @@
 </dl>
 </li>
 </ul>
-<a name="getElements-org.eclipse.emf.common.notify.Notifier-java.util.regex.Pattern-java.lang.Class-">
+<a id="getElements(org.eclipse.emf.common.notify.Notifier,java.util.regex.Pattern,java.lang.Class)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getElements</h4>
-<pre>public static&nbsp;&lt;T extends INamed&gt;&nbsp;Set&lt;T&gt;&nbsp;getElements(@NonNull Notifier&nbsp;context,
+<pre class="methodSignature">public static&nbsp;&lt;T extends INamed&gt;&nbsp;Set&lt;T&gt;&nbsp;getElements&#8203;(@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>
@@ -378,15 +405,15 @@
 </dl>
 </li>
 </ul>
-<a name="dumpAdapterInfo-org.eclipse.emf.common.notify.Notifier-int-java.io.PrintStream-">
+<a id="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,
+<pre class="methodSignature">public static&nbsp;void&nbsp;dumpAdapterInfo&#8203;(@NonNull Notifier&nbsp;context,
                                    int&nbsp;info,
-                                   @Nullable PrintStream&nbsp;stream)</pre>
+                                   @NonNull PrintStream&nbsp;stream)</pre>
 <div class="block">Dumps adapter info to a print stream</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -395,16 +422,18 @@
                                         <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>
+<dd><code>stream</code> - output stream (use System.out to print to console)</dd>
 </dl>
 </li>
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
 </div>
+</main>
 <!-- ========= END OF CLASS DATA ========= -->
 </body>
 </html>
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 7a72f10..d51e07a 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
@@ -1,16 +1,18 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML>
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:26:59 CEST 2019 -->
+<!-- Generated by javadoc (11.0.8) on Mon Nov 30 13:15:36 CET 2020 -->
 <title>AmaltheaMerger</title>
-<meta name="date" content="2019-07-31">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-11-30">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 </head>
 <body>
 <!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
 <div class="header">
-<div class="subTitle">org.eclipse.app4mc.amalthea.model</div>
+<div class="subTitle"><span class="packageLabelInType">Package</span>&nbsp;<a href="package-summary.html">org.eclipse.app4mc.amalthea.model</a></div>
 <h2 title="Class AmaltheaMerger" class="title">Class AmaltheaMerger</h2>
 </div>
 <div class="contentContainer">
@@ -26,7 +28,6 @@
 <ul class="blockList">
 <li class="blockList">
 <hr>
-<br>
 <pre>public class <span class="typeNameLabel">AmaltheaMerger</span>
 extends Object</pre>
 <div class="block">This class provides static methods to extend a model with major elements of a second model.</div>
@@ -36,45 +37,31 @@
 <div class="summary">
 <ul class="blockList">
 <li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="#AmaltheaMerger--">AmaltheaMerger</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
 <!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a id="method.summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<table class="memberSummary">
 <caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>static void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#addElements-org.eclipse.app4mc.amalthea.model.Amalthea-java.util.Collection-">addElements</a></span>(@NonNull Amalthea&nbsp;mainModel,
-           @NonNull Collection&lt;Amalthea&gt;&nbsp;inputs)</code>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#addElements(org.eclipse.app4mc.amalthea.model.Amalthea,java.util.Collection)">addElements</a></span>&#8203;(@NonNull Amalthea&nbsp;mainModel,
+           @NonNull Collection&lt;Amalthea&gt;&nbsp;inputs)</code></th>
+<td class="colLast">
 <div class="block">Add the contained elements of the input models to the main model.</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.Object">
+<li class="blockList"><a id="methods.inherited.from.class.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;Object</h3>
@@ -82,42 +69,27 @@
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
 <div class="details">
 <ul class="blockList">
 <li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="AmaltheaMerger--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>AmaltheaMerger</h4>
-<pre>public&nbsp;AmaltheaMerger()</pre>
-</li>
-</ul>
-</li>
-</ul>
 <!-- ============ METHOD DETAIL ========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a id="method.detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="addElements-org.eclipse.app4mc.amalthea.model.Amalthea-java.util.Collection-">
+<a id="addElements(org.eclipse.app4mc.amalthea.model.Amalthea,java.util.Collection)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>addElements</h4>
-<pre>public static&nbsp;void&nbsp;addElements(@NonNull Amalthea&nbsp;mainModel,
+<pre class="methodSignature">public static&nbsp;void&nbsp;addElements&#8203;(@NonNull Amalthea&nbsp;mainModel,
                                @NonNull Collection&lt;Amalthea&gt;&nbsp;inputs)</pre>
 <div class="block">Add the contained elements of the input models to the main model.
  Only major elements of the model (with their containments) are added.
@@ -131,10 +103,12 @@
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
 </div>
+</main>
 <!-- ========= END OF CLASS DATA ========= -->
 </body>
 </html>
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 9dd7ef0..cd89049 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
@@ -1,14 +1,16 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML>
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:26:59 CEST 2019 -->
+<!-- Generated by javadoc (11.0.8) on Mon Nov 30 13:15:36 CET 2020 -->
 <title>AmaltheaServices</title>
-<meta name="date" content="2019-07-31">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-11-30">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 </head>
 <body>
 <!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
 <div class="header">
 <div class="subTitle">org.eclipse.app4mc.amalthea.model</div>
 <h2 title="Class AmaltheaServices" class="title">Class AmaltheaServices</h2>
@@ -29,7 +31,8 @@
 <br>
 <pre>public class <span class="typeNameLabel">AmaltheaServices</span>
 extends Object</pre>
-<div class="block">This class provides static methods that implement operations of the Amalthea EMF model.
+<div class="block">This class provides static methods that implement operations of the Amalthea
+ EMF model.
  <p>
  The methods are called from several generated model objects.</div>
 </li>
@@ -39,61 +42,52 @@
 <ul class="blockList">
 <li class="blockList">
 <!-- =========== FIELD SUMMARY =========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="field.summary">
+<li class="blockList"><a id="field.summary">
 <!--   -->
 </a>
 <h3>Field Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Field Summary table, listing fields, and an explanation">
+<table class="memberSummary">
 <caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Field and Description</th>
+<th class="colSecond" scope="col">Field</th>
+<th class="colLast" scope="col">Description</th>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static List&lt;TimeUnit&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#TIME_UNIT_LIST">TIME_UNIT_LIST</a></span></code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#TIME_UNIT_LIST">TIME_UNIT_LIST</a></span></code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 </table>
 </li>
 </ul>
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="#AmaltheaServices--">AmaltheaServices</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
+</section>
 <!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a id="method.summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<table class="memberSummary">
 <caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>static Time</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#addTime-org.eclipse.app4mc.amalthea.model.Time-org.eclipse.app4mc.amalthea.model.Time-">addTime</a></span>(@NonNull Time&nbsp;t1,
-       @NonNull Time&nbsp;t2)</code>&nbsp;</td>
+<td class="colFirst"><code>static @NonNull Time</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#addTime(org.eclipse.app4mc.amalthea.model.Time,org.eclipse.app4mc.amalthea.model.Time)">addTime</a></span>&#8203;(@NonNull Time&nbsp;t1,
+       @NonNull Time&nbsp;t2)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i1" class="rowColor">
-<td class="colFirst"><code>static Time</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#adjustTimeUnit-org.eclipse.app4mc.amalthea.model.Time-">adjustTimeUnit</a></span>(@NonNull Time&nbsp;time)</code>
+<td class="colFirst"><code>static @NonNull Time</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#adjustTimeUnit(org.eclipse.app4mc.amalthea.model.Time)">adjustTimeUnit</a></span>&#8203;(@NonNull Time&nbsp;time)</code></th>
+<td class="colLast">
 <div class="block">This method takes a time (in value and unit) and adjusts the TimeUnit so that
  the value is as small as possible, without losing precision e.g. 1000us is
  converted to 1ms</div>
@@ -101,117 +95,153 @@
 </tr>
 <tr id="i2" class="altColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#compareDataRates-org.eclipse.app4mc.amalthea.model.DataRate-org.eclipse.app4mc.amalthea.model.DataRate-">compareDataRates</a></span>(@NonNull DataRate&nbsp;r1,
-                @NonNull DataRate&nbsp;r2)</code>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#compareDataRates(org.eclipse.app4mc.amalthea.model.DataRate,org.eclipse.app4mc.amalthea.model.DataRate)">compareDataRates</a></span>&#8203;(@NonNull DataRate&nbsp;r1,
+                @NonNull DataRate&nbsp;r2)</code></th>
+<td class="colLast">
 <div class="block">This method is used to compare DataRate objects on the basis of their values
  (obtained in bit per second after applying the conversion based on DataRateUnit)</div>
 </td>
 </tr>
 <tr id="i3" class="rowColor">
 <td class="colFirst"><code>static int</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#compareTimes-org.eclipse.app4mc.amalthea.model.Time-org.eclipse.app4mc.amalthea.model.Time-">compareTimes</a></span>(@NonNull Time&nbsp;t1,
-            @NonNull Time&nbsp;t2)</code>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#compareTimes(org.eclipse.app4mc.amalthea.model.Time,org.eclipse.app4mc.amalthea.model.Time)">compareTimes</a></span>&#8203;(@NonNull Time&nbsp;t1,
+            @NonNull Time&nbsp;t2)</code></th>
+<td class="colLast">
 <div class="block">This method is used to compare Time objects on the basis of their values
  (obtained in pico seconds after applying the conversion based on TimeUnit)</div>
 </td>
 </tr>
 <tr id="i4" class="altColor">
 <td class="colFirst"><code>static BigInteger</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#convertToBit-org.eclipse.app4mc.amalthea.model.DataSize-">convertToBit</a></span>(@NonNull DataSize&nbsp;size)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#convertToBit(org.eclipse.app4mc.amalthea.model.DataSize)">convertToBit</a></span>&#8203;(@NonNull DataSize&nbsp;size)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i5" class="rowColor">
 <td class="colFirst"><code>static BigInteger</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#convertToBitPerSecond-org.eclipse.app4mc.amalthea.model.DataRate-">convertToBitPerSecond</a></span>(@NonNull DataRate&nbsp;rate)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#convertToBitPerSecond(org.eclipse.app4mc.amalthea.model.DataRate)">convertToBitPerSecond</a></span>&#8203;(@NonNull DataRate&nbsp;rate)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i6" class="altColor">
 <td class="colFirst"><code>static BigDecimal</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#convertToHertz-org.eclipse.app4mc.amalthea.model.Frequency-">convertToHertz</a></span>(@NonNull Frequency&nbsp;frequency)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#convertToHertz(org.eclipse.app4mc.amalthea.model.Frequency)">convertToHertz</a></span>&#8203;(@NonNull Frequency&nbsp;frequency)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i7" class="rowColor">
 <td class="colFirst"><code>static BigDecimal</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#convertToMicroVolt-org.eclipse.app4mc.amalthea.model.Voltage-">convertToMicroVolt</a></span>(@NonNull Voltage&nbsp;voltage)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#convertToMicroVolt(org.eclipse.app4mc.amalthea.model.Voltage)">convertToMicroVolt</a></span>&#8203;(@NonNull Voltage&nbsp;voltage)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i8" class="altColor">
 <td class="colFirst"><code>static BigInteger</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#convertToPicoSeconds-org.eclipse.app4mc.amalthea.model.Time-">convertToPicoSeconds</a></span>(@NonNull Time&nbsp;time)</code>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#convertToPicoSeconds(org.eclipse.app4mc.amalthea.model.Time)">convertToPicoSeconds</a></span>&#8203;(@NonNull Time&nbsp;time)</code></th>
+<td class="colLast">
 <div class="block">This method is used to convert the value of Time/TimeObject element's value
  to BigInteger in Pico Seconds</div>
 </td>
 </tr>
 <tr id="i9" class="rowColor">
-<td class="colFirst"><code>static double</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#divideTime-org.eclipse.app4mc.amalthea.model.Time-org.eclipse.app4mc.amalthea.model.Time-">divideTime</a></span>(@NonNull Time&nbsp;t1,
-          @NonNull Time&nbsp;t2)</code>&nbsp;</td>
+<td class="colFirst"><code>static BigDecimal</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#convertToSeconds(double,org.eclipse.app4mc.amalthea.model.TimeUnit)">convertToSeconds</a></span>&#8203;(double&nbsp;time,
+                @NonNull TimeUnit&nbsp;timeUnit)</code></th>
+<td class="colLast">
+<div class="block">This method is used to convert a time with associated time unit
+ to BigDecimal in seconds</div>
+</td>
 </tr>
 <tr id="i10" class="altColor">
-<td class="colFirst"><code>static EList&lt;HwModule&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getAllModules-org.eclipse.app4mc.amalthea.model.HwStructure-">getAllModules</a></span>(@NonNull HwStructure&nbsp;struct)</code>&nbsp;</td>
+<td class="colFirst"><code>static BigDecimal</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#convertToSeconds(org.eclipse.app4mc.amalthea.model.Time)">convertToSeconds</a></span>&#8203;(@NonNull Time&nbsp;time)</code></th>
+<td class="colLast">
+<div class="block">This method is used to convert the value of Time/TimeObject element's value
+ to BigDecimal in seconds</div>
+</td>
 </tr>
 <tr id="i11" class="rowColor">
 <td class="colFirst"><code>static double</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getAverageOfTruncatedNormalDistribution-java.lang.Number-java.lang.Number-double-double-">getAverageOfTruncatedNormalDistribution</a></span>(@Nullable Number&nbsp;a,
-                                       @Nullable Number&nbsp;b,
-                                       double&nbsp;mean,
-                                       double&nbsp;sd)</code>
-<div class="block">Computes the average (mean) of the truncated normal distribution
- 
- See <a
-                href="https://en.wikipedia.org/wiki/Truncated_normal_distribution"
-                target="_top">Truncated normal distribution (Wikipedia)</a></div>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#divideTime(org.eclipse.app4mc.amalthea.model.Time,org.eclipse.app4mc.amalthea.model.Time)">divideTime</a></span>&#8203;(@NonNull Time&nbsp;t1,
+          @NonNull Time&nbsp;t2)</code></th>
+<td class="colLast">
+<div class="block">Divides t1 by t2</div>
 </td>
 </tr>
 <tr id="i12" class="altColor">
-<td class="colFirst"><code>static Time</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getAverageOfTruncatedNormalDistribution-org.eclipse.app4mc.amalthea.model.Time-org.eclipse.app4mc.amalthea.model.Time-org.eclipse.app4mc.amalthea.model.Time-org.eclipse.app4mc.amalthea.model.Time-">getAverageOfTruncatedNormalDistribution</a></span>(@Nullable Time&nbsp;a,
-                                       @Nullable Time&nbsp;b,
-                                       @NonNull Time&nbsp;mean,
-                                       @NonNull Time&nbsp;sd)</code>
-<div class="block">Computes the average (mean) of the truncated normal distribution
- 
- See <a
-                href="https://en.wikipedia.org/wiki/Truncated_normal_distribution"
-                target="_top">Truncated normal distribution (Wikipedia)</a></div>
-</td>
+<td class="colFirst"><code>static EList&lt;HwModule&gt;</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getAllModules(org.eclipse.app4mc.amalthea.model.HwStructure)">getAllModules</a></span>&#8203;(@NonNull HwStructure&nbsp;struct)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i13" class="rowColor">
-<td class="colFirst"><code>static &lt;T extends EObject&gt;<br>T</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getContainerOfType-org.eclipse.emf.ecore.EObject-java.lang.Class-">getContainerOfType</a></span>(@NonNull EObject&nbsp;object,
-                  @NonNull Class&lt;T&gt;&nbsp;type)</code>&nbsp;</td>
+<td class="colFirst"><code>static double</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getAverageOfBetaDistribution(java.lang.Number,java.lang.Number,double,double)">getAverageOfBetaDistribution</a></span>&#8203;(@NonNull Number&nbsp;inputA,
+                            @NonNull Number&nbsp;inputB,
+                            double&nbsp;alpha,
+                            double&nbsp;beta)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i14" class="altColor">
-<td class="colFirst"><code>static EList&lt;HwPort&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getInnerPorts-org.eclipse.app4mc.amalthea.model.HwStructure-">getInnerPorts</a></span>(@NonNull HwStructure&nbsp;struct)</code>&nbsp;</td>
+<td class="colFirst"><code>static Time</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getAverageOfBetaDistribution(org.eclipse.app4mc.amalthea.model.Time,org.eclipse.app4mc.amalthea.model.Time,double,double)">getAverageOfBetaDistribution</a></span>&#8203;(@NonNull Time&nbsp;a,
+                            @NonNull Time&nbsp;b,
+                            double&nbsp;alpha,
+                            double&nbsp;beta)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i15" class="rowColor">
-<td class="colFirst"><code>static EList&lt;QualifiedPort&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getInnerPorts-org.eclipse.app4mc.amalthea.model.ISystem-">getInnerPorts</a></span>(@NonNull ISystem&nbsp;system)</code>&nbsp;</td>
+<td class="colFirst"><code>static double</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getAverageOfTruncatedNormalDistribution(java.lang.Number,java.lang.Number,double,double)">getAverageOfTruncatedNormalDistribution</a></span>&#8203;(@Nullable Number&nbsp;inputA,
+                                       @Nullable Number&nbsp;inputB,
+                                       double&nbsp;mean,
+                                       double&nbsp;sd)</code></th>
+<td class="colLast">
+<div class="block">Computes the average (mean) of the truncated normal distribution</div>
+</td>
 </tr>
 <tr id="i16" class="altColor">
-<td class="colFirst"><code>static String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getLongName-org.eclipse.app4mc.amalthea.model.IReferable-">getLongName</a></span>(@NonNull IReferable&nbsp;object)</code>&nbsp;</td>
+<td class="colFirst"><code>static @NonNull Time</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getAverageOfTruncatedNormalDistribution(org.eclipse.app4mc.amalthea.model.Time,org.eclipse.app4mc.amalthea.model.Time,org.eclipse.app4mc.amalthea.model.Time,org.eclipse.app4mc.amalthea.model.Time)">getAverageOfTruncatedNormalDistribution</a></span>&#8203;(@Nullable Time&nbsp;a,
+                                       @Nullable Time&nbsp;b,
+                                       @NonNull Time&nbsp;mean,
+                                       @NonNull Time&nbsp;sd)</code></th>
+<td class="colLast">
+<div class="block">Computes the average (mean) of the truncated normal distribution</div>
+</td>
 </tr>
 <tr id="i17" class="rowColor">
-<td class="colFirst"><code>static String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getUniqueName-org.eclipse.app4mc.amalthea.model.IReferable-">getUniqueName</a></span>(@NonNull IReferable&nbsp;object)</code>&nbsp;</td>
+<td class="colFirst"><code>static &lt;T extends EObject&gt;<br>T</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getContainerOfType(org.eclipse.emf.ecore.EObject,java.lang.Class)">getContainerOfType</a></span>&#8203;(@NonNull EObject&nbsp;object,
+                  @NonNull Class&lt;T&gt;&nbsp;type)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i18" class="altColor">
-<td class="colFirst"><code>static Time</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#multiply-org.eclipse.app4mc.amalthea.model.Time-double-">multiply</a></span>(@NonNull Time&nbsp;t1,
-        double&nbsp;value)</code>&nbsp;</td>
+<td class="colFirst"><code>static EList&lt;HwPort&gt;</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getInnerPorts(org.eclipse.app4mc.amalthea.model.HwStructure)">getInnerPorts</a></span>&#8203;(@NonNull HwStructure&nbsp;struct)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i19" class="rowColor">
-<td class="colFirst"><code>static Time</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#multiply-org.eclipse.app4mc.amalthea.model.Time-long-">multiply</a></span>(@NonNull Time&nbsp;t1,
-        long&nbsp;value)</code>&nbsp;</td>
+<td class="colFirst"><code>static EList&lt;QualifiedPort&gt;</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getInnerPorts(org.eclipse.app4mc.amalthea.model.ISystem)">getInnerPorts</a></span>&#8203;(@NonNull ISystem&nbsp;system)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i20" class="altColor">
-<td class="colFirst"><code>static Time</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#subtractTime-org.eclipse.app4mc.amalthea.model.Time-org.eclipse.app4mc.amalthea.model.Time-">subtractTime</a></span>(@NonNull Time&nbsp;t1,
-            @NonNull Time&nbsp;t2)</code>&nbsp;</td>
+<td class="colFirst"><code>static @NonNull Time</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#multiply(org.eclipse.app4mc.amalthea.model.Time,double)">multiply</a></span>&#8203;(@NonNull Time&nbsp;t1,
+        double&nbsp;value)</code></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr id="i21" class="rowColor">
+<td class="colFirst"><code>static @NonNull Time</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#multiply(org.eclipse.app4mc.amalthea.model.Time,long)">multiply</a></span>&#8203;(@NonNull Time&nbsp;t1,
+        long&nbsp;value)</code></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr id="i22" class="altColor">
+<td class="colFirst"><code>static @NonNull Time</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#subtractTime(org.eclipse.app4mc.amalthea.model.Time,org.eclipse.app4mc.amalthea.model.Time)">subtractTime</a></span>&#8203;(@NonNull Time&nbsp;t1,
+            @NonNull Time&nbsp;t2)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.Object">
+<li class="blockList"><a id="methods.inherited.from.class.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;Object</h3>
@@ -219,6 +249,7 @@
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
@@ -226,12 +257,13 @@
 <ul class="blockList">
 <li class="blockList">
 <!-- ============ FIELD DETAIL =========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="field.detail">
+<li class="blockList"><a id="field.detail">
 <!--   -->
 </a>
 <h3>Field Detail</h3>
-<a name="TIME_UNIT_LIST">
+<a id="TIME_UNIT_LIST">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -242,82 +274,49 @@
 </ul>
 </li>
 </ul>
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="AmaltheaServices--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>AmaltheaServices</h4>
-<pre>public&nbsp;AmaltheaServices()</pre>
-</li>
-</ul>
-</li>
-</ul>
+</section>
 <!-- ============ METHOD DETAIL ========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a id="method.detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="getLongName-org.eclipse.app4mc.amalthea.model.IReferable-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getLongName</h4>
-<pre>public static&nbsp;String&nbsp;getLongName(@NonNull IReferable&nbsp;object)</pre>
-</li>
-</ul>
-<a name="getUniqueName-org.eclipse.app4mc.amalthea.model.IReferable-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>getUniqueName</h4>
-<pre>public static&nbsp;String&nbsp;getUniqueName(@NonNull IReferable&nbsp;object)</pre>
-</li>
-</ul>
-<a name="getContainerOfType-org.eclipse.emf.ecore.EObject-java.lang.Class-">
+<a id="getContainerOfType(org.eclipse.emf.ecore.EObject,java.lang.Class)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getContainerOfType</h4>
-<pre>public static&nbsp;&lt;T extends EObject&gt;&nbsp;T&nbsp;getContainerOfType(@NonNull EObject&nbsp;object,
+<pre class="methodSignature">public static&nbsp;&lt;T extends EObject&gt;&nbsp;T&nbsp;getContainerOfType&#8203;(@NonNull EObject&nbsp;object,
                                                        @NonNull Class&lt;T&gt;&nbsp;type)</pre>
 </li>
 </ul>
-<a name="convertToBit-org.eclipse.app4mc.amalthea.model.DataSize-">
+<a id="convertToBit(org.eclipse.app4mc.amalthea.model.DataSize)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>convertToBit</h4>
-<pre>public static&nbsp;BigInteger&nbsp;convertToBit(@NonNull DataSize&nbsp;size)</pre>
+<pre class="methodSignature">public static&nbsp;BigInteger&nbsp;convertToBit&#8203;(@NonNull DataSize&nbsp;size)</pre>
 </li>
 </ul>
-<a name="convertToBitPerSecond-org.eclipse.app4mc.amalthea.model.DataRate-">
+<a id="convertToBitPerSecond(org.eclipse.app4mc.amalthea.model.DataRate)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>convertToBitPerSecond</h4>
-<pre>public static&nbsp;BigInteger&nbsp;convertToBitPerSecond(@NonNull DataRate&nbsp;rate)</pre>
+<pre class="methodSignature">public static&nbsp;BigInteger&nbsp;convertToBitPerSecond&#8203;(@NonNull DataRate&nbsp;rate)</pre>
 </li>
 </ul>
-<a name="convertToPicoSeconds-org.eclipse.app4mc.amalthea.model.Time-">
+<a id="convertToPicoSeconds(org.eclipse.app4mc.amalthea.model.Time)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>convertToPicoSeconds</h4>
-<pre>public static&nbsp;BigInteger&nbsp;convertToPicoSeconds(@NonNull Time&nbsp;time)</pre>
+<pre class="methodSignature">public static&nbsp;BigInteger&nbsp;convertToPicoSeconds&#8203;(@NonNull Time&nbsp;time)</pre>
 <div class="block">This method is used to convert the value of Time/TimeObject element's value
  to BigInteger in Pico Seconds</div>
 <dl>
@@ -328,31 +327,67 @@
 </dl>
 </li>
 </ul>
-<a name="convertToHertz-org.eclipse.app4mc.amalthea.model.Frequency-">
+<a id="convertToSeconds(double,org.eclipse.app4mc.amalthea.model.TimeUnit)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>convertToSeconds</h4>
+<pre class="methodSignature">public static&nbsp;BigDecimal&nbsp;convertToSeconds&#8203;(double&nbsp;time,
+                                          @NonNull TimeUnit&nbsp;timeUnit)</pre>
+<div class="block">This method is used to convert a time with associated time unit
+ to BigDecimal in seconds</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>time</code> - time as double</dd>
+<dd><code>timeUnit</code> - the time unit</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>value BigDecimal in seconds</dd>
+</dl>
+</li>
+</ul>
+<a id="convertToSeconds(org.eclipse.app4mc.amalthea.model.Time)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>convertToSeconds</h4>
+<pre class="methodSignature">public static&nbsp;BigDecimal&nbsp;convertToSeconds&#8203;(@NonNull Time&nbsp;time)</pre>
+<div class="block">This method is used to convert the value of Time/TimeObject element's value
+ to BigDecimal in seconds</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>time</code> - Time object</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>value BigDecimal in seconds</dd>
+</dl>
+</li>
+</ul>
+<a id="convertToHertz(org.eclipse.app4mc.amalthea.model.Frequency)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>convertToHertz</h4>
-<pre>public static&nbsp;BigDecimal&nbsp;convertToHertz(@NonNull Frequency&nbsp;frequency)</pre>
+<pre class="methodSignature">public static&nbsp;BigDecimal&nbsp;convertToHertz&#8203;(@NonNull Frequency&nbsp;frequency)</pre>
 </li>
 </ul>
-<a name="convertToMicroVolt-org.eclipse.app4mc.amalthea.model.Voltage-">
+<a id="convertToMicroVolt(org.eclipse.app4mc.amalthea.model.Voltage)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>convertToMicroVolt</h4>
-<pre>public static&nbsp;BigDecimal&nbsp;convertToMicroVolt(@NonNull Voltage&nbsp;voltage)</pre>
+<pre class="methodSignature">public static&nbsp;BigDecimal&nbsp;convertToMicroVolt&#8203;(@NonNull Voltage&nbsp;voltage)</pre>
 </li>
 </ul>
-<a name="compareDataRates-org.eclipse.app4mc.amalthea.model.DataRate-org.eclipse.app4mc.amalthea.model.DataRate-">
+<a id="compareDataRates(org.eclipse.app4mc.amalthea.model.DataRate,org.eclipse.app4mc.amalthea.model.DataRate)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>compareDataRates</h4>
-<pre>public static&nbsp;int&nbsp;compareDataRates(@NonNull DataRate&nbsp;r1,
+<pre class="methodSignature">public static&nbsp;int&nbsp;compareDataRates&#8203;(@NonNull DataRate&nbsp;r1,
                                    @NonNull DataRate&nbsp;r2)</pre>
 <div class="block">This method is used to compare DataRate objects on the basis of their values
  (obtained in bit per second after applying the conversion based on DataRateUnit)</div>
@@ -365,13 +400,13 @@
 </dl>
 </li>
 </ul>
-<a name="compareTimes-org.eclipse.app4mc.amalthea.model.Time-org.eclipse.app4mc.amalthea.model.Time-">
+<a id="compareTimes(org.eclipse.app4mc.amalthea.model.Time,org.eclipse.app4mc.amalthea.model.Time)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>compareTimes</h4>
-<pre>public static&nbsp;int&nbsp;compareTimes(@NonNull Time&nbsp;t1,
+<pre class="methodSignature">public static&nbsp;int&nbsp;compareTimes&#8203;(@NonNull Time&nbsp;t1,
                                @NonNull Time&nbsp;t2)</pre>
 <div class="block">This method is used to compare Time objects on the basis of their values
  (obtained in pico seconds after applying the conversion based on TimeUnit)</div>
@@ -384,13 +419,13 @@
 </dl>
 </li>
 </ul>
-<a name="adjustTimeUnit-org.eclipse.app4mc.amalthea.model.Time-">
+<a id="adjustTimeUnit(org.eclipse.app4mc.amalthea.model.Time)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>adjustTimeUnit</h4>
-<pre>public static&nbsp;Time&nbsp;adjustTimeUnit(@NonNull Time&nbsp;time)</pre>
+<pre class="methodSignature">public static&nbsp;@NonNull Time&nbsp;adjustTimeUnit&#8203;(@NonNull Time&nbsp;time)</pre>
 <div class="block">This method takes a time (in value and unit) and adjusts the TimeUnit so that
  the value is as small as possible, without losing precision e.g. 1000us is
  converted to 1ms</div>
@@ -402,71 +437,82 @@
 </dl>
 </li>
 </ul>
-<a name="addTime-org.eclipse.app4mc.amalthea.model.Time-org.eclipse.app4mc.amalthea.model.Time-">
+<a id="addTime(org.eclipse.app4mc.amalthea.model.Time,org.eclipse.app4mc.amalthea.model.Time)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>addTime</h4>
-<pre>public static&nbsp;Time&nbsp;addTime(@NonNull Time&nbsp;t1,
+<pre class="methodSignature">public static&nbsp;@NonNull Time&nbsp;addTime&#8203;(@NonNull Time&nbsp;t1,
                            @NonNull Time&nbsp;t2)</pre>
 </li>
 </ul>
-<a name="subtractTime-org.eclipse.app4mc.amalthea.model.Time-org.eclipse.app4mc.amalthea.model.Time-">
+<a id="subtractTime(org.eclipse.app4mc.amalthea.model.Time,org.eclipse.app4mc.amalthea.model.Time)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>subtractTime</h4>
-<pre>public static&nbsp;Time&nbsp;subtractTime(@NonNull Time&nbsp;t1,
+<pre class="methodSignature">public static&nbsp;@NonNull Time&nbsp;subtractTime&#8203;(@NonNull Time&nbsp;t1,
                                 @NonNull Time&nbsp;t2)</pre>
 </li>
 </ul>
-<a name="divideTime-org.eclipse.app4mc.amalthea.model.Time-org.eclipse.app4mc.amalthea.model.Time-">
+<a id="divideTime(org.eclipse.app4mc.amalthea.model.Time,org.eclipse.app4mc.amalthea.model.Time)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>divideTime</h4>
-<pre>public static&nbsp;double&nbsp;divideTime(@NonNull Time&nbsp;t1,
+<pre class="methodSignature">public static&nbsp;double&nbsp;divideTime&#8203;(@NonNull Time&nbsp;t1,
                                 @NonNull Time&nbsp;t2)</pre>
+<div class="block">Divides t1 by t2
+ <p>
+ In case of t2 == 0 the limit t2 -> 0 is used</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>t1</code> - </dd>
+<dd><code>t2</code> - </dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>t1 / t2</dd>
+</dl>
 </li>
 </ul>
-<a name="multiply-org.eclipse.app4mc.amalthea.model.Time-long-">
+<a id="multiply(org.eclipse.app4mc.amalthea.model.Time,long)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>multiply</h4>
-<pre>public static&nbsp;Time&nbsp;multiply(@NonNull Time&nbsp;t1,
+<pre class="methodSignature">public static&nbsp;@NonNull Time&nbsp;multiply&#8203;(@NonNull Time&nbsp;t1,
                             long&nbsp;value)</pre>
 </li>
 </ul>
-<a name="multiply-org.eclipse.app4mc.amalthea.model.Time-double-">
+<a id="multiply(org.eclipse.app4mc.amalthea.model.Time,double)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>multiply</h4>
-<pre>public static&nbsp;Time&nbsp;multiply(@NonNull Time&nbsp;t1,
+<pre class="methodSignature">public static&nbsp;@NonNull Time&nbsp;multiply&#8203;(@NonNull Time&nbsp;t1,
                             double&nbsp;value)</pre>
 </li>
 </ul>
-<a name="getAverageOfTruncatedNormalDistribution-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 id="getAverageOfTruncatedNormalDistribution(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>getAverageOfTruncatedNormalDistribution</h4>
-<pre>public static&nbsp;Time&nbsp;getAverageOfTruncatedNormalDistribution(@Nullable Time&nbsp;a,
+<pre class="methodSignature">public static&nbsp;@NonNull Time&nbsp;getAverageOfTruncatedNormalDistribution&#8203;(@Nullable Time&nbsp;a,
                                                            @Nullable Time&nbsp;b,
                                                            @NonNull Time&nbsp;mean,
                                                            @NonNull Time&nbsp;sd)</pre>
 <div class="block">Computes the average (mean) of the truncated normal distribution
  
- <p>See <a
-                href="https://en.wikipedia.org/wiki/Truncated_normal_distribution"
-                target="_top">Truncated normal distribution (Wikipedia)</a></p></div>
+ <p>
+ See
+ <a href="https://en.wikipedia.org/wiki/Truncated_normal_distribution" target="_top">Truncated normal distribution (Wikipedia)</a>
+ </p></div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>a</code> - lower bound (null = not truncated from below)</dd>
@@ -478,25 +524,26 @@
 </dl>
 </li>
 </ul>
-<a name="getAverageOfTruncatedNormalDistribution-java.lang.Number-java.lang.Number-double-double-">
+<a id="getAverageOfTruncatedNormalDistribution(java.lang.Number,java.lang.Number,double,double)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getAverageOfTruncatedNormalDistribution</h4>
-<pre>public static&nbsp;double&nbsp;getAverageOfTruncatedNormalDistribution(@Nullable Number&nbsp;a,
-                                                             @Nullable Number&nbsp;b,
+<pre class="methodSignature">public static&nbsp;double&nbsp;getAverageOfTruncatedNormalDistribution&#8203;(@Nullable Number&nbsp;inputA,
+                                                             @Nullable Number&nbsp;inputB,
                                                              double&nbsp;mean,
                                                              double&nbsp;sd)</pre>
 <div class="block">Computes the average (mean) of the truncated normal distribution
  
- <p>See <a
-                href="https://en.wikipedia.org/wiki/Truncated_normal_distribution"
-                target="_top">Truncated normal distribution (Wikipedia)</a></p></div>
+ <p>
+ See
+ <a href="https://en.wikipedia.org/wiki/Truncated_normal_distribution" target="_top">Truncated normal distribution (Wikipedia)</a>
+ </p></div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
-<dd><code>a</code> - lower bound (null = not truncated from below)</dd>
-<dd><code>b</code> - upper bound (null = not truncated from above)</dd>
+<dd><code>inputA</code> - lower bound (null = not truncated from below)</dd>
+<dd><code>inputB</code> - upper bound (null = not truncated from above)</dd>
 <dd><code>mean</code> - mean or expectation of the (unlimited) distribution</dd>
 <dd><code>sd</code> - standard deviation</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -504,39 +551,65 @@
 </dl>
 </li>
 </ul>
-<a name="getInnerPorts-org.eclipse.app4mc.amalthea.model.ISystem-">
+<a id="getAverageOfBetaDistribution(org.eclipse.app4mc.amalthea.model.Time,org.eclipse.app4mc.amalthea.model.Time,double,double)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getAverageOfBetaDistribution</h4>
+<pre class="methodSignature">public static&nbsp;Time&nbsp;getAverageOfBetaDistribution&#8203;(@NonNull Time&nbsp;a,
+                                                @NonNull Time&nbsp;b,
+                                                double&nbsp;alpha,
+                                                double&nbsp;beta)</pre>
+</li>
+</ul>
+<a id="getAverageOfBetaDistribution(java.lang.Number,java.lang.Number,double,double)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getAverageOfBetaDistribution</h4>
+<pre class="methodSignature">public static&nbsp;Double&nbsp;getAverageOfBetaDistribution&#8203;(@NonNull Number&nbsp;inputA,
+                                                  @NonNull Number&nbsp;inputB,
+                                                  double&nbsp;alpha,
+                                                  double&nbsp;beta)</pre>
+</li>
+</ul>
+<a id="getInnerPorts(org.eclipse.app4mc.amalthea.model.ISystem)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getInnerPorts</h4>
-<pre>public static&nbsp;EList&lt;QualifiedPort&gt;&nbsp;getInnerPorts(@NonNull ISystem&nbsp;system)</pre>
+<pre class="methodSignature">public static&nbsp;EList&lt;QualifiedPort&gt;&nbsp;getInnerPorts&#8203;(@NonNull ISystem&nbsp;system)</pre>
 </li>
 </ul>
-<a name="getInnerPorts-org.eclipse.app4mc.amalthea.model.HwStructure-">
+<a id="getInnerPorts(org.eclipse.app4mc.amalthea.model.HwStructure)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getInnerPorts</h4>
-<pre>public static&nbsp;EList&lt;HwPort&gt;&nbsp;getInnerPorts(@NonNull HwStructure&nbsp;struct)</pre>
+<pre class="methodSignature">public static&nbsp;EList&lt;HwPort&gt;&nbsp;getInnerPorts&#8203;(@NonNull HwStructure&nbsp;struct)</pre>
 </li>
 </ul>
-<a name="getAllModules-org.eclipse.app4mc.amalthea.model.HwStructure-">
+<a id="getAllModules(org.eclipse.app4mc.amalthea.model.HwStructure)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getAllModules</h4>
-<pre>public static&nbsp;EList&lt;HwModule&gt;&nbsp;getAllModules(@NonNull HwStructure&nbsp;struct)</pre>
+<pre class="methodSignature">public static&nbsp;EList&lt;HwModule&gt;&nbsp;getAllModules&#8203;(@NonNull HwStructure&nbsp;struct)</pre>
 </li>
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
 </div>
+</main>
 <!-- ========= END OF CLASS DATA ========= -->
 </body>
 </html>
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 17c096f..eb6df6d 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
@@ -1,16 +1,18 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML>
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
+<!-- Generated by javadoc (11.0.8) on Mon Nov 30 13:15:36 CET 2020 -->
 <title>AmaltheaBuilder</title>
-<meta name="date" content="2019-07-31">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-11-30">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
 <!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
 <div class="header">
-<div class="subTitle">org.eclipse.app4mc.amalthea.model.builder</div>
+<div class="subTitle"><span class="packageLabelInType">Package</span>&nbsp;<a href="package-summary.html">org.eclipse.app4mc.amalthea.model.builder</a></div>
 <h2 title="Class AmaltheaBuilder" class="title">Class AmaltheaBuilder</h2>
 </div>
 <div class="contentContainer">
@@ -26,7 +28,6 @@
 <ul class="blockList">
 <li class="blockList">
 <hr>
-<br>
 <pre>public class <span class="typeNameLabel">AmaltheaBuilder</span>
 extends Object</pre>
 </li>
@@ -36,107 +37,127 @@
 <ul class="blockList">
 <li class="blockList">
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a id="constructor.summary">
 <!--   -->
 </a>
 <h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<table class="memberSummary">
 <caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
-<th class="colOne" scope="col">Constructor and Description</th>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="#AmaltheaBuilder--">AmaltheaBuilder</a></span>()</code>&nbsp;</td>
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E()">AmaltheaBuilder</a></span>()</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 </table>
 </li>
 </ul>
+</section>
 <!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a id="method.summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<table class="memberSummary">
 <caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>&lt;T extends INamed&gt;<br>T</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#Z:Z_find-org.eclipse.emf.ecore.EObject-java.lang.Class-java.lang.String-">_find</a></span>(@NonNull EObject&nbsp;context,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#_find(org.eclipse.emf.ecore.EObject,java.lang.Class,java.lang.String)">_find</a></span>&#8203;(@NonNull EObject&nbsp;context,
      @NonNull Class&lt;T&gt;&nbsp;cl,
-     @NonNull String&nbsp;name)</code>&nbsp;</td>
+     @NonNull String&nbsp;name)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>&lt;T extends EObject&gt;<br>T</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#Z:Z_ref-java.lang.Class-java.lang.String-">_ref</a></span>(@NonNull Class&lt;T&gt;&nbsp;cl,
-    @NonNull String&nbsp;name)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#_ref(java.lang.Class,java.lang.String)">_ref</a></span>&#8203;(@NonNull Class&lt;T&gt;&nbsp;cl,
+    @NonNull String&nbsp;name)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i2" class="altColor">
 <td class="colFirst"><code>&lt;T extends EObject&gt;<br>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#Z:Z_reg-T-java.lang.String-">_reg</a></span>(T&nbsp;object,
-    @NonNull String&nbsp;name)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#_reg(T,java.lang.String)">_reg</a></span>&#8203;(@NonNull T&nbsp;object,
+    @NonNull String&nbsp;name)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i3" class="rowColor">
 <td class="colFirst"><code>Amalthea</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#amalthea-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">amalthea</a></span>(Procedures.Procedure1&lt;Amalthea&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#amalthea(org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">amalthea</a></span>&#8203;(Procedures.Procedure1&lt;Amalthea&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i4" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#commonElements-org.eclipse.app4mc.amalthea.model.Amalthea-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">commonElements</a></span>(Amalthea&nbsp;container,
-              Procedures.Procedure1&lt;CommonElements&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#commonElements(org.eclipse.app4mc.amalthea.model.Amalthea,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">commonElements</a></span>&#8203;(Amalthea&nbsp;container,
+              Procedures.Procedure1&lt;CommonElements&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i5" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#componentsModel-org.eclipse.app4mc.amalthea.model.Amalthea-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">componentsModel</a></span>(Amalthea&nbsp;container,
-               Procedures.Procedure1&lt;ComponentsModel&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#componentsModel(org.eclipse.app4mc.amalthea.model.Amalthea,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">componentsModel</a></span>&#8203;(Amalthea&nbsp;container,
+               Procedures.Procedure1&lt;ComponentsModel&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i6" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#constraintsModel-org.eclipse.app4mc.amalthea.model.Amalthea-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">constraintsModel</a></span>(Amalthea&nbsp;container,
-                Procedures.Procedure1&lt;ConstraintsModel&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#constraintsModel(org.eclipse.app4mc.amalthea.model.Amalthea,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">constraintsModel</a></span>&#8203;(Amalthea&nbsp;container,
+                Procedures.Procedure1&lt;ConstraintsModel&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i7" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#eventModel-org.eclipse.app4mc.amalthea.model.Amalthea-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">eventModel</a></span>(Amalthea&nbsp;container,
-          Procedures.Procedure1&lt;EventModel&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#eventModel(org.eclipse.app4mc.amalthea.model.Amalthea,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">eventModel</a></span>&#8203;(Amalthea&nbsp;container,
+          Procedures.Procedure1&lt;EventModel&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i8" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#hardwareModel-org.eclipse.app4mc.amalthea.model.Amalthea-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">hardwareModel</a></span>(Amalthea&nbsp;container,
-             Procedures.Procedure1&lt;HWModel&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#hardwareModel(org.eclipse.app4mc.amalthea.model.Amalthea,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">hardwareModel</a></span>&#8203;(Amalthea&nbsp;container,
+             Procedures.Procedure1&lt;HWModel&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i9" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#mappingModel-org.eclipse.app4mc.amalthea.model.Amalthea-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">mappingModel</a></span>(Amalthea&nbsp;container,
-            Procedures.Procedure1&lt;MappingModel&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#mappingModel(org.eclipse.app4mc.amalthea.model.Amalthea,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">mappingModel</a></span>&#8203;(Amalthea&nbsp;container,
+            Procedures.Procedure1&lt;MappingModel&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i10" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#osModel-org.eclipse.app4mc.amalthea.model.Amalthea-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">osModel</a></span>(Amalthea&nbsp;container,
-       Procedures.Procedure1&lt;OSModel&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#osModel(org.eclipse.app4mc.amalthea.model.Amalthea,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">osModel</a></span>&#8203;(Amalthea&nbsp;container,
+       Procedures.Procedure1&lt;OSModel&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i11" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#propertyConstraintsModel-org.eclipse.app4mc.amalthea.model.Amalthea-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">propertyConstraintsModel</a></span>(Amalthea&nbsp;container,
-                        Procedures.Procedure1&lt;PropertyConstraintsModel&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#propertyConstraintsModel(org.eclipse.app4mc.amalthea.model.Amalthea,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">propertyConstraintsModel</a></span>&#8203;(Amalthea&nbsp;container,
+                        Procedures.Procedure1&lt;PropertyConstraintsModel&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i12" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#softwareModel-org.eclipse.app4mc.amalthea.model.Amalthea-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">softwareModel</a></span>(Amalthea&nbsp;container,
-             Procedures.Procedure1&lt;SWModel&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#softwareModel(org.eclipse.app4mc.amalthea.model.Amalthea,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">softwareModel</a></span>&#8203;(Amalthea&nbsp;container,
+             Procedures.Procedure1&lt;SWModel&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i13" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#stimuliModel-org.eclipse.app4mc.amalthea.model.Amalthea-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">stimuliModel</a></span>(Amalthea&nbsp;container,
-            Procedures.Procedure1&lt;StimuliModel&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#stimuliModel(org.eclipse.app4mc.amalthea.model.Amalthea,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">stimuliModel</a></span>&#8203;(Amalthea&nbsp;container,
+            Procedures.Procedure1&lt;StimuliModel&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.Object">
+<li class="blockList"><a id="methods.inherited.from.class.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;Object</h3>
@@ -144,6 +165,7 @@
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
@@ -151,12 +173,13 @@
 <ul class="blockList">
 <li class="blockList">
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a id="constructor.detail">
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="AmaltheaBuilder--">
+<a id="&lt;init&gt;()">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -167,160 +190,164 @@
 </ul>
 </li>
 </ul>
+</section>
 <!-- ============ METHOD DETAIL ========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a id="method.detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="amalthea-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="amalthea(org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>amalthea</h4>
-<pre>public&nbsp;Amalthea&nbsp;amalthea(Procedures.Procedure1&lt;Amalthea&gt;&nbsp;initializer)</pre>
+<pre class="methodSignature">public&nbsp;Amalthea&nbsp;amalthea&#8203;(Procedures.Procedure1&lt;Amalthea&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="commonElements-org.eclipse.app4mc.amalthea.model.Amalthea-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="commonElements(org.eclipse.app4mc.amalthea.model.Amalthea,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>commonElements</h4>
-<pre>public&nbsp;void&nbsp;commonElements(Amalthea&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;commonElements&#8203;(Amalthea&nbsp;container,
                            Procedures.Procedure1&lt;CommonElements&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="eventModel-org.eclipse.app4mc.amalthea.model.Amalthea-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="eventModel(org.eclipse.app4mc.amalthea.model.Amalthea,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>eventModel</h4>
-<pre>public&nbsp;void&nbsp;eventModel(Amalthea&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;eventModel&#8203;(Amalthea&nbsp;container,
                        Procedures.Procedure1&lt;EventModel&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="stimuliModel-org.eclipse.app4mc.amalthea.model.Amalthea-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="stimuliModel(org.eclipse.app4mc.amalthea.model.Amalthea,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>stimuliModel</h4>
-<pre>public&nbsp;void&nbsp;stimuliModel(Amalthea&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;stimuliModel&#8203;(Amalthea&nbsp;container,
                          Procedures.Procedure1&lt;StimuliModel&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="softwareModel-org.eclipse.app4mc.amalthea.model.Amalthea-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="softwareModel(org.eclipse.app4mc.amalthea.model.Amalthea,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>softwareModel</h4>
-<pre>public&nbsp;void&nbsp;softwareModel(Amalthea&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;softwareModel&#8203;(Amalthea&nbsp;container,
                           Procedures.Procedure1&lt;SWModel&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="osModel-org.eclipse.app4mc.amalthea.model.Amalthea-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="osModel(org.eclipse.app4mc.amalthea.model.Amalthea,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>osModel</h4>
-<pre>public&nbsp;void&nbsp;osModel(Amalthea&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;osModel&#8203;(Amalthea&nbsp;container,
                     Procedures.Procedure1&lt;OSModel&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="hardwareModel-org.eclipse.app4mc.amalthea.model.Amalthea-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="hardwareModel(org.eclipse.app4mc.amalthea.model.Amalthea,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>hardwareModel</h4>
-<pre>public&nbsp;void&nbsp;hardwareModel(Amalthea&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;hardwareModel&#8203;(Amalthea&nbsp;container,
                           Procedures.Procedure1&lt;HWModel&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="constraintsModel-org.eclipse.app4mc.amalthea.model.Amalthea-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="constraintsModel(org.eclipse.app4mc.amalthea.model.Amalthea,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>constraintsModel</h4>
-<pre>public&nbsp;void&nbsp;constraintsModel(Amalthea&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;constraintsModel&#8203;(Amalthea&nbsp;container,
                              Procedures.Procedure1&lt;ConstraintsModel&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="propertyConstraintsModel-org.eclipse.app4mc.amalthea.model.Amalthea-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="propertyConstraintsModel(org.eclipse.app4mc.amalthea.model.Amalthea,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>propertyConstraintsModel</h4>
-<pre>public&nbsp;void&nbsp;propertyConstraintsModel(Amalthea&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;propertyConstraintsModel&#8203;(Amalthea&nbsp;container,
                                      Procedures.Procedure1&lt;PropertyConstraintsModel&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="componentsModel-org.eclipse.app4mc.amalthea.model.Amalthea-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="componentsModel(org.eclipse.app4mc.amalthea.model.Amalthea,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>componentsModel</h4>
-<pre>public&nbsp;void&nbsp;componentsModel(Amalthea&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;componentsModel&#8203;(Amalthea&nbsp;container,
                             Procedures.Procedure1&lt;ComponentsModel&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="mappingModel-org.eclipse.app4mc.amalthea.model.Amalthea-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="mappingModel(org.eclipse.app4mc.amalthea.model.Amalthea,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>mappingModel</h4>
-<pre>public&nbsp;void&nbsp;mappingModel(Amalthea&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;mappingModel&#8203;(Amalthea&nbsp;container,
                          Procedures.Procedure1&lt;MappingModel&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="Z:Z_reg-org.eclipse.emf.ecore.EObject-java.lang.String-">
+<a id="_reg(org.eclipse.emf.ecore.EObject,java.lang.String)">
 <!--   -->
-</a><a name="Z:Z_reg-T-java.lang.String-">
+</a><a id="_reg(T,java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>_reg</h4>
-<pre>public&nbsp;&lt;T extends EObject&gt;&nbsp;void&nbsp;_reg(T&nbsp;object,
+<pre class="methodSignature">public&nbsp;&lt;T extends EObject&gt;&nbsp;void&nbsp;_reg&#8203;(@NonNull T&nbsp;object,
                                      @NonNull String&nbsp;name)</pre>
 </li>
 </ul>
-<a name="Z:Z_ref-java.lang.Class-java.lang.String-">
+<a id="_ref(java.lang.Class,java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>_ref</h4>
-<pre>public&nbsp;&lt;T extends EObject&gt;&nbsp;T&nbsp;_ref(@NonNull Class&lt;T&gt;&nbsp;cl,
+<pre class="methodSignature">public&nbsp;&lt;T extends EObject&gt;&nbsp;T&nbsp;_ref&#8203;(@NonNull Class&lt;T&gt;&nbsp;cl,
                                   @NonNull String&nbsp;name)</pre>
 </li>
 </ul>
-<a name="Z:Z_find-org.eclipse.emf.ecore.EObject-java.lang.Class-java.lang.String-">
+<a id="_find(org.eclipse.emf.ecore.EObject,java.lang.Class,java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>_find</h4>
-<pre>public&nbsp;&lt;T extends INamed&gt;&nbsp;T&nbsp;_find(@NonNull EObject&nbsp;context,
+<pre class="methodSignature">public&nbsp;&lt;T extends INamed&gt;&nbsp;T&nbsp;_find&#8203;(@NonNull EObject&nbsp;context,
                                   @NonNull Class&lt;T&gt;&nbsp;cl,
                                   @NonNull String&nbsp;name)</pre>
 </li>
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
 </div>
+</main>
 <!-- ========= END OF CLASS DATA ========= -->
 </body>
 </html>
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 a89b617..23ec649 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
@@ -1,16 +1,18 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML>
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
+<!-- Generated by javadoc (11.0.8) on Mon Nov 30 13:15:36 CET 2020 -->
 <title>CommonElementsBuilder</title>
-<meta name="date" content="2019-07-31">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-11-30">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
 <!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
 <div class="header">
-<div class="subTitle">org.eclipse.app4mc.amalthea.model.builder</div>
+<div class="subTitle"><span class="packageLabelInType">Package</span>&nbsp;<a href="package-summary.html">org.eclipse.app4mc.amalthea.model.builder</a></div>
 <h2 title="Class CommonElementsBuilder" class="title">Class CommonElementsBuilder</h2>
 </div>
 <div class="contentContainer">
@@ -26,7 +28,6 @@
 <ul class="blockList">
 <li class="blockList">
 <hr>
-<br>
 <pre>public class <span class="typeNameLabel">CommonElementsBuilder</span>
 extends Object</pre>
 </li>
@@ -36,56 +37,78 @@
 <ul class="blockList">
 <li class="blockList">
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a id="constructor.summary">
 <!--   -->
 </a>
 <h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<table class="memberSummary">
 <caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
-<th class="colOne" scope="col">Constructor and Description</th>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="#CommonElementsBuilder--">CommonElementsBuilder</a></span>()</code>&nbsp;</td>
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E()">CommonElementsBuilder</a></span>()</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 </table>
 </li>
 </ul>
+</section>
 <!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a id="method.summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<table class="memberSummary">
 <caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>CommonElements</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#commonElementsRoot-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">commonElementsRoot</a></span>(Procedures.Procedure1&lt;CommonElements&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#commonElementsRoot(org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">commonElementsRoot</a></span>&#8203;(Procedures.Procedure1&lt;CommonElements&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#coreClassifier-org.eclipse.app4mc.amalthea.model.CommonElements-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">coreClassifier</a></span>(CommonElements&nbsp;container,
-              Procedures.Procedure1&lt;CoreClassifier&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#coreClassifier(org.eclipse.app4mc.amalthea.model.CommonElements,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">coreClassifier</a></span>&#8203;(CommonElements&nbsp;container,
+              Procedures.Procedure1&lt;CoreClassifier&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i2" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#memoryClassifier-org.eclipse.app4mc.amalthea.model.CommonElements-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">memoryClassifier</a></span>(CommonElements&nbsp;container,
-                Procedures.Procedure1&lt;MemoryClassifier&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#memoryClassifier(org.eclipse.app4mc.amalthea.model.CommonElements,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">memoryClassifier</a></span>&#8203;(CommonElements&nbsp;container,
+                Procedures.Procedure1&lt;MemoryClassifier&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i3" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#tag-org.eclipse.app4mc.amalthea.model.CommonElements-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">tag</a></span>(CommonElements&nbsp;container,
-   Procedures.Procedure1&lt;Tag&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#namespace(org.eclipse.app4mc.amalthea.model.CommonElements,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">namespace</a></span>&#8203;(CommonElements&nbsp;container,
+         Procedures.Procedure1&lt;Namespace&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#segment(org.eclipse.app4mc.amalthea.model.Namespace,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">segment</a></span>&#8203;(Namespace&nbsp;container,
+       Procedures.Procedure1&lt;Namespace&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#tag(org.eclipse.app4mc.amalthea.model.CommonElements,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">tag</a></span>&#8203;(CommonElements&nbsp;container,
+   Procedures.Procedure1&lt;Tag&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.Object">
+<li class="blockList"><a id="methods.inherited.from.class.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;Object</h3>
@@ -93,6 +116,7 @@
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
@@ -100,12 +124,13 @@
 <ul class="blockList">
 <li class="blockList">
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a id="constructor.detail">
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="CommonElementsBuilder--">
+<a id="&lt;init&gt;()">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -116,57 +141,81 @@
 </ul>
 </li>
 </ul>
+</section>
 <!-- ============ METHOD DETAIL ========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a id="method.detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="commonElementsRoot-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="commonElementsRoot(org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>commonElementsRoot</h4>
-<pre>public&nbsp;CommonElements&nbsp;commonElementsRoot(Procedures.Procedure1&lt;CommonElements&gt;&nbsp;initializer)</pre>
+<pre class="methodSignature">public&nbsp;CommonElements&nbsp;commonElementsRoot&#8203;(Procedures.Procedure1&lt;CommonElements&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="memoryClassifier-org.eclipse.app4mc.amalthea.model.CommonElements-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="memoryClassifier(org.eclipse.app4mc.amalthea.model.CommonElements,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>memoryClassifier</h4>
-<pre>public&nbsp;void&nbsp;memoryClassifier(CommonElements&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;memoryClassifier&#8203;(CommonElements&nbsp;container,
                              Procedures.Procedure1&lt;MemoryClassifier&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="coreClassifier-org.eclipse.app4mc.amalthea.model.CommonElements-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="coreClassifier(org.eclipse.app4mc.amalthea.model.CommonElements,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>coreClassifier</h4>
-<pre>public&nbsp;void&nbsp;coreClassifier(CommonElements&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;coreClassifier&#8203;(CommonElements&nbsp;container,
                            Procedures.Procedure1&lt;CoreClassifier&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="tag-org.eclipse.app4mc.amalthea.model.CommonElements-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="tag(org.eclipse.app4mc.amalthea.model.CommonElements,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>tag</h4>
+<pre class="methodSignature">public&nbsp;void&nbsp;tag&#8203;(CommonElements&nbsp;container,
+                Procedures.Procedure1&lt;Tag&gt;&nbsp;initializer)</pre>
+</li>
+</ul>
+<a id="namespace(org.eclipse.app4mc.amalthea.model.CommonElements,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>namespace</h4>
+<pre class="methodSignature">public&nbsp;void&nbsp;namespace&#8203;(CommonElements&nbsp;container,
+                      Procedures.Procedure1&lt;Namespace&gt;&nbsp;initializer)</pre>
+</li>
+</ul>
+<a id="segment(org.eclipse.app4mc.amalthea.model.Namespace,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>tag</h4>
-<pre>public&nbsp;void&nbsp;tag(CommonElements&nbsp;container,
-                Procedures.Procedure1&lt;Tag&gt;&nbsp;initializer)</pre>
+<h4>segment</h4>
+<pre class="methodSignature">public&nbsp;void&nbsp;segment&#8203;(Namespace&nbsp;container,
+                    Procedures.Procedure1&lt;Namespace&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
 </div>
+</main>
 <!-- ========= END OF CLASS DATA ========= -->
 </body>
 </html>
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 c2cb232..0f0b52a 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
@@ -1,16 +1,18 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML>
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
+<!-- Generated by javadoc (11.0.8) on Mon Nov 30 13:15:36 CET 2020 -->
 <title>ConstraintsBuilder</title>
-<meta name="date" content="2019-07-31">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-11-30">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
 <!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
 <div class="header">
-<div class="subTitle">org.eclipse.app4mc.amalthea.model.builder</div>
+<div class="subTitle"><span class="packageLabelInType">Package</span>&nbsp;<a href="package-summary.html">org.eclipse.app4mc.amalthea.model.builder</a></div>
 <h2 title="Class ConstraintsBuilder" class="title">Class ConstraintsBuilder</h2>
 </div>
 <div class="contentContainer">
@@ -26,7 +28,6 @@
 <ul class="blockList">
 <li class="blockList">
 <hr>
-<br>
 <pre>public class <span class="typeNameLabel">ConstraintsBuilder</span>
 extends Object</pre>
 </li>
@@ -36,114 +37,135 @@
 <ul class="blockList">
 <li class="blockList">
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a id="constructor.summary">
 <!--   -->
 </a>
 <h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<table class="memberSummary">
 <caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
-<th class="colOne" scope="col">Constructor and Description</th>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="#ConstraintsBuilder--">ConstraintsBuilder</a></span>()</code>&nbsp;</td>
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E()">ConstraintsBuilder</a></span>()</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 </table>
 </li>
 </ul>
+</section>
 <!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a id="method.summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<table class="memberSummary">
 <caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>ConstraintsModel</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#constraintsModelRoot-org.eclipse.app4mc.amalthea.model.Amalthea-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">constraintsModelRoot</a></span>(Amalthea&nbsp;container,
-                    Procedures.Procedure1&lt;ConstraintsModel&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#constraintsModelRoot(org.eclipse.app4mc.amalthea.model.Amalthea,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">constraintsModelRoot</a></span>&#8203;(Amalthea&nbsp;container,
+                    Procedures.Procedure1&lt;ConstraintsModel&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#deadline_Process-org.eclipse.app4mc.amalthea.model.ConstraintsModel-org.eclipse.app4mc.amalthea.model.AbstractProcess-org.eclipse.app4mc.amalthea.model.Time-">deadline_Process</a></span>(ConstraintsModel&nbsp;container,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#deadline_Process(org.eclipse.app4mc.amalthea.model.ConstraintsModel,org.eclipse.app4mc.amalthea.model.AbstractProcess,org.eclipse.app4mc.amalthea.model.Time)">deadline_Process</a></span>&#8203;(ConstraintsModel&nbsp;container,
                 AbstractProcess&nbsp;process,
-                Time&nbsp;deadline)</code>&nbsp;</td>
+                Time&nbsp;deadline)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i2" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#deadline_Runnable-org.eclipse.app4mc.amalthea.model.ConstraintsModel-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.app4mc.amalthea.model.Time-">deadline_Runnable</a></span>(ConstraintsModel&nbsp;container,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#deadline_Runnable(org.eclipse.app4mc.amalthea.model.ConstraintsModel,org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.app4mc.amalthea.model.Time)">deadline_Runnable</a></span>&#8203;(ConstraintsModel&nbsp;container,
                  Runnable&nbsp;runnable,
-                 Time&nbsp;deadline)</code>&nbsp;</td>
+                 Time&nbsp;deadline)</code></th>
+<td class="colLast">&nbsp;</td>
 </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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#eventChain(org.eclipse.app4mc.amalthea.model.ConstraintsModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">eventChain</a></span>&#8203;(ConstraintsModel&nbsp;container,
+          Procedures.Procedure1&lt;EventChain&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&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>
+<th class="colSecond" scope="row"><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>&#8203;(Requirement&nbsp;container,
+           Procedures.Procedure1&lt;CountRequirementLimit&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><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>&#8203;(Requirement&nbsp;container,
+                   Procedures.Procedure1&lt;CPUPercentageRequirementLimit&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><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>&#8203;(Requirement&nbsp;container,
+               Procedures.Procedure1&lt;FrequencyRequirementLimit&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><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>&#8203;(Requirement&nbsp;container,
+                Procedures.Procedure1&lt;PercentageRequirementLimit&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><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>&#8203;(Requirement&nbsp;container,
+          Procedures.Procedure1&lt;TimeRequirementLimit&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><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>&#8203;(ConstraintsModel&nbsp;container,
+                        Procedures.Procedure1&lt;ArchitectureRequirement&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><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>&#8203;(ConstraintsModel&nbsp;container,
+                   Procedures.Procedure1&lt;ProcessRequirement&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><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>&#8203;(ConstraintsModel&nbsp;container,
+                        Procedures.Procedure1&lt;ProcessChainRequirement&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><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>&#8203;(ConstraintsModel&nbsp;container,
+                    Procedures.Procedure1&lt;RunnableRequirement&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#subchain(org.eclipse.app4mc.amalthea.model.AbstractEventChain,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">subchain</a></span>&#8203;(AbstractEventChain&nbsp;container,
+        Procedures.Procedure1&lt;SubEventChain&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#subchain_ref(org.eclipse.app4mc.amalthea.model.AbstractEventChain,org.eclipse.app4mc.amalthea.model.EventChain)">subchain_ref</a></span>&#8203;(AbstractEventChain&nbsp;container,
+            EventChain&nbsp;ref)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.Object">
+<li class="blockList"><a id="methods.inherited.from.class.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;Object</h3>
@@ -151,6 +173,7 @@
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
@@ -158,12 +181,13 @@
 <ul class="blockList">
 <li class="blockList">
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a id="constructor.detail">
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="ConstraintsBuilder--">
+<a id="&lt;init&gt;()">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -174,170 +198,174 @@
 </ul>
 </li>
 </ul>
+</section>
 <!-- ============ METHOD DETAIL ========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a id="method.detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="constraintsModelRoot-org.eclipse.app4mc.amalthea.model.Amalthea-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="constraintsModelRoot(org.eclipse.app4mc.amalthea.model.Amalthea,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>constraintsModelRoot</h4>
-<pre>public&nbsp;ConstraintsModel&nbsp;constraintsModelRoot(Amalthea&nbsp;container,
+<pre class="methodSignature">public&nbsp;ConstraintsModel&nbsp;constraintsModelRoot&#8203;(Amalthea&nbsp;container,
                                              Procedures.Procedure1&lt;ConstraintsModel&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="requirement_Architecture-org.eclipse.app4mc.amalthea.model.ConstraintsModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="requirement_Architecture(org.eclipse.app4mc.amalthea.model.ConstraintsModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>requirement_Architecture</h4>
-<pre>public&nbsp;void&nbsp;requirement_Architecture(ConstraintsModel&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;requirement_Architecture&#8203;(ConstraintsModel&nbsp;container,
                                      Procedures.Procedure1&lt;ArchitectureRequirement&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="requirement_Runnable-org.eclipse.app4mc.amalthea.model.ConstraintsModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="requirement_Runnable(org.eclipse.app4mc.amalthea.model.ConstraintsModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>requirement_Runnable</h4>
-<pre>public&nbsp;void&nbsp;requirement_Runnable(ConstraintsModel&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;requirement_Runnable&#8203;(ConstraintsModel&nbsp;container,
                                  Procedures.Procedure1&lt;RunnableRequirement&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="requirement_Process-org.eclipse.app4mc.amalthea.model.ConstraintsModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="requirement_Process(org.eclipse.app4mc.amalthea.model.ConstraintsModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>requirement_Process</h4>
-<pre>public&nbsp;void&nbsp;requirement_Process(ConstraintsModel&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;requirement_Process&#8203;(ConstraintsModel&nbsp;container,
                                 Procedures.Procedure1&lt;ProcessRequirement&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="requirement_ProcessChain-org.eclipse.app4mc.amalthea.model.ConstraintsModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="requirement_ProcessChain(org.eclipse.app4mc.amalthea.model.ConstraintsModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>requirement_ProcessChain</h4>
-<pre>public&nbsp;void&nbsp;requirement_ProcessChain(ConstraintsModel&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;requirement_ProcessChain&#8203;(ConstraintsModel&nbsp;container,
                                      Procedures.Procedure1&lt;ProcessChainRequirement&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="deadline_Process-org.eclipse.app4mc.amalthea.model.ConstraintsModel-org.eclipse.app4mc.amalthea.model.AbstractProcess-org.eclipse.app4mc.amalthea.model.Time-">
+<a id="deadline_Process(org.eclipse.app4mc.amalthea.model.ConstraintsModel,org.eclipse.app4mc.amalthea.model.AbstractProcess,org.eclipse.app4mc.amalthea.model.Time)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>deadline_Process</h4>
-<pre>public&nbsp;void&nbsp;deadline_Process(ConstraintsModel&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;deadline_Process&#8203;(ConstraintsModel&nbsp;container,
                              AbstractProcess&nbsp;process,
                              Time&nbsp;deadline)</pre>
 </li>
 </ul>
-<a name="deadline_Runnable-org.eclipse.app4mc.amalthea.model.ConstraintsModel-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.app4mc.amalthea.model.Time-">
+<a id="deadline_Runnable(org.eclipse.app4mc.amalthea.model.ConstraintsModel,org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.app4mc.amalthea.model.Time)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>deadline_Runnable</h4>
-<pre>public&nbsp;void&nbsp;deadline_Runnable(ConstraintsModel&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;deadline_Runnable&#8203;(ConstraintsModel&nbsp;container,
                               Runnable&nbsp;runnable,
                               Time&nbsp;deadline)</pre>
 </li>
 </ul>
-<a name="limit_Time-org.eclipse.app4mc.amalthea.model.Requirement-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="limit_Time(org.eclipse.app4mc.amalthea.model.Requirement,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>limit_Time</h4>
-<pre>public&nbsp;void&nbsp;limit_Time(Requirement&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;limit_Time&#8203;(Requirement&nbsp;container,
                        Procedures.Procedure1&lt;TimeRequirementLimit&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="limit_Frequency-org.eclipse.app4mc.amalthea.model.Requirement-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="limit_Frequency(org.eclipse.app4mc.amalthea.model.Requirement,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>limit_Frequency</h4>
-<pre>public&nbsp;void&nbsp;limit_Frequency(Requirement&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;limit_Frequency&#8203;(Requirement&nbsp;container,
                             Procedures.Procedure1&lt;FrequencyRequirementLimit&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="limit_Percentage-org.eclipse.app4mc.amalthea.model.Requirement-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="limit_Percentage(org.eclipse.app4mc.amalthea.model.Requirement,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>limit_Percentage</h4>
-<pre>public&nbsp;void&nbsp;limit_Percentage(Requirement&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;limit_Percentage&#8203;(Requirement&nbsp;container,
                              Procedures.Procedure1&lt;PercentageRequirementLimit&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="limit_Count-org.eclipse.app4mc.amalthea.model.Requirement-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="limit_Count(org.eclipse.app4mc.amalthea.model.Requirement,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>limit_Count</h4>
-<pre>public&nbsp;void&nbsp;limit_Count(Requirement&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;limit_Count&#8203;(Requirement&nbsp;container,
                         Procedures.Procedure1&lt;CountRequirementLimit&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="limit_CPUPercentage-org.eclipse.app4mc.amalthea.model.Requirement-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="limit_CPUPercentage(org.eclipse.app4mc.amalthea.model.Requirement,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>limit_CPUPercentage</h4>
-<pre>public&nbsp;void&nbsp;limit_CPUPercentage(Requirement&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;limit_CPUPercentage&#8203;(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 id="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,
+<pre class="methodSignature">public&nbsp;void&nbsp;eventChain&#8203;(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 id="subchain(org.eclipse.app4mc.amalthea.model.AbstractEventChain,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>
+<h4>subchain</h4>
+<pre class="methodSignature">public&nbsp;void&nbsp;subchain&#8203;(AbstractEventChain&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 id="subchain_ref(org.eclipse.app4mc.amalthea.model.AbstractEventChain,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>
+<h4>subchain_ref</h4>
+<pre class="methodSignature">public&nbsp;void&nbsp;subchain_ref&#8203;(AbstractEventChain&nbsp;container,
+                         EventChain&nbsp;ref)</pre>
 </li>
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
 </div>
+</main>
 <!-- ========= END OF CLASS DATA ========= -->
 </body>
 </html>
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 2d500fc..284f5ac 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
@@ -1,16 +1,18 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML>
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
+<!-- Generated by javadoc (11.0.8) on Mon Nov 30 13:15:36 CET 2020 -->
 <title>DatatypeBuilder</title>
-<meta name="date" content="2019-07-31">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-11-30">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
 <!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
 <div class="header">
-<div class="subTitle">org.eclipse.app4mc.amalthea.model.builder</div>
+<div class="subTitle"><span class="packageLabelInType">Package</span>&nbsp;<a href="package-summary.html">org.eclipse.app4mc.amalthea.model.builder</a></div>
 <h2 title="Class DatatypeBuilder" class="title">Class DatatypeBuilder</h2>
 </div>
 <div class="contentContainer">
@@ -26,7 +28,6 @@
 <ul class="blockList">
 <li class="blockList">
 <hr>
-<br>
 <pre>public class <span class="typeNameLabel">DatatypeBuilder</span>
 extends Object</pre>
 </li>
@@ -36,147 +37,175 @@
 <ul class="blockList">
 <li class="blockList">
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a id="constructor.summary">
 <!--   -->
 </a>
 <h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<table class="memberSummary">
 <caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
-<th class="colOne" scope="col">Constructor and Description</th>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="#DatatypeBuilder--">DatatypeBuilder</a></span>()</code>&nbsp;</td>
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E()">DatatypeBuilder</a></span>()</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 </table>
 </li>
 </ul>
+</section>
 <!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a id="method.summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<table class="memberSummary">
 <caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#alias-org.eclipse.app4mc.amalthea.model.BaseTypeDefinition-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">alias</a></span>(BaseTypeDefinition&nbsp;container,
-     Procedures.Procedure1&lt;Alias&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#alias(org.eclipse.app4mc.amalthea.model.BaseTypeDefinition,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">alias</a></span>&#8203;(BaseTypeDefinition&nbsp;container,
+     Procedures.Procedure1&lt;Alias&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#array-org.eclipse.app4mc.amalthea.model.Array-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">array</a></span>(Array&nbsp;container,
-     Procedures.Procedure1&lt;Array&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#array(org.eclipse.app4mc.amalthea.model.Array,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">array</a></span>&#8203;(Array&nbsp;container,
+     Procedures.Procedure1&lt;Array&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i2" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#array-org.eclipse.app4mc.amalthea.model.Channel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">array</a></span>(Channel&nbsp;container,
-     Procedures.Procedure1&lt;Array&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#array(org.eclipse.app4mc.amalthea.model.Channel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">array</a></span>&#8203;(Channel&nbsp;container,
+     Procedures.Procedure1&lt;Array&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i3" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#array-org.eclipse.app4mc.amalthea.model.DataTypeDefinition-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">array</a></span>(DataTypeDefinition&nbsp;container,
-     Procedures.Procedure1&lt;Array&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#array(org.eclipse.app4mc.amalthea.model.DataTypeDefinition,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">array</a></span>&#8203;(DataTypeDefinition&nbsp;container,
+     Procedures.Procedure1&lt;Array&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i4" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#array-org.eclipse.app4mc.amalthea.model.Label-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">array</a></span>(Label&nbsp;container,
-     Procedures.Procedure1&lt;Array&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#array(org.eclipse.app4mc.amalthea.model.Label,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">array</a></span>&#8203;(Label&nbsp;container,
+     Procedures.Procedure1&lt;Array&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i5" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#array-org.eclipse.app4mc.amalthea.model.Pointer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">array</a></span>(Pointer&nbsp;container,
-     Procedures.Procedure1&lt;Array&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#array(org.eclipse.app4mc.amalthea.model.Pointer,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">array</a></span>&#8203;(Pointer&nbsp;container,
+     Procedures.Procedure1&lt;Array&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i6" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#array-org.eclipse.app4mc.amalthea.model.StructEntry-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">array</a></span>(StructEntry&nbsp;container,
-     Procedures.Procedure1&lt;Array&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#array(org.eclipse.app4mc.amalthea.model.StructEntry,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">array</a></span>&#8203;(StructEntry&nbsp;container,
+     Procedures.Procedure1&lt;Array&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i7" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#entry-org.eclipse.app4mc.amalthea.model.Struct-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">entry</a></span>(Struct&nbsp;container,
-     Procedures.Procedure1&lt;StructEntry&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#entry(org.eclipse.app4mc.amalthea.model.Struct,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">entry</a></span>&#8203;(Struct&nbsp;container,
+     Procedures.Procedure1&lt;StructEntry&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i8" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#pointer-org.eclipse.app4mc.amalthea.model.Array-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">pointer</a></span>(Array&nbsp;container,
-       Procedures.Procedure1&lt;Pointer&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#pointer(org.eclipse.app4mc.amalthea.model.Array,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">pointer</a></span>&#8203;(Array&nbsp;container,
+       Procedures.Procedure1&lt;Pointer&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i9" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#pointer-org.eclipse.app4mc.amalthea.model.Channel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">pointer</a></span>(Channel&nbsp;container,
-       Procedures.Procedure1&lt;Pointer&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#pointer(org.eclipse.app4mc.amalthea.model.Channel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">pointer</a></span>&#8203;(Channel&nbsp;container,
+       Procedures.Procedure1&lt;Pointer&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i10" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#pointer-org.eclipse.app4mc.amalthea.model.DataTypeDefinition-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">pointer</a></span>(DataTypeDefinition&nbsp;container,
-       Procedures.Procedure1&lt;Pointer&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#pointer(org.eclipse.app4mc.amalthea.model.DataTypeDefinition,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">pointer</a></span>&#8203;(DataTypeDefinition&nbsp;container,
+       Procedures.Procedure1&lt;Pointer&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i11" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#pointer-org.eclipse.app4mc.amalthea.model.Label-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">pointer</a></span>(Label&nbsp;container,
-       Procedures.Procedure1&lt;Pointer&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#pointer(org.eclipse.app4mc.amalthea.model.Label,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">pointer</a></span>&#8203;(Label&nbsp;container,
+       Procedures.Procedure1&lt;Pointer&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i12" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#pointer-org.eclipse.app4mc.amalthea.model.Pointer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">pointer</a></span>(Pointer&nbsp;container,
-       Procedures.Procedure1&lt;Pointer&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#pointer(org.eclipse.app4mc.amalthea.model.Pointer,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">pointer</a></span>&#8203;(Pointer&nbsp;container,
+       Procedures.Procedure1&lt;Pointer&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i13" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#pointer-org.eclipse.app4mc.amalthea.model.StructEntry-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">pointer</a></span>(StructEntry&nbsp;container,
-       Procedures.Procedure1&lt;Pointer&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#pointer(org.eclipse.app4mc.amalthea.model.StructEntry,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">pointer</a></span>&#8203;(StructEntry&nbsp;container,
+       Procedures.Procedure1&lt;Pointer&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i14" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#struct-org.eclipse.app4mc.amalthea.model.Array-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">struct</a></span>(Array&nbsp;container,
-      Procedures.Procedure1&lt;Struct&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#struct(org.eclipse.app4mc.amalthea.model.Array,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">struct</a></span>&#8203;(Array&nbsp;container,
+      Procedures.Procedure1&lt;Struct&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i15" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#struct-org.eclipse.app4mc.amalthea.model.Channel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">struct</a></span>(Channel&nbsp;container,
-      Procedures.Procedure1&lt;Struct&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#struct(org.eclipse.app4mc.amalthea.model.Channel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">struct</a></span>&#8203;(Channel&nbsp;container,
+      Procedures.Procedure1&lt;Struct&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i16" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#struct-org.eclipse.app4mc.amalthea.model.DataTypeDefinition-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">struct</a></span>(DataTypeDefinition&nbsp;container,
-      Procedures.Procedure1&lt;Struct&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#struct(org.eclipse.app4mc.amalthea.model.DataTypeDefinition,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">struct</a></span>&#8203;(DataTypeDefinition&nbsp;container,
+      Procedures.Procedure1&lt;Struct&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i17" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#struct-org.eclipse.app4mc.amalthea.model.Label-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">struct</a></span>(Label&nbsp;container,
-      Procedures.Procedure1&lt;Struct&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#struct(org.eclipse.app4mc.amalthea.model.Label,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">struct</a></span>&#8203;(Label&nbsp;container,
+      Procedures.Procedure1&lt;Struct&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i18" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#struct-org.eclipse.app4mc.amalthea.model.Pointer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">struct</a></span>(Pointer&nbsp;container,
-      Procedures.Procedure1&lt;Struct&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#struct(org.eclipse.app4mc.amalthea.model.Pointer,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">struct</a></span>&#8203;(Pointer&nbsp;container,
+      Procedures.Procedure1&lt;Struct&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i19" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#struct-org.eclipse.app4mc.amalthea.model.StructEntry-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">struct</a></span>(StructEntry&nbsp;container,
-      Procedures.Procedure1&lt;Struct&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#struct(org.eclipse.app4mc.amalthea.model.StructEntry,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">struct</a></span>&#8203;(StructEntry&nbsp;container,
+      Procedures.Procedure1&lt;Struct&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i20" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#typeDefinition_BaseType-org.eclipse.app4mc.amalthea.model.SWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">typeDefinition_BaseType</a></span>(SWModel&nbsp;container,
-                       Procedures.Procedure1&lt;BaseTypeDefinition&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#typeDefinition_BaseType(org.eclipse.app4mc.amalthea.model.SWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">typeDefinition_BaseType</a></span>&#8203;(SWModel&nbsp;container,
+                       Procedures.Procedure1&lt;BaseTypeDefinition&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i21" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#typeDefinition_DataType-org.eclipse.app4mc.amalthea.model.SWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">typeDefinition_DataType</a></span>(SWModel&nbsp;container,
-                       Procedures.Procedure1&lt;DataTypeDefinition&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#typeDefinition_DataType(org.eclipse.app4mc.amalthea.model.SWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">typeDefinition_DataType</a></span>&#8203;(SWModel&nbsp;container,
+                       Procedures.Procedure1&lt;DataTypeDefinition&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.Object">
+<li class="blockList"><a id="methods.inherited.from.class.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;Object</h3>
@@ -184,6 +213,7 @@
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
@@ -191,12 +221,13 @@
 <ul class="blockList">
 <li class="blockList">
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a id="constructor.detail">
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="DatatypeBuilder--">
+<a id="&lt;init&gt;()">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -207,238 +238,242 @@
 </ul>
 </li>
 </ul>
+</section>
 <!-- ============ METHOD DETAIL ========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a id="method.detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="typeDefinition_BaseType-org.eclipse.app4mc.amalthea.model.SWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="typeDefinition_BaseType(org.eclipse.app4mc.amalthea.model.SWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>typeDefinition_BaseType</h4>
-<pre>public&nbsp;void&nbsp;typeDefinition_BaseType(SWModel&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;typeDefinition_BaseType&#8203;(SWModel&nbsp;container,
                                     Procedures.Procedure1&lt;BaseTypeDefinition&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="typeDefinition_DataType-org.eclipse.app4mc.amalthea.model.SWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="typeDefinition_DataType(org.eclipse.app4mc.amalthea.model.SWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>typeDefinition_DataType</h4>
-<pre>public&nbsp;void&nbsp;typeDefinition_DataType(SWModel&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;typeDefinition_DataType&#8203;(SWModel&nbsp;container,
                                     Procedures.Procedure1&lt;DataTypeDefinition&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="alias-org.eclipse.app4mc.amalthea.model.BaseTypeDefinition-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="alias(org.eclipse.app4mc.amalthea.model.BaseTypeDefinition,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>alias</h4>
-<pre>public&nbsp;void&nbsp;alias(BaseTypeDefinition&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;alias&#8203;(BaseTypeDefinition&nbsp;container,
                   Procedures.Procedure1&lt;Alias&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="struct-org.eclipse.app4mc.amalthea.model.Channel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="struct(org.eclipse.app4mc.amalthea.model.Channel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>struct</h4>
-<pre>public&nbsp;void&nbsp;struct(Channel&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;struct&#8203;(Channel&nbsp;container,
                    Procedures.Procedure1&lt;Struct&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="struct-org.eclipse.app4mc.amalthea.model.Label-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="struct(org.eclipse.app4mc.amalthea.model.Label,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>struct</h4>
-<pre>public&nbsp;void&nbsp;struct(Label&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;struct&#8203;(Label&nbsp;container,
                    Procedures.Procedure1&lt;Struct&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="struct-org.eclipse.app4mc.amalthea.model.DataTypeDefinition-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="struct(org.eclipse.app4mc.amalthea.model.DataTypeDefinition,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>struct</h4>
-<pre>public&nbsp;void&nbsp;struct(DataTypeDefinition&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;struct&#8203;(DataTypeDefinition&nbsp;container,
                    Procedures.Procedure1&lt;Struct&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="struct-org.eclipse.app4mc.amalthea.model.Array-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="struct(org.eclipse.app4mc.amalthea.model.Array,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>struct</h4>
-<pre>public&nbsp;void&nbsp;struct(Array&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;struct&#8203;(Array&nbsp;container,
                    Procedures.Procedure1&lt;Struct&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="struct-org.eclipse.app4mc.amalthea.model.StructEntry-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="struct(org.eclipse.app4mc.amalthea.model.StructEntry,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>struct</h4>
-<pre>public&nbsp;void&nbsp;struct(StructEntry&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;struct&#8203;(StructEntry&nbsp;container,
                    Procedures.Procedure1&lt;Struct&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="struct-org.eclipse.app4mc.amalthea.model.Pointer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="struct(org.eclipse.app4mc.amalthea.model.Pointer,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>struct</h4>
-<pre>public&nbsp;void&nbsp;struct(Pointer&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;struct&#8203;(Pointer&nbsp;container,
                    Procedures.Procedure1&lt;Struct&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="entry-org.eclipse.app4mc.amalthea.model.Struct-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="entry(org.eclipse.app4mc.amalthea.model.Struct,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>entry</h4>
-<pre>public&nbsp;void&nbsp;entry(Struct&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;entry&#8203;(Struct&nbsp;container,
                   Procedures.Procedure1&lt;StructEntry&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="array-org.eclipse.app4mc.amalthea.model.Channel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="array(org.eclipse.app4mc.amalthea.model.Channel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>array</h4>
-<pre>public&nbsp;void&nbsp;array(Channel&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;array&#8203;(Channel&nbsp;container,
                   Procedures.Procedure1&lt;Array&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="array-org.eclipse.app4mc.amalthea.model.Label-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="array(org.eclipse.app4mc.amalthea.model.Label,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>array</h4>
-<pre>public&nbsp;void&nbsp;array(Label&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;array&#8203;(Label&nbsp;container,
                   Procedures.Procedure1&lt;Array&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="array-org.eclipse.app4mc.amalthea.model.DataTypeDefinition-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="array(org.eclipse.app4mc.amalthea.model.DataTypeDefinition,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>array</h4>
-<pre>public&nbsp;void&nbsp;array(DataTypeDefinition&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;array&#8203;(DataTypeDefinition&nbsp;container,
                   Procedures.Procedure1&lt;Array&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="array-org.eclipse.app4mc.amalthea.model.Array-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="array(org.eclipse.app4mc.amalthea.model.Array,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>array</h4>
-<pre>public&nbsp;void&nbsp;array(Array&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;array&#8203;(Array&nbsp;container,
                   Procedures.Procedure1&lt;Array&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="array-org.eclipse.app4mc.amalthea.model.StructEntry-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="array(org.eclipse.app4mc.amalthea.model.StructEntry,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>array</h4>
-<pre>public&nbsp;void&nbsp;array(StructEntry&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;array&#8203;(StructEntry&nbsp;container,
                   Procedures.Procedure1&lt;Array&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="array-org.eclipse.app4mc.amalthea.model.Pointer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="array(org.eclipse.app4mc.amalthea.model.Pointer,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>array</h4>
-<pre>public&nbsp;void&nbsp;array(Pointer&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;array&#8203;(Pointer&nbsp;container,
                   Procedures.Procedure1&lt;Array&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="pointer-org.eclipse.app4mc.amalthea.model.Channel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="pointer(org.eclipse.app4mc.amalthea.model.Channel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>pointer</h4>
-<pre>public&nbsp;void&nbsp;pointer(Channel&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;pointer&#8203;(Channel&nbsp;container,
                     Procedures.Procedure1&lt;Pointer&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="pointer-org.eclipse.app4mc.amalthea.model.Label-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="pointer(org.eclipse.app4mc.amalthea.model.Label,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>pointer</h4>
-<pre>public&nbsp;void&nbsp;pointer(Label&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;pointer&#8203;(Label&nbsp;container,
                     Procedures.Procedure1&lt;Pointer&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="pointer-org.eclipse.app4mc.amalthea.model.DataTypeDefinition-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="pointer(org.eclipse.app4mc.amalthea.model.DataTypeDefinition,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>pointer</h4>
-<pre>public&nbsp;void&nbsp;pointer(DataTypeDefinition&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;pointer&#8203;(DataTypeDefinition&nbsp;container,
                     Procedures.Procedure1&lt;Pointer&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="pointer-org.eclipse.app4mc.amalthea.model.Array-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="pointer(org.eclipse.app4mc.amalthea.model.Array,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>pointer</h4>
-<pre>public&nbsp;void&nbsp;pointer(Array&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;pointer&#8203;(Array&nbsp;container,
                     Procedures.Procedure1&lt;Pointer&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="pointer-org.eclipse.app4mc.amalthea.model.StructEntry-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="pointer(org.eclipse.app4mc.amalthea.model.StructEntry,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>pointer</h4>
-<pre>public&nbsp;void&nbsp;pointer(StructEntry&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;pointer&#8203;(StructEntry&nbsp;container,
                     Procedures.Procedure1&lt;Pointer&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="pointer-org.eclipse.app4mc.amalthea.model.Pointer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="pointer(org.eclipse.app4mc.amalthea.model.Pointer,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>pointer</h4>
-<pre>public&nbsp;void&nbsp;pointer(Pointer&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;pointer&#8203;(Pointer&nbsp;container,
                     Procedures.Procedure1&lt;Pointer&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
 </div>
+</main>
 <!-- ========= END OF CLASS DATA ========= -->
 </body>
 </html>
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 dd3e54b..dc1e9fc 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
@@ -1,16 +1,18 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML>
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
+<!-- Generated by javadoc (11.0.8) on Mon Nov 30 13:15:36 CET 2020 -->
 <title>HardwareBuilder</title>
-<meta name="date" content="2019-07-31">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-11-30">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
 <!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
 <div class="header">
-<div class="subTitle">org.eclipse.app4mc.amalthea.model.builder</div>
+<div class="subTitle"><span class="packageLabelInType">Package</span>&nbsp;<a href="package-summary.html">org.eclipse.app4mc.amalthea.model.builder</a></div>
 <h2 title="Class HardwareBuilder" class="title">Class HardwareBuilder</h2>
 </div>
 <div class="contentContainer">
@@ -26,7 +28,6 @@
 <ul class="blockList">
 <li class="blockList">
 <hr>
-<br>
 <pre>public class <span class="typeNameLabel">HardwareBuilder</span>
 extends Object</pre>
 </li>
@@ -36,156 +37,186 @@
 <ul class="blockList">
 <li class="blockList">
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a id="constructor.summary">
 <!--   -->
 </a>
 <h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<table class="memberSummary">
 <caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
-<th class="colOne" scope="col">Constructor and Description</th>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="#HardwareBuilder--">HardwareBuilder</a></span>()</code>&nbsp;</td>
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E()">HardwareBuilder</a></span>()</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 </table>
 </li>
 </ul>
+</section>
 <!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a id="method.summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<table class="memberSummary">
 <caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#access-org.eclipse.app4mc.amalthea.model.ProcessingUnit-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">access</a></span>(ProcessingUnit&nbsp;container,
-      Procedures.Procedure1&lt;HwAccessElement&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#access(org.eclipse.app4mc.amalthea.model.ProcessingUnit,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">access</a></span>&#8203;(ProcessingUnit&nbsp;container,
+      Procedures.Procedure1&lt;HwAccessElement&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#cache-org.eclipse.app4mc.amalthea.model.ProcessingUnit-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">cache</a></span>(ProcessingUnit&nbsp;container,
-     Procedures.Procedure1&lt;Cache&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#cache(org.eclipse.app4mc.amalthea.model.ProcessingUnit,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">cache</a></span>&#8203;(ProcessingUnit&nbsp;container,
+     Procedures.Procedure1&lt;Cache&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i2" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#connection-org.eclipse.app4mc.amalthea.model.HwStructure-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">connection</a></span>(HwStructure&nbsp;container,
-          Procedures.Procedure1&lt;HwConnection&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#connection(org.eclipse.app4mc.amalthea.model.HwStructure,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">connection</a></span>&#8203;(HwStructure&nbsp;container,
+          Procedures.Procedure1&lt;HwConnection&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i3" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#definition_Cache-org.eclipse.app4mc.amalthea.model.HWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">definition_Cache</a></span>(HWModel&nbsp;container,
-                Procedures.Procedure1&lt;CacheDefinition&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#definition_Cache(org.eclipse.app4mc.amalthea.model.HWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">definition_Cache</a></span>&#8203;(HWModel&nbsp;container,
+                Procedures.Procedure1&lt;CacheDefinition&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i4" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#definition_ConnectionHandler-org.eclipse.app4mc.amalthea.model.HWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">definition_ConnectionHandler</a></span>(HWModel&nbsp;container,
-                            Procedures.Procedure1&lt;ConnectionHandlerDefinition&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#definition_ConnectionHandler(org.eclipse.app4mc.amalthea.model.HWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">definition_ConnectionHandler</a></span>&#8203;(HWModel&nbsp;container,
+                            Procedures.Procedure1&lt;ConnectionHandlerDefinition&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i5" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#definition_Memory-org.eclipse.app4mc.amalthea.model.HWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">definition_Memory</a></span>(HWModel&nbsp;container,
-                 Procedures.Procedure1&lt;MemoryDefinition&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#definition_Memory(org.eclipse.app4mc.amalthea.model.HWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">definition_Memory</a></span>&#8203;(HWModel&nbsp;container,
+                 Procedures.Procedure1&lt;MemoryDefinition&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i6" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#definition_ProcessingUnit-org.eclipse.app4mc.amalthea.model.HWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">definition_ProcessingUnit</a></span>(HWModel&nbsp;container,
-                         Procedures.Procedure1&lt;ProcessingUnitDefinition&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#definition_ProcessingUnit(org.eclipse.app4mc.amalthea.model.HWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">definition_ProcessingUnit</a></span>&#8203;(HWModel&nbsp;container,
+                         Procedures.Procedure1&lt;ProcessingUnitDefinition&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i7" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#domain_Frequency-org.eclipse.app4mc.amalthea.model.HWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">domain_Frequency</a></span>(HWModel&nbsp;container,
-                Procedures.Procedure1&lt;FrequencyDomain&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#domain_Frequency(org.eclipse.app4mc.amalthea.model.HWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">domain_Frequency</a></span>&#8203;(HWModel&nbsp;container,
+                Procedures.Procedure1&lt;FrequencyDomain&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i8" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#domain_Power-org.eclipse.app4mc.amalthea.model.HWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">domain_Power</a></span>(HWModel&nbsp;container,
-            Procedures.Procedure1&lt;PowerDomain&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#domain_Power(org.eclipse.app4mc.amalthea.model.HWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">domain_Power</a></span>&#8203;(HWModel&nbsp;container,
+            Procedures.Procedure1&lt;PowerDomain&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i9" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#feature-org.eclipse.app4mc.amalthea.model.HwFeatureCategory-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">feature</a></span>(HwFeatureCategory&nbsp;container,
-       Procedures.Procedure1&lt;HwFeature&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#feature(org.eclipse.app4mc.amalthea.model.HwFeatureCategory,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">feature</a></span>&#8203;(HwFeatureCategory&nbsp;container,
+       Procedures.Procedure1&lt;HwFeature&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i10" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#featureCategory-org.eclipse.app4mc.amalthea.model.HWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">featureCategory</a></span>(HWModel&nbsp;container,
-               Procedures.Procedure1&lt;HwFeatureCategory&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#featureCategory(org.eclipse.app4mc.amalthea.model.HWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">featureCategory</a></span>&#8203;(HWModel&nbsp;container,
+               Procedures.Procedure1&lt;HwFeatureCategory&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i11" class="rowColor">
 <td class="colFirst"><code>HWModel</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#hardwareModelRoot-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">hardwareModelRoot</a></span>(Procedures.Procedure1&lt;HWModel&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#hardwareModelRoot(org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">hardwareModelRoot</a></span>&#8203;(Procedures.Procedure1&lt;HWModel&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i12" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#module_Cache-org.eclipse.app4mc.amalthea.model.HwStructure-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">module_Cache</a></span>(HwStructure&nbsp;container,
-            Procedures.Procedure1&lt;Cache&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#module_Cache(org.eclipse.app4mc.amalthea.model.HwStructure,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">module_Cache</a></span>&#8203;(HwStructure&nbsp;container,
+            Procedures.Procedure1&lt;Cache&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i13" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#module_ConnectionHandler-org.eclipse.app4mc.amalthea.model.HwStructure-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">module_ConnectionHandler</a></span>(HwStructure&nbsp;container,
-                        Procedures.Procedure1&lt;ConnectionHandler&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#module_ConnectionHandler(org.eclipse.app4mc.amalthea.model.HwStructure,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">module_ConnectionHandler</a></span>&#8203;(HwStructure&nbsp;container,
+                        Procedures.Procedure1&lt;ConnectionHandler&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i14" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#module_Memory-org.eclipse.app4mc.amalthea.model.HwStructure-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">module_Memory</a></span>(HwStructure&nbsp;container,
-             Procedures.Procedure1&lt;Memory&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#module_Memory(org.eclipse.app4mc.amalthea.model.HwStructure,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">module_Memory</a></span>&#8203;(HwStructure&nbsp;container,
+             Procedures.Procedure1&lt;Memory&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i15" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#module_ProcessingUnit-org.eclipse.app4mc.amalthea.model.HwStructure-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">module_ProcessingUnit</a></span>(HwStructure&nbsp;container,
-                     Procedures.Procedure1&lt;ProcessingUnit&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#module_ProcessingUnit(org.eclipse.app4mc.amalthea.model.HwStructure,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">module_ProcessingUnit</a></span>&#8203;(HwStructure&nbsp;container,
+                     Procedures.Procedure1&lt;ProcessingUnit&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i16" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#path-org.eclipse.app4mc.amalthea.model.HwAccessElement-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">path</a></span>(HwAccessElement&nbsp;container,
-    Procedures.Procedure1&lt;HwAccessPath&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#path(org.eclipse.app4mc.amalthea.model.HwAccessElement,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">path</a></span>&#8203;(HwAccessElement&nbsp;container,
+    Procedures.Procedure1&lt;HwAccessPath&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i17" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#port-org.eclipse.app4mc.amalthea.model.Cache-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">port</a></span>(Cache&nbsp;container,
-    Procedures.Procedure1&lt;HwPort&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#port(org.eclipse.app4mc.amalthea.model.Cache,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">port</a></span>&#8203;(Cache&nbsp;container,
+    Procedures.Procedure1&lt;HwPort&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i18" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#port-org.eclipse.app4mc.amalthea.model.ConnectionHandler-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">port</a></span>(ConnectionHandler&nbsp;container,
-    Procedures.Procedure1&lt;HwPort&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#port(org.eclipse.app4mc.amalthea.model.ConnectionHandler,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">port</a></span>&#8203;(ConnectionHandler&nbsp;container,
+    Procedures.Procedure1&lt;HwPort&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i19" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#port-org.eclipse.app4mc.amalthea.model.HwStructure-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">port</a></span>(HwStructure&nbsp;container,
-    Procedures.Procedure1&lt;HwPort&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#port(org.eclipse.app4mc.amalthea.model.HwStructure,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">port</a></span>&#8203;(HwStructure&nbsp;container,
+    Procedures.Procedure1&lt;HwPort&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i20" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#port-org.eclipse.app4mc.amalthea.model.Memory-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">port</a></span>(Memory&nbsp;container,
-    Procedures.Procedure1&lt;HwPort&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#port(org.eclipse.app4mc.amalthea.model.Memory,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">port</a></span>&#8203;(Memory&nbsp;container,
+    Procedures.Procedure1&lt;HwPort&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i21" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#port-org.eclipse.app4mc.amalthea.model.ProcessingUnit-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">port</a></span>(ProcessingUnit&nbsp;container,
-    Procedures.Procedure1&lt;HwPort&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#port(org.eclipse.app4mc.amalthea.model.ProcessingUnit,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">port</a></span>&#8203;(ProcessingUnit&nbsp;container,
+    Procedures.Procedure1&lt;HwPort&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i22" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#structure-org.eclipse.app4mc.amalthea.model.HWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">structure</a></span>(HWModel&nbsp;container,
-         Procedures.Procedure1&lt;HwStructure&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#structure(org.eclipse.app4mc.amalthea.model.HWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">structure</a></span>&#8203;(HWModel&nbsp;container,
+         Procedures.Procedure1&lt;HwStructure&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i23" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#structure-org.eclipse.app4mc.amalthea.model.HwStructure-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">structure</a></span>(HwStructure&nbsp;container,
-         Procedures.Procedure1&lt;HwStructure&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#structure(org.eclipse.app4mc.amalthea.model.HwStructure,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">structure</a></span>&#8203;(HwStructure&nbsp;container,
+         Procedures.Procedure1&lt;HwStructure&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.Object">
+<li class="blockList"><a id="methods.inherited.from.class.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;Object</h3>
@@ -193,6 +224,7 @@
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
@@ -200,12 +232,13 @@
 <ul class="blockList">
 <li class="blockList">
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a id="constructor.detail">
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="HardwareBuilder--">
+<a id="&lt;init&gt;()">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -216,257 +249,261 @@
 </ul>
 </li>
 </ul>
+</section>
 <!-- ============ METHOD DETAIL ========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a id="method.detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="hardwareModelRoot-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="hardwareModelRoot(org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>hardwareModelRoot</h4>
-<pre>public&nbsp;HWModel&nbsp;hardwareModelRoot(Procedures.Procedure1&lt;HWModel&gt;&nbsp;initializer)</pre>
+<pre class="methodSignature">public&nbsp;HWModel&nbsp;hardwareModelRoot&#8203;(Procedures.Procedure1&lt;HWModel&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="definition_Cache-org.eclipse.app4mc.amalthea.model.HWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="definition_Cache(org.eclipse.app4mc.amalthea.model.HWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>definition_Cache</h4>
-<pre>public&nbsp;void&nbsp;definition_Cache(HWModel&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;definition_Cache&#8203;(HWModel&nbsp;container,
                              Procedures.Procedure1&lt;CacheDefinition&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="definition_Memory-org.eclipse.app4mc.amalthea.model.HWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="definition_Memory(org.eclipse.app4mc.amalthea.model.HWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>definition_Memory</h4>
-<pre>public&nbsp;void&nbsp;definition_Memory(HWModel&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;definition_Memory&#8203;(HWModel&nbsp;container,
                               Procedures.Procedure1&lt;MemoryDefinition&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="definition_ProcessingUnit-org.eclipse.app4mc.amalthea.model.HWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="definition_ProcessingUnit(org.eclipse.app4mc.amalthea.model.HWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>definition_ProcessingUnit</h4>
-<pre>public&nbsp;void&nbsp;definition_ProcessingUnit(HWModel&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;definition_ProcessingUnit&#8203;(HWModel&nbsp;container,
                                       Procedures.Procedure1&lt;ProcessingUnitDefinition&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="definition_ConnectionHandler-org.eclipse.app4mc.amalthea.model.HWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="definition_ConnectionHandler(org.eclipse.app4mc.amalthea.model.HWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>definition_ConnectionHandler</h4>
-<pre>public&nbsp;void&nbsp;definition_ConnectionHandler(HWModel&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;definition_ConnectionHandler&#8203;(HWModel&nbsp;container,
                                          Procedures.Procedure1&lt;ConnectionHandlerDefinition&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="domain_Frequency-org.eclipse.app4mc.amalthea.model.HWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="domain_Frequency(org.eclipse.app4mc.amalthea.model.HWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>domain_Frequency</h4>
-<pre>public&nbsp;void&nbsp;domain_Frequency(HWModel&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;domain_Frequency&#8203;(HWModel&nbsp;container,
                              Procedures.Procedure1&lt;FrequencyDomain&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="domain_Power-org.eclipse.app4mc.amalthea.model.HWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="domain_Power(org.eclipse.app4mc.amalthea.model.HWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>domain_Power</h4>
-<pre>public&nbsp;void&nbsp;domain_Power(HWModel&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;domain_Power&#8203;(HWModel&nbsp;container,
                          Procedures.Procedure1&lt;PowerDomain&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="featureCategory-org.eclipse.app4mc.amalthea.model.HWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="featureCategory(org.eclipse.app4mc.amalthea.model.HWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>featureCategory</h4>
-<pre>public&nbsp;void&nbsp;featureCategory(HWModel&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;featureCategory&#8203;(HWModel&nbsp;container,
                             Procedures.Procedure1&lt;HwFeatureCategory&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="structure-org.eclipse.app4mc.amalthea.model.HWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="structure(org.eclipse.app4mc.amalthea.model.HWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>structure</h4>
-<pre>public&nbsp;void&nbsp;structure(HWModel&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;structure&#8203;(HWModel&nbsp;container,
                       Procedures.Procedure1&lt;HwStructure&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="feature-org.eclipse.app4mc.amalthea.model.HwFeatureCategory-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="feature(org.eclipse.app4mc.amalthea.model.HwFeatureCategory,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>feature</h4>
-<pre>public&nbsp;void&nbsp;feature(HwFeatureCategory&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;feature&#8203;(HwFeatureCategory&nbsp;container,
                     Procedures.Procedure1&lt;HwFeature&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="structure-org.eclipse.app4mc.amalthea.model.HwStructure-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="structure(org.eclipse.app4mc.amalthea.model.HwStructure,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>structure</h4>
-<pre>public&nbsp;void&nbsp;structure(HwStructure&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;structure&#8203;(HwStructure&nbsp;container,
                       Procedures.Procedure1&lt;HwStructure&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="module_Memory-org.eclipse.app4mc.amalthea.model.HwStructure-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="module_Memory(org.eclipse.app4mc.amalthea.model.HwStructure,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>module_Memory</h4>
-<pre>public&nbsp;void&nbsp;module_Memory(HwStructure&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;module_Memory&#8203;(HwStructure&nbsp;container,
                           Procedures.Procedure1&lt;Memory&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="module_ProcessingUnit-org.eclipse.app4mc.amalthea.model.HwStructure-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="module_ProcessingUnit(org.eclipse.app4mc.amalthea.model.HwStructure,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>module_ProcessingUnit</h4>
-<pre>public&nbsp;void&nbsp;module_ProcessingUnit(HwStructure&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;module_ProcessingUnit&#8203;(HwStructure&nbsp;container,
                                   Procedures.Procedure1&lt;ProcessingUnit&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="module_Cache-org.eclipse.app4mc.amalthea.model.HwStructure-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="module_Cache(org.eclipse.app4mc.amalthea.model.HwStructure,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>module_Cache</h4>
-<pre>public&nbsp;void&nbsp;module_Cache(HwStructure&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;module_Cache&#8203;(HwStructure&nbsp;container,
                          Procedures.Procedure1&lt;Cache&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="module_ConnectionHandler-org.eclipse.app4mc.amalthea.model.HwStructure-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="module_ConnectionHandler(org.eclipse.app4mc.amalthea.model.HwStructure,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>module_ConnectionHandler</h4>
-<pre>public&nbsp;void&nbsp;module_ConnectionHandler(HwStructure&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;module_ConnectionHandler&#8203;(HwStructure&nbsp;container,
                                      Procedures.Procedure1&lt;ConnectionHandler&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="connection-org.eclipse.app4mc.amalthea.model.HwStructure-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="connection(org.eclipse.app4mc.amalthea.model.HwStructure,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>connection</h4>
-<pre>public&nbsp;void&nbsp;connection(HwStructure&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;connection&#8203;(HwStructure&nbsp;container,
                        Procedures.Procedure1&lt;HwConnection&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="port-org.eclipse.app4mc.amalthea.model.HwStructure-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="port(org.eclipse.app4mc.amalthea.model.HwStructure,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>port</h4>
-<pre>public&nbsp;void&nbsp;port(HwStructure&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;port&#8203;(HwStructure&nbsp;container,
                  Procedures.Procedure1&lt;HwPort&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="port-org.eclipse.app4mc.amalthea.model.Memory-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="port(org.eclipse.app4mc.amalthea.model.Memory,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>port</h4>
-<pre>public&nbsp;void&nbsp;port(Memory&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;port&#8203;(Memory&nbsp;container,
                  Procedures.Procedure1&lt;HwPort&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="port-org.eclipse.app4mc.amalthea.model.ProcessingUnit-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="port(org.eclipse.app4mc.amalthea.model.ProcessingUnit,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>port</h4>
-<pre>public&nbsp;void&nbsp;port(ProcessingUnit&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;port&#8203;(ProcessingUnit&nbsp;container,
                  Procedures.Procedure1&lt;HwPort&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="port-org.eclipse.app4mc.amalthea.model.Cache-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="port(org.eclipse.app4mc.amalthea.model.Cache,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>port</h4>
-<pre>public&nbsp;void&nbsp;port(Cache&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;port&#8203;(Cache&nbsp;container,
                  Procedures.Procedure1&lt;HwPort&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="port-org.eclipse.app4mc.amalthea.model.ConnectionHandler-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="port(org.eclipse.app4mc.amalthea.model.ConnectionHandler,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>port</h4>
-<pre>public&nbsp;void&nbsp;port(ConnectionHandler&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;port&#8203;(ConnectionHandler&nbsp;container,
                  Procedures.Procedure1&lt;HwPort&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="cache-org.eclipse.app4mc.amalthea.model.ProcessingUnit-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="cache(org.eclipse.app4mc.amalthea.model.ProcessingUnit,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>cache</h4>
-<pre>public&nbsp;void&nbsp;cache(ProcessingUnit&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;cache&#8203;(ProcessingUnit&nbsp;container,
                   Procedures.Procedure1&lt;Cache&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="access-org.eclipse.app4mc.amalthea.model.ProcessingUnit-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="access(org.eclipse.app4mc.amalthea.model.ProcessingUnit,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>access</h4>
-<pre>public&nbsp;void&nbsp;access(ProcessingUnit&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;access&#8203;(ProcessingUnit&nbsp;container,
                    Procedures.Procedure1&lt;HwAccessElement&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="path-org.eclipse.app4mc.amalthea.model.HwAccessElement-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="path(org.eclipse.app4mc.amalthea.model.HwAccessElement,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>path</h4>
-<pre>public&nbsp;void&nbsp;path(HwAccessElement&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;path&#8203;(HwAccessElement&nbsp;container,
                  Procedures.Procedure1&lt;HwAccessPath&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
 </div>
+</main>
 <!-- ========= END OF CLASS DATA ========= -->
 </body>
 </html>
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 46aa21d..62966c9 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
@@ -1,16 +1,18 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML>
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
+<!-- Generated by javadoc (11.0.8) on Mon Nov 30 13:15:36 CET 2020 -->
 <title>InstructionsBuilder</title>
-<meta name="date" content="2019-07-31">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-11-30">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
 <!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
 <div class="header">
-<div class="subTitle">org.eclipse.app4mc.amalthea.model.builder</div>
+<div class="subTitle"><span class="packageLabelInType">Package</span>&nbsp;<a href="package-summary.html">org.eclipse.app4mc.amalthea.model.builder</a></div>
 <h2 title="Class InstructionsBuilder" class="title">Class InstructionsBuilder</h2>
 </div>
 <div class="contentContainer">
@@ -33,6 +35,9 @@
 <pre>@Deprecated
 public class <span class="typeNameLabel">InstructionsBuilder</span>
 extends Object</pre>
+<div class="deprecationBlock"><span class="deprecatedLabel">Deprecated.</span>
+<div class="deprecationComment">(0.9.3) use <code>Ticks</code> instead.</div>
+</div>
 <div class="block">Creates Need entries for Instructions</div>
 </li>
 </ul>
@@ -41,60 +46,69 @@
 <ul class="blockList">
 <li class="blockList">
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a id="constructor.summary">
 <!--   -->
 </a>
 <h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<table class="memberSummary">
 <caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
-<th class="colOne" scope="col">Constructor and Description</th>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="#InstructionsBuilder--">InstructionsBuilder</a></span>()</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E()">InstructionsBuilder</a></span>()</code></th>
+<td class="colLast">
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 &nbsp;</td>
 </tr>
 </table>
 </li>
 </ul>
+</section>
 <!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a id="method.summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<table class="memberSummary">
 <caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#featureCategory_Instructions-org.eclipse.app4mc.amalthea.model.HWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">featureCategory_Instructions</a></span>(HWModel&nbsp;container,
-                            Procedures.Procedure1&lt;HwFeatureCategory&gt;&nbsp;initializer)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#featureCategory_Instructions(org.eclipse.app4mc.amalthea.model.HWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">featureCategory_Instructions</a></span>&#8203;(HWModel&nbsp;container,
+                            Procedures.Procedure1&lt;HwFeatureCategory&gt;&nbsp;initializer)</code></th>
+<td class="colLast">
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 &nbsp;</td>
 </tr>
 <tr id="i1" class="rowColor">
-<td class="colFirst"><code>IDiscreteValueDeviation</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#instructions-org.eclipse.app4mc.amalthea.model.ExecutionNeed-org.eclipse.app4mc.amalthea.model.IDiscreteValueDeviation-">instructions</a></span>(ExecutionNeed&nbsp;container,
-            IDiscreteValueDeviation&nbsp;instructions)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
+<td class="colFirst"><code>DiscreteValueConstant</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#instructions(org.eclipse.app4mc.amalthea.model.ExecutionNeed,long)">instructions</a></span>&#8203;(ExecutionNeed&nbsp;container,
+            long&nbsp;instructions)</code></th>
+<td class="colLast">
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 &nbsp;</td>
 </tr>
 <tr id="i2" class="altColor">
-<td class="colFirst"><code>DiscreteValueConstant</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#instructions-org.eclipse.app4mc.amalthea.model.ExecutionNeed-long-">instructions</a></span>(ExecutionNeed&nbsp;container,
-            long&nbsp;instructions)</code>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
+<td class="colFirst"><code>IDiscreteValueDeviation</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#instructions(org.eclipse.app4mc.amalthea.model.ExecutionNeed,org.eclipse.app4mc.amalthea.model.IDiscreteValueDeviation)">instructions</a></span>&#8203;(ExecutionNeed&nbsp;container,
+            IDiscreteValueDeviation&nbsp;instructions)</code></th>
+<td class="colLast">
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
 &nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.Object">
+<li class="blockList"><a id="methods.inherited.from.class.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;Object</h3>
@@ -102,6 +116,7 @@
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
@@ -109,68 +124,73 @@
 <ul class="blockList">
 <li class="blockList">
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a id="constructor.detail">
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="InstructionsBuilder--">
+<a id="&lt;init&gt;()">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>InstructionsBuilder</h4>
 <pre>public&nbsp;InstructionsBuilder()</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
+<div class="deprecationBlock"><span class="deprecatedLabel">Deprecated.</span></div>
 </li>
 </ul>
 </li>
 </ul>
+</section>
 <!-- ============ METHOD DETAIL ========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a id="method.detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="instructions-org.eclipse.app4mc.amalthea.model.ExecutionNeed-long-">
+<a id="instructions(org.eclipse.app4mc.amalthea.model.ExecutionNeed,long)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>instructions</h4>
-<pre>public&nbsp;DiscreteValueConstant&nbsp;instructions(ExecutionNeed&nbsp;container,
+<pre class="methodSignature">public&nbsp;DiscreteValueConstant&nbsp;instructions&#8203;(ExecutionNeed&nbsp;container,
                                           long&nbsp;instructions)</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
+<div class="deprecationBlock"><span class="deprecatedLabel">Deprecated.</span></div>
 </li>
 </ul>
-<a name="instructions-org.eclipse.app4mc.amalthea.model.ExecutionNeed-org.eclipse.app4mc.amalthea.model.IDiscreteValueDeviation-">
+<a id="instructions(org.eclipse.app4mc.amalthea.model.ExecutionNeed,org.eclipse.app4mc.amalthea.model.IDiscreteValueDeviation)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>instructions</h4>
-<pre>public&nbsp;IDiscreteValueDeviation&nbsp;instructions(ExecutionNeed&nbsp;container,
+<pre class="methodSignature">public&nbsp;IDiscreteValueDeviation&nbsp;instructions&#8203;(ExecutionNeed&nbsp;container,
                                             IDiscreteValueDeviation&nbsp;instructions)</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
+<div class="deprecationBlock"><span class="deprecatedLabel">Deprecated.</span></div>
 </li>
 </ul>
-<a name="featureCategory_Instructions-org.eclipse.app4mc.amalthea.model.HWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="featureCategory_Instructions(org.eclipse.app4mc.amalthea.model.HWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>featureCategory_Instructions</h4>
-<pre>public&nbsp;void&nbsp;featureCategory_Instructions(HWModel&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;featureCategory_Instructions&#8203;(HWModel&nbsp;container,
                                          Procedures.Procedure1&lt;HwFeatureCategory&gt;&nbsp;initializer)</pre>
-<div class="block"><span class="deprecatedLabel">Deprecated.</span>&nbsp;</div>
+<div class="deprecationBlock"><span class="deprecatedLabel">Deprecated.</span></div>
 </li>
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
 </div>
+</main>
 <!-- ========= END OF CLASS DATA ========= -->
 </body>
 </html>
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 b373a57..93292ff 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
@@ -1,16 +1,18 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML>
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
+<!-- Generated by javadoc (11.0.8) on Mon Nov 30 13:15:36 CET 2020 -->
 <title>MappingBuilder</title>
-<meta name="date" content="2019-07-31">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-11-30">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
 <!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
 <div class="header">
-<div class="subTitle">org.eclipse.app4mc.amalthea.model.builder</div>
+<div class="subTitle"><span class="packageLabelInType">Package</span>&nbsp;<a href="package-summary.html">org.eclipse.app4mc.amalthea.model.builder</a></div>
 <h2 title="Class MappingBuilder" class="title">Class MappingBuilder</h2>
 </div>
 <div class="contentContainer">
@@ -36,71 +38,84 @@
 <ul class="blockList">
 <li class="blockList">
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a id="constructor.summary">
 <!--   -->
 </a>
 <h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<table class="memberSummary">
 <caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
-<th class="colOne" scope="col">Constructor and Description</th>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="#MappingBuilder--">MappingBuilder</a></span>()</code>&nbsp;</td>
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E()">MappingBuilder</a></span>()</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 </table>
 </li>
 </ul>
+</section>
 <!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a id="method.summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<table class="memberSummary">
 <caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#isrAllocation-org.eclipse.app4mc.amalthea.model.MappingModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">isrAllocation</a></span>(MappingModel&nbsp;container,
-             Procedures.Procedure1&lt;ISRAllocation&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#isrAllocation(org.eclipse.app4mc.amalthea.model.MappingModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">isrAllocation</a></span>&#8203;(MappingModel&nbsp;container,
+             Procedures.Procedure1&lt;ISRAllocation&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>MappingModel</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#mappingModelRoot-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">mappingModelRoot</a></span>(Procedures.Procedure1&lt;MappingModel&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#mappingModelRoot(org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">mappingModelRoot</a></span>&#8203;(Procedures.Procedure1&lt;MappingModel&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i2" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#memoryMapping-org.eclipse.app4mc.amalthea.model.MappingModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">memoryMapping</a></span>(MappingModel&nbsp;container,
-             Procedures.Procedure1&lt;MemoryMapping&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#memoryMapping(org.eclipse.app4mc.amalthea.model.MappingModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">memoryMapping</a></span>&#8203;(MappingModel&nbsp;container,
+             Procedures.Procedure1&lt;MemoryMapping&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i3" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#physicalSectionMapping-org.eclipse.app4mc.amalthea.model.MappingModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">physicalSectionMapping</a></span>(MappingModel&nbsp;container,
-                      Procedures.Procedure1&lt;PhysicalSectionMapping&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#physicalSectionMapping(org.eclipse.app4mc.amalthea.model.MappingModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">physicalSectionMapping</a></span>&#8203;(MappingModel&nbsp;container,
+                      Procedures.Procedure1&lt;PhysicalSectionMapping&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i4" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#runnableAllocation-org.eclipse.app4mc.amalthea.model.MappingModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">runnableAllocation</a></span>(MappingModel&nbsp;container,
-                  Procedures.Procedure1&lt;RunnableAllocation&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#runnableAllocation(org.eclipse.app4mc.amalthea.model.MappingModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">runnableAllocation</a></span>&#8203;(MappingModel&nbsp;container,
+                  Procedures.Procedure1&lt;RunnableAllocation&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i5" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#schedulerAllocation-org.eclipse.app4mc.amalthea.model.MappingModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">schedulerAllocation</a></span>(MappingModel&nbsp;container,
-                   Procedures.Procedure1&lt;SchedulerAllocation&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#schedulerAllocation(org.eclipse.app4mc.amalthea.model.MappingModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">schedulerAllocation</a></span>&#8203;(MappingModel&nbsp;container,
+                   Procedures.Procedure1&lt;SchedulerAllocation&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i6" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#taskAllocation-org.eclipse.app4mc.amalthea.model.MappingModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">taskAllocation</a></span>(MappingModel&nbsp;container,
-              Procedures.Procedure1&lt;TaskAllocation&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#taskAllocation(org.eclipse.app4mc.amalthea.model.MappingModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">taskAllocation</a></span>&#8203;(MappingModel&nbsp;container,
+              Procedures.Procedure1&lt;TaskAllocation&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.Object">
+<li class="blockList"><a id="methods.inherited.from.class.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;Object</h3>
@@ -108,6 +123,7 @@
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
@@ -115,12 +131,13 @@
 <ul class="blockList">
 <li class="blockList">
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a id="constructor.detail">
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="MappingBuilder--">
+<a id="&lt;init&gt;()">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -131,87 +148,91 @@
 </ul>
 </li>
 </ul>
+</section>
 <!-- ============ METHOD DETAIL ========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a id="method.detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="mappingModelRoot-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="mappingModelRoot(org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>mappingModelRoot</h4>
-<pre>public&nbsp;MappingModel&nbsp;mappingModelRoot(Procedures.Procedure1&lt;MappingModel&gt;&nbsp;initializer)</pre>
+<pre class="methodSignature">public&nbsp;MappingModel&nbsp;mappingModelRoot&#8203;(Procedures.Procedure1&lt;MappingModel&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="isrAllocation-org.eclipse.app4mc.amalthea.model.MappingModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="isrAllocation(org.eclipse.app4mc.amalthea.model.MappingModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>isrAllocation</h4>
-<pre>public&nbsp;void&nbsp;isrAllocation(MappingModel&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;isrAllocation&#8203;(MappingModel&nbsp;container,
                           Procedures.Procedure1&lt;ISRAllocation&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="taskAllocation-org.eclipse.app4mc.amalthea.model.MappingModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="taskAllocation(org.eclipse.app4mc.amalthea.model.MappingModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>taskAllocation</h4>
-<pre>public&nbsp;void&nbsp;taskAllocation(MappingModel&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;taskAllocation&#8203;(MappingModel&nbsp;container,
                            Procedures.Procedure1&lt;TaskAllocation&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="runnableAllocation-org.eclipse.app4mc.amalthea.model.MappingModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="runnableAllocation(org.eclipse.app4mc.amalthea.model.MappingModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>runnableAllocation</h4>
-<pre>public&nbsp;void&nbsp;runnableAllocation(MappingModel&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;runnableAllocation&#8203;(MappingModel&nbsp;container,
                                Procedures.Procedure1&lt;RunnableAllocation&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="schedulerAllocation-org.eclipse.app4mc.amalthea.model.MappingModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="schedulerAllocation(org.eclipse.app4mc.amalthea.model.MappingModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>schedulerAllocation</h4>
-<pre>public&nbsp;void&nbsp;schedulerAllocation(MappingModel&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;schedulerAllocation&#8203;(MappingModel&nbsp;container,
                                 Procedures.Procedure1&lt;SchedulerAllocation&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="memoryMapping-org.eclipse.app4mc.amalthea.model.MappingModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="memoryMapping(org.eclipse.app4mc.amalthea.model.MappingModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>memoryMapping</h4>
-<pre>public&nbsp;void&nbsp;memoryMapping(MappingModel&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;memoryMapping&#8203;(MappingModel&nbsp;container,
                           Procedures.Procedure1&lt;MemoryMapping&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="physicalSectionMapping-org.eclipse.app4mc.amalthea.model.MappingModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="physicalSectionMapping(org.eclipse.app4mc.amalthea.model.MappingModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>physicalSectionMapping</h4>
-<pre>public&nbsp;void&nbsp;physicalSectionMapping(MappingModel&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;physicalSectionMapping&#8203;(MappingModel&nbsp;container,
                                    Procedures.Procedure1&lt;PhysicalSectionMapping&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
 </div>
+</main>
 <!-- ========= END OF CLASS DATA ========= -->
 </body>
 </html>
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 ff6d876..fa3da58 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
@@ -1,16 +1,18 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML>
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
+<!-- Generated by javadoc (11.0.8) on Mon Nov 30 13:15:36 CET 2020 -->
 <title>OperatingSystemBuilder</title>
-<meta name="date" content="2019-07-31">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-11-30">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
 <!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
 <div class="header">
-<div class="subTitle">org.eclipse.app4mc.amalthea.model.builder</div>
+<div class="subTitle"><span class="packageLabelInType">Package</span>&nbsp;<a href="package-summary.html">org.eclipse.app4mc.amalthea.model.builder</a></div>
 <h2 title="Class OperatingSystemBuilder" class="title">Class OperatingSystemBuilder</h2>
 </div>
 <div class="contentContainer">
@@ -26,7 +28,6 @@
 <ul class="blockList">
 <li class="blockList">
 <hr>
-<br>
 <pre>public class <span class="typeNameLabel">OperatingSystemBuilder</span>
 extends Object</pre>
 </li>
@@ -36,112 +37,133 @@
 <ul class="blockList">
 <li class="blockList">
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a id="constructor.summary">
 <!--   -->
 </a>
 <h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<table class="memberSummary">
 <caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
-<th class="colOne" scope="col">Constructor and Description</th>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="#OperatingSystemBuilder--">OperatingSystemBuilder</a></span>()</code>&nbsp;</td>
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E()">OperatingSystemBuilder</a></span>()</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 </table>
 </li>
 </ul>
+</section>
 <!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a id="method.summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<table class="memberSummary">
 <caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#apiOverhead-org.eclipse.app4mc.amalthea.model.OsOverhead-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">apiOverhead</a></span>(OsOverhead&nbsp;container,
-           Procedures.Procedure1&lt;OsAPIOverhead&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#apiOverhead(org.eclipse.app4mc.amalthea.model.OsOverhead,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">apiOverhead</a></span>&#8203;(OsOverhead&nbsp;container,
+           Procedures.Procedure1&lt;OsAPIOverhead&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#dataConsistency-org.eclipse.app4mc.amalthea.model.OperatingSystem-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">dataConsistency</a></span>(OperatingSystem&nbsp;container,
-               Procedures.Procedure1&lt;OsDataConsistency&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#dataConsistency(org.eclipse.app4mc.amalthea.model.OperatingSystem,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">dataConsistency</a></span>&#8203;(OperatingSystem&nbsp;container,
+               Procedures.Procedure1&lt;OsDataConsistency&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i2" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#interruptController-org.eclipse.app4mc.amalthea.model.OperatingSystem-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">interruptController</a></span>(OperatingSystem&nbsp;container,
-                   Procedures.Procedure1&lt;InterruptController&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#interruptController(org.eclipse.app4mc.amalthea.model.OperatingSystem,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">interruptController</a></span>&#8203;(OperatingSystem&nbsp;container,
+                   Procedures.Procedure1&lt;InterruptController&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i3" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#isrOverheadCat1-org.eclipse.app4mc.amalthea.model.OsOverhead-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">isrOverheadCat1</a></span>(OsOverhead&nbsp;container,
-               Procedures.Procedure1&lt;OsISROverhead&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#isrOverheadCat1(org.eclipse.app4mc.amalthea.model.OsOverhead,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">isrOverheadCat1</a></span>&#8203;(OsOverhead&nbsp;container,
+               Procedures.Procedure1&lt;OsISROverhead&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i4" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#isrOverheadCat2-org.eclipse.app4mc.amalthea.model.OsOverhead-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">isrOverheadCat2</a></span>(OsOverhead&nbsp;container,
-               Procedures.Procedure1&lt;OsISROverhead&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#isrOverheadCat2(org.eclipse.app4mc.amalthea.model.OsOverhead,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">isrOverheadCat2</a></span>&#8203;(OsOverhead&nbsp;container,
+               Procedures.Procedure1&lt;OsISROverhead&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i5" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#labelAccess-org.eclipse.app4mc.amalthea.model.Scheduler-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">labelAccess</a></span>(Scheduler&nbsp;container,
-           Procedures.Procedure1&lt;LabelAccess&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#labelAccess(org.eclipse.app4mc.amalthea.model.Scheduler,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">labelAccess</a></span>&#8203;(Scheduler&nbsp;container,
+           Procedures.Procedure1&lt;LabelAccess&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i6" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#operatingSystem_Vendor-org.eclipse.app4mc.amalthea.model.OSModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">operatingSystem_Vendor</a></span>(OSModel&nbsp;container,
-                      Procedures.Procedure1&lt;VendorOperatingSystem&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#operatingSystem(org.eclipse.app4mc.amalthea.model.OSModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">operatingSystem</a></span>&#8203;(OSModel&nbsp;container,
+               Procedures.Procedure1&lt;OperatingSystem&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i7" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#operatingSystem-org.eclipse.app4mc.amalthea.model.OSModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">operatingSystem</a></span>(OSModel&nbsp;container,
-               Procedures.Procedure1&lt;OperatingSystem&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#operatingSystem_Vendor(org.eclipse.app4mc.amalthea.model.OSModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">operatingSystem_Vendor</a></span>&#8203;(OSModel&nbsp;container,
+                      Procedures.Procedure1&lt;VendorOperatingSystem&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i8" class="altColor">
 <td class="colFirst"><code>OSModel</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#osModelRoot-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">osModelRoot</a></span>(Procedures.Procedure1&lt;OSModel&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#osModelRoot(org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">osModelRoot</a></span>&#8203;(Procedures.Procedure1&lt;OSModel&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i9" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#osOverhead-org.eclipse.app4mc.amalthea.model.OSModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">osOverhead</a></span>(OSModel&nbsp;container,
-          Procedures.Procedure1&lt;OsOverhead&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#osOverhead(org.eclipse.app4mc.amalthea.model.OSModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">osOverhead</a></span>&#8203;(OSModel&nbsp;container,
+          Procedures.Procedure1&lt;OsOverhead&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i10" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#parameter_extension-org.eclipse.app4mc.amalthea.model.SchedulerAssociation-java.lang.String-java.lang.String-">parameter_extension</a></span>(SchedulerAssociation&nbsp;container,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#parameter_extension(org.eclipse.app4mc.amalthea.model.SchedulerAssociation,java.lang.String,java.lang.String)">parameter_extension</a></span>&#8203;(SchedulerAssociation&nbsp;container,
                    String&nbsp;key,
-                   String&nbsp;value)</code>&nbsp;</td>
+                   String&nbsp;value)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i11" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#parentAssociation-org.eclipse.app4mc.amalthea.model.TaskScheduler-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">parentAssociation</a></span>(TaskScheduler&nbsp;container,
-                 Procedures.Procedure1&lt;SchedulerAssociation&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#parentAssociation(org.eclipse.app4mc.amalthea.model.TaskScheduler,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">parentAssociation</a></span>&#8203;(TaskScheduler&nbsp;container,
+                 Procedures.Procedure1&lt;SchedulerAssociation&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i12" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#schedulingParameters-org.eclipse.app4mc.amalthea.model.SchedulerAssociation-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">schedulingParameters</a></span>(SchedulerAssociation&nbsp;container,
-                    Procedures.Procedure1&lt;SchedulingParameters&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#schedulingParameters(org.eclipse.app4mc.amalthea.model.SchedulerAssociation,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">schedulingParameters</a></span>&#8203;(SchedulerAssociation&nbsp;container,
+                    Procedures.Procedure1&lt;SchedulingParameters&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i13" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#semaphore-org.eclipse.app4mc.amalthea.model.OSModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">semaphore</a></span>(OSModel&nbsp;container,
-         Procedures.Procedure1&lt;Semaphore&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#semaphore(org.eclipse.app4mc.amalthea.model.OSModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">semaphore</a></span>&#8203;(OSModel&nbsp;container,
+         Procedures.Procedure1&lt;Semaphore&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i14" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#taskScheduler-org.eclipse.app4mc.amalthea.model.OperatingSystem-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">taskScheduler</a></span>(OperatingSystem&nbsp;container,
-             Procedures.Procedure1&lt;TaskScheduler&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#taskScheduler(org.eclipse.app4mc.amalthea.model.OperatingSystem,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">taskScheduler</a></span>&#8203;(OperatingSystem&nbsp;container,
+             Procedures.Procedure1&lt;TaskScheduler&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.Object">
+<li class="blockList"><a id="methods.inherited.from.class.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;Object</h3>
@@ -149,6 +171,7 @@
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
@@ -156,12 +179,13 @@
 <ul class="blockList">
 <li class="blockList">
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a id="constructor.detail">
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="OperatingSystemBuilder--">
+<a id="&lt;init&gt;()">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -172,168 +196,172 @@
 </ul>
 </li>
 </ul>
+</section>
 <!-- ============ METHOD DETAIL ========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a id="method.detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="osModelRoot-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="osModelRoot(org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>osModelRoot</h4>
-<pre>public&nbsp;OSModel&nbsp;osModelRoot(Procedures.Procedure1&lt;OSModel&gt;&nbsp;initializer)</pre>
+<pre class="methodSignature">public&nbsp;OSModel&nbsp;osModelRoot&#8203;(Procedures.Procedure1&lt;OSModel&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="operatingSystem-org.eclipse.app4mc.amalthea.model.OSModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="operatingSystem(org.eclipse.app4mc.amalthea.model.OSModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>operatingSystem</h4>
-<pre>public&nbsp;void&nbsp;operatingSystem(OSModel&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;operatingSystem&#8203;(OSModel&nbsp;container,
                             Procedures.Procedure1&lt;OperatingSystem&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="operatingSystem_Vendor-org.eclipse.app4mc.amalthea.model.OSModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="operatingSystem_Vendor(org.eclipse.app4mc.amalthea.model.OSModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>operatingSystem_Vendor</h4>
-<pre>public&nbsp;void&nbsp;operatingSystem_Vendor(OSModel&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;operatingSystem_Vendor&#8203;(OSModel&nbsp;container,
                                    Procedures.Procedure1&lt;VendorOperatingSystem&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="semaphore-org.eclipse.app4mc.amalthea.model.OSModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="semaphore(org.eclipse.app4mc.amalthea.model.OSModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>semaphore</h4>
-<pre>public&nbsp;void&nbsp;semaphore(OSModel&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;semaphore&#8203;(OSModel&nbsp;container,
                       Procedures.Procedure1&lt;Semaphore&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="osOverhead-org.eclipse.app4mc.amalthea.model.OSModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="osOverhead(org.eclipse.app4mc.amalthea.model.OSModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>osOverhead</h4>
-<pre>public&nbsp;void&nbsp;osOverhead(OSModel&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;osOverhead&#8203;(OSModel&nbsp;container,
                        Procedures.Procedure1&lt;OsOverhead&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="taskScheduler-org.eclipse.app4mc.amalthea.model.OperatingSystem-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="taskScheduler(org.eclipse.app4mc.amalthea.model.OperatingSystem,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>taskScheduler</h4>
-<pre>public&nbsp;void&nbsp;taskScheduler(OperatingSystem&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;taskScheduler&#8203;(OperatingSystem&nbsp;container,
                           Procedures.Procedure1&lt;TaskScheduler&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="interruptController-org.eclipse.app4mc.amalthea.model.OperatingSystem-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="interruptController(org.eclipse.app4mc.amalthea.model.OperatingSystem,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>interruptController</h4>
-<pre>public&nbsp;void&nbsp;interruptController(OperatingSystem&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;interruptController&#8203;(OperatingSystem&nbsp;container,
                                 Procedures.Procedure1&lt;InterruptController&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="dataConsistency-org.eclipse.app4mc.amalthea.model.OperatingSystem-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="dataConsistency(org.eclipse.app4mc.amalthea.model.OperatingSystem,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>dataConsistency</h4>
-<pre>public&nbsp;void&nbsp;dataConsistency(OperatingSystem&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;dataConsistency&#8203;(OperatingSystem&nbsp;container,
                             Procedures.Procedure1&lt;OsDataConsistency&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="labelAccess-org.eclipse.app4mc.amalthea.model.Scheduler-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="labelAccess(org.eclipse.app4mc.amalthea.model.Scheduler,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>labelAccess</h4>
-<pre>public&nbsp;void&nbsp;labelAccess(Scheduler&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;labelAccess&#8203;(Scheduler&nbsp;container,
                         Procedures.Procedure1&lt;LabelAccess&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="parentAssociation-org.eclipse.app4mc.amalthea.model.TaskScheduler-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="parentAssociation(org.eclipse.app4mc.amalthea.model.TaskScheduler,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>parentAssociation</h4>
-<pre>public&nbsp;void&nbsp;parentAssociation(TaskScheduler&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;parentAssociation&#8203;(TaskScheduler&nbsp;container,
                               Procedures.Procedure1&lt;SchedulerAssociation&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="schedulingParameters-org.eclipse.app4mc.amalthea.model.SchedulerAssociation-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="schedulingParameters(org.eclipse.app4mc.amalthea.model.SchedulerAssociation,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>schedulingParameters</h4>
-<pre>public&nbsp;void&nbsp;schedulingParameters(SchedulerAssociation&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;schedulingParameters&#8203;(SchedulerAssociation&nbsp;container,
                                  Procedures.Procedure1&lt;SchedulingParameters&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="parameter_extension-org.eclipse.app4mc.amalthea.model.SchedulerAssociation-java.lang.String-java.lang.String-">
+<a id="parameter_extension(org.eclipse.app4mc.amalthea.model.SchedulerAssociation,java.lang.String,java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>parameter_extension</h4>
-<pre>public&nbsp;void&nbsp;parameter_extension(SchedulerAssociation&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;parameter_extension&#8203;(SchedulerAssociation&nbsp;container,
                                 String&nbsp;key,
                                 String&nbsp;value)</pre>
 </li>
 </ul>
-<a name="apiOverhead-org.eclipse.app4mc.amalthea.model.OsOverhead-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="apiOverhead(org.eclipse.app4mc.amalthea.model.OsOverhead,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>apiOverhead</h4>
-<pre>public&nbsp;void&nbsp;apiOverhead(OsOverhead&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;apiOverhead&#8203;(OsOverhead&nbsp;container,
                         Procedures.Procedure1&lt;OsAPIOverhead&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="isrOverheadCat1-org.eclipse.app4mc.amalthea.model.OsOverhead-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="isrOverheadCat1(org.eclipse.app4mc.amalthea.model.OsOverhead,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>isrOverheadCat1</h4>
-<pre>public&nbsp;void&nbsp;isrOverheadCat1(OsOverhead&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;isrOverheadCat1&#8203;(OsOverhead&nbsp;container,
                             Procedures.Procedure1&lt;OsISROverhead&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="isrOverheadCat2-org.eclipse.app4mc.amalthea.model.OsOverhead-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="isrOverheadCat2(org.eclipse.app4mc.amalthea.model.OsOverhead,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>isrOverheadCat2</h4>
-<pre>public&nbsp;void&nbsp;isrOverheadCat2(OsOverhead&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;isrOverheadCat2&#8203;(OsOverhead&nbsp;container,
                             Procedures.Procedure1&lt;OsISROverhead&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
 </div>
+</main>
 <!-- ========= END OF CLASS DATA ========= -->
 </body>
 </html>
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 b094361..b313563 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
@@ -1,16 +1,18 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML>
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
+<!-- Generated by javadoc (11.0.8) on Mon Nov 30 13:15:36 CET 2020 -->
 <title>SoftwareBuilder</title>
-<meta name="date" content="2019-07-31">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-11-30">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
 <!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
 <div class="header">
-<div class="subTitle">org.eclipse.app4mc.amalthea.model.builder</div>
+<div class="subTitle"><span class="packageLabelInType">Package</span>&nbsp;<a href="package-summary.html">org.eclipse.app4mc.amalthea.model.builder</a></div>
 <h2 title="Class SoftwareBuilder" class="title">Class SoftwareBuilder</h2>
 </div>
 <div class="contentContainer">
@@ -26,7 +28,6 @@
 <ul class="blockList">
 <li class="blockList">
 <hr>
-<br>
 <pre>public class <span class="typeNameLabel">SoftwareBuilder</span>
 extends Object</pre>
 </li>
@@ -36,278 +37,376 @@
 <ul class="blockList">
 <li class="blockList">
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
+<li class="blockList"><a id="constructor.summary">
 <!--   -->
 </a>
 <h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
+<table class="memberSummary">
 <caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
-<th class="colOne" scope="col">Constructor and Description</th>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="#SoftwareBuilder--">SoftwareBuilder</a></span>()</code>&nbsp;</td>
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E()">SoftwareBuilder</a></span>()</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 </table>
 </li>
 </ul>
+</section>
 <!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a id="method.summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<table class="memberSummary">
 <caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#activation_Custom-org.eclipse.app4mc.amalthea.model.SWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">activation_Custom</a></span>(SWModel&nbsp;container,
-                 Procedures.Procedure1&lt;CustomActivation&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#activation_Custom(org.eclipse.app4mc.amalthea.model.SWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">activation_Custom</a></span>&#8203;(SWModel&nbsp;container,
+                 Procedures.Procedure1&lt;CustomActivation&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#activation_Event-org.eclipse.app4mc.amalthea.model.SWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">activation_Event</a></span>(SWModel&nbsp;container,
-                Procedures.Procedure1&lt;EventActivation&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#activation_Event(org.eclipse.app4mc.amalthea.model.SWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">activation_Event</a></span>&#8203;(SWModel&nbsp;container,
+                Procedures.Procedure1&lt;EventActivation&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i2" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#activation_Periodic-org.eclipse.app4mc.amalthea.model.SWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">activation_Periodic</a></span>(SWModel&nbsp;container,
-                   Procedures.Procedure1&lt;PeriodicActivation&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#activation_Periodic(org.eclipse.app4mc.amalthea.model.SWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">activation_Periodic</a></span>&#8203;(SWModel&nbsp;container,
+                   Procedures.Procedure1&lt;PeriodicActivation&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i3" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#activation_Single-org.eclipse.app4mc.amalthea.model.SWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">activation_Single</a></span>(SWModel&nbsp;container,
-                 Procedures.Procedure1&lt;SingleActivation&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#activation_Single(org.eclipse.app4mc.amalthea.model.SWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">activation_Single</a></span>&#8203;(SWModel&nbsp;container,
+                 Procedures.Procedure1&lt;SingleActivation&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i4" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#activation_Sporadic-org.eclipse.app4mc.amalthea.model.SWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">activation_Sporadic</a></span>(SWModel&nbsp;container,
-                   Procedures.Procedure1&lt;SporadicActivation&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#activation_Sporadic(org.eclipse.app4mc.amalthea.model.SWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">activation_Sporadic</a></span>&#8203;(SWModel&nbsp;container,
+                   Procedures.Procedure1&lt;SporadicActivation&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i5" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#activation_VariableRate-org.eclipse.app4mc.amalthea.model.SWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">activation_VariableRate</a></span>(SWModel&nbsp;container,
-                       Procedures.Procedure1&lt;VariableRateActivation&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#activation_VariableRate(org.eclipse.app4mc.amalthea.model.SWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">activation_VariableRate</a></span>&#8203;(SWModel&nbsp;container,
+                       Procedures.Procedure1&lt;VariableRateActivation&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i6" class="altColor">
 <td class="colFirst"><code>void</code></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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#activityGraph(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">activityGraph</a></span>&#8203;(Runnable&nbsp;container,
+             Procedures.Procedure1&lt;ActivityGraph&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i7" class="rowColor">
 <td class="colFirst"><code>void</code></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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#activityGraph(org.eclipse.app4mc.amalthea.model.Task,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">activityGraph</a></span>&#8203;(Task&nbsp;container,
+             Procedures.Procedure1&lt;ActivityGraph&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i8" class="altColor">
 <td class="colFirst"><code>void</code></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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#asynchronousServerCall(org.eclipse.app4mc.amalthea.model.IActivityGraphItemContainer,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">asynchronousServerCall</a></span>&#8203;(IActivityGraphItemContainer&nbsp;container,
+                      Procedures.Procedure1&lt;AsynchronousServerCall&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i9" class="rowColor">
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#channel(org.eclipse.app4mc.amalthea.model.SWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">channel</a></span>&#8203;(SWModel&nbsp;container,
+       Procedures.Procedure1&lt;Channel&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <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.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">clearEvent</a></span>(ICallGraphItemContainer&nbsp;container,
-          Procedures.Procedure1&lt;ClearEvent&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#clearEvent(org.eclipse.app4mc.amalthea.model.IActivityGraphItemContainer,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">clearEvent</a></span>&#8203;(IActivityGraphItemContainer&nbsp;container,
+          Procedures.Procedure1&lt;ClearEvent&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#condition(org.eclipse.app4mc.amalthea.model.ModeConditionConjunction,org.eclipse.app4mc.amalthea.model.ModeLabel,org.eclipse.app4mc.amalthea.model.RelationalOperator,java.lang.String)">condition</a></span>&#8203;(ModeConditionConjunction&nbsp;container,
+         ModeLabel&nbsp;label,
+         RelationalOperator&nbsp;relation,
+         String&nbsp;value)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#condition(org.eclipse.app4mc.amalthea.model.ModeConditionConjunction,org.eclipse.app4mc.amalthea.model.ModeLabel,org.eclipse.app4mc.amalthea.model.RelationalOperator,org.eclipse.app4mc.amalthea.model.ModeLabel)">condition</a></span>&#8203;(ModeConditionConjunction&nbsp;container,
+         ModeLabel&nbsp;label1,
+         RelationalOperator&nbsp;relation,
+         ModeLabel&nbsp;label2)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <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&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#condition(org.eclipse.app4mc.amalthea.model.ModeConditionDisjunction,org.eclipse.app4mc.amalthea.model.ModeLabel,org.eclipse.app4mc.amalthea.model.RelationalOperator,java.lang.String)">condition</a></span>&#8203;(ModeConditionDisjunction&nbsp;container,
+         ModeLabel&nbsp;label,
+         RelationalOperator&nbsp;relation,
+         String&nbsp;value)</code></th>
+<td class="colLast">&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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#condition(org.eclipse.app4mc.amalthea.model.ModeConditionDisjunction,org.eclipse.app4mc.amalthea.model.ModeLabel,org.eclipse.app4mc.amalthea.model.RelationalOperator,org.eclipse.app4mc.amalthea.model.ModeLabel)">condition</a></span>&#8203;(ModeConditionDisjunction&nbsp;container,
+         ModeLabel&nbsp;label1,
+         RelationalOperator&nbsp;relation,
+         ModeLabel&nbsp;label2)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i15" 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&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#condition_AND(org.eclipse.app4mc.amalthea.model.ModeConditionDisjunction,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">condition_AND</a></span>&#8203;(ModeConditionDisjunction&nbsp;container,
+             Procedures.Procedure1&lt;ModeConditionConjunction&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i16" 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&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#condition_OR(org.eclipse.app4mc.amalthea.model.ModeSwitchEntry,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">condition_OR</a></span>&#8203;(ModeSwitchEntry&nbsp;container,
+            Procedures.Procedure1&lt;ModeConditionDisjunction&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i17" class="rowColor">
 <td class="colFirst"><code>void</code></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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#defaultConstant(org.eclipse.app4mc.amalthea.model.Ticks,long)">defaultConstant</a></span>&#8203;(Ticks&nbsp;container,
+               long&nbsp;ticks)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i18" class="altColor">
 <td class="colFirst"><code>void</code></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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#defaultDeviation(org.eclipse.app4mc.amalthea.model.Ticks,org.eclipse.app4mc.amalthea.model.IDiscreteValueDeviation)">defaultDeviation</a></span>&#8203;(Ticks&nbsp;container,
+                IDiscreteValueDeviation&nbsp;ticks)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i19" class="rowColor">
 <td class="colFirst"><code>void</code></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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#defaultEntry(org.eclipse.app4mc.amalthea.model.ModeSwitch,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">defaultEntry</a></span>&#8203;(ModeSwitch&nbsp;container,
+            Procedures.Procedure1&lt;ModeSwitchDefault&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i20" class="altColor">
 <td class="colFirst"><code>void</code></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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#enforcedMigration(org.eclipse.app4mc.amalthea.model.IActivityGraphItemContainer,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">enforcedMigration</a></span>&#8203;(IActivityGraphItemContainer&nbsp;container,
+                 Procedures.Procedure1&lt;EnforcedMigration&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i21" class="rowColor">
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#entry(org.eclipse.app4mc.amalthea.model.ModeSwitch,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">entry</a></span>&#8203;(ModeSwitch&nbsp;container,
+     Procedures.Procedure1&lt;ModeSwitchEntry&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <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.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">group</a></span>(ICallGraphItemContainer&nbsp;container,
-     Procedures.Procedure1&lt;Group&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#entry(org.eclipse.app4mc.amalthea.model.ProbabilitySwitch,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">entry</a></span>&#8203;(ProbabilitySwitch&nbsp;container,
+     Procedures.Procedure1&lt;ProbabilitySwitchEntry&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i23" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#eventMask(org.eclipse.app4mc.amalthea.model.ClearEvent,org.eclipse.app4mc.amalthea.model.OsEvent...)">eventMask</a></span>&#8203;(ClearEvent&nbsp;clearEvent,
+         OsEvent...&nbsp;osEvents)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#eventMask(org.eclipse.app4mc.amalthea.model.SetEvent,org.eclipse.app4mc.amalthea.model.OsEvent...)">eventMask</a></span>&#8203;(SetEvent&nbsp;setEvent,
+         OsEvent...&nbsp;osEvents)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#eventMask(org.eclipse.app4mc.amalthea.model.WaitEvent,org.eclipse.app4mc.amalthea.model.OsEvent...)">eventMask</a></span>&#8203;(WaitEvent&nbsp;waitEvent,
+         OsEvent...&nbsp;osEvents)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <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.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">labelAccess</a></span>(ICallGraphItemContainer&nbsp;container,
-           Procedures.Procedure1&lt;LabelAccess&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#execNeed(org.eclipse.app4mc.amalthea.model.IActivityGraphItemContainer,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">execNeed</a></span>&#8203;(IActivityGraphItemContainer&nbsp;container,
+        Procedures.Procedure1&lt;ExecutionNeed&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><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>&#8203;(Ticks&nbsp;container,
+        ProcessingUnitDefinition&nbsp;puDef,
+        IDiscreteValueDeviation&nbsp;ticks)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#group(org.eclipse.app4mc.amalthea.model.IActivityGraphItemContainer,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">group</a></span>&#8203;(IActivityGraphItemContainer&nbsp;container,
+     Procedures.Procedure1&lt;Group&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#interProcessTrigger(org.eclipse.app4mc.amalthea.model.IActivityGraphItemContainer,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">interProcessTrigger</a></span>&#8203;(IActivityGraphItemContainer&nbsp;container,
+                   Procedures.Procedure1&lt;InterProcessTrigger&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#isr(org.eclipse.app4mc.amalthea.model.SWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">isr</a></span>&#8203;(SWModel&nbsp;container,
+   Procedures.Procedure1&lt;ISR&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i31" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#label(org.eclipse.app4mc.amalthea.model.SWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">label</a></span>&#8203;(SWModel&nbsp;container,
+     Procedures.Procedure1&lt;Label&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#labelAccess(org.eclipse.app4mc.amalthea.model.IActivityGraphItemContainer,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">labelAccess</a></span>&#8203;(IActivityGraphItemContainer&nbsp;container,
+           Procedures.Procedure1&lt;LabelAccess&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#literal(org.eclipse.app4mc.amalthea.model.EnumMode,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">literal</a></span>&#8203;(EnumMode&nbsp;container,
+       Procedures.Procedure1&lt;ModeLiteral&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><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>&#8203;(SWModel&nbsp;container,
+         Procedures.Procedure1&lt;EnumMode&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&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>
+<th class="colSecond" scope="row"><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>&#8203;(SWModel&nbsp;container,
+            Procedures.Procedure1&lt;NumericMode&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <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.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">probabilitySwitch</a></span>(ICallGraphItemContainer&nbsp;container,
-                 Procedures.Procedure1&lt;ProbabilitySwitch&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#modeLabel(org.eclipse.app4mc.amalthea.model.SWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">modeLabel</a></span>&#8203;(SWModel&nbsp;container,
+         Procedures.Procedure1&lt;ModeLabel&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#modeLabelAccess(org.eclipse.app4mc.amalthea.model.IActivityGraphItemContainer,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">modeLabelAccess</a></span>&#8203;(IActivityGraphItemContainer&nbsp;container,
+               Procedures.Procedure1&lt;ModeLabelAccess&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#modeSwitch(org.eclipse.app4mc.amalthea.model.IActivityGraphItemContainer,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">modeSwitch</a></span>&#8203;(IActivityGraphItemContainer&nbsp;container,
+          Procedures.Procedure1&lt;ModeSwitch&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <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.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">runnableCall</a></span>(ICallGraphItemContainer&nbsp;container,
-            Procedures.Procedure1&lt;RunnableCall&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><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>&#8203;(ExecutionNeed&nbsp;container,
+    String&nbsp;key,
+    IDiscreteValueDeviation&nbsp;need)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i40" class="altColor">
 <td class="colFirst"><code>void</code></td>
-<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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#osEvent(org.eclipse.app4mc.amalthea.model.SWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">osEvent</a></span>&#8203;(SWModel&nbsp;container,
+       Procedures.Procedure1&lt;OsEvent&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#parameter(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">parameter</a></span>&#8203;(Runnable&nbsp;container,
+         Procedures.Procedure1&lt;RunnableParameter&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <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.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">setEvent</a></span>(ICallGraphItemContainer&nbsp;container,
-        Procedures.Procedure1&lt;SetEvent&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#probabilitySwitch(org.eclipse.app4mc.amalthea.model.IActivityGraphItemContainer,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">probabilitySwitch</a></span>&#8203;(IActivityGraphItemContainer&nbsp;container,
+                 Procedures.Procedure1&lt;ProbabilitySwitch&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <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>
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#processPrototype(org.eclipse.app4mc.amalthea.model.SWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">processPrototype</a></span>&#8203;(SWModel&nbsp;container,
+                Procedures.Procedure1&lt;ProcessPrototype&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#runnable(org.eclipse.app4mc.amalthea.model.SWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">runnable</a></span>&#8203;(SWModel&nbsp;container,
+        Procedures.Procedure1&lt;Runnable&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <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.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">terminateProcess</a></span>(ICallGraphItemContainer&nbsp;container,
-                Procedures.Procedure1&lt;TerminateProcess&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#runnableCall(org.eclipse.app4mc.amalthea.model.IActivityGraphItemContainer,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">runnableCall</a></span>&#8203;(IActivityGraphItemContainer&nbsp;container,
+            Procedures.Procedure1&lt;RunnableCall&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <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.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">ticks</a></span>(ICallGraphItemContainer&nbsp;container,
-     Procedures.Procedure1&lt;Ticks&gt;&nbsp;initializer)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#schedulePoint(org.eclipse.app4mc.amalthea.model.IActivityGraphItemContainer,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">schedulePoint</a></span>&#8203;(IActivityGraphItemContainer&nbsp;container,
+             Procedures.Procedure1&lt;SchedulePoint&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i47" class="rowColor">
 <td class="colFirst"><code>void</code></td>
-<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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#section(org.eclipse.app4mc.amalthea.model.SWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">section</a></span>&#8203;(SWModel&nbsp;container,
+       Procedures.Procedure1&lt;Section&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr id="i48" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setEvent(org.eclipse.app4mc.amalthea.model.IActivityGraphItemContainer,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">setEvent</a></span>&#8203;(IActivityGraphItemContainer&nbsp;container,
+        Procedures.Procedure1&lt;SetEvent&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr id="i49" class="rowColor">
+<td class="colFirst"><code>SWModel</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#softwareModelRoot(org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">softwareModelRoot</a></span>&#8203;(Procedures.Procedure1&lt;SWModel&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr id="i50" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#task(org.eclipse.app4mc.amalthea.model.SWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">task</a></span>&#8203;(SWModel&nbsp;container,
+    Procedures.Procedure1&lt;Task&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr id="i51" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#terminateProcess(org.eclipse.app4mc.amalthea.model.IActivityGraphItemContainer,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">terminateProcess</a></span>&#8203;(IActivityGraphItemContainer&nbsp;container,
+                Procedures.Procedure1&lt;TerminateProcess&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr id="i52" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#ticks(org.eclipse.app4mc.amalthea.model.IActivityGraphItemContainer,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">ticks</a></span>&#8203;(IActivityGraphItemContainer&nbsp;container,
+     Procedures.Procedure1&lt;Ticks&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr id="i53" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#waitEvent(org.eclipse.app4mc.amalthea.model.IActivityGraphItemContainer,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">waitEvent</a></span>&#8203;(IActivityGraphItemContainer&nbsp;container,
+         Procedures.Procedure1&lt;WaitEvent&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.Object">
+<li class="blockList"><a id="methods.inherited.from.class.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;Object</h3>
@@ -315,6 +414,7 @@
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
@@ -322,12 +422,13 @@
 <ul class="blockList">
 <li class="blockList">
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
+<li class="blockList"><a id="constructor.detail">
 <!--   -->
 </a>
 <h3>Constructor Detail</h3>
-<a name="SoftwareBuilder--">
+<a id="&lt;init&gt;()">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -338,499 +439,571 @@
 </ul>
 </li>
 </ul>
+</section>
 <!-- ============ METHOD DETAIL ========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a id="method.detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="softwareModelRoot-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="softwareModelRoot(org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>softwareModelRoot</h4>
-<pre>public&nbsp;SWModel&nbsp;softwareModelRoot(Procedures.Procedure1&lt;SWModel&gt;&nbsp;initializer)</pre>
+<pre class="methodSignature">public&nbsp;SWModel&nbsp;softwareModelRoot&#8203;(Procedures.Procedure1&lt;SWModel&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="isr-org.eclipse.app4mc.amalthea.model.SWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="isr(org.eclipse.app4mc.amalthea.model.SWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>isr</h4>
-<pre>public&nbsp;void&nbsp;isr(SWModel&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;isr&#8203;(SWModel&nbsp;container,
                 Procedures.Procedure1&lt;ISR&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="task-org.eclipse.app4mc.amalthea.model.SWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="task(org.eclipse.app4mc.amalthea.model.SWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>task</h4>
-<pre>public&nbsp;void&nbsp;task(SWModel&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;task&#8203;(SWModel&nbsp;container,
                  Procedures.Procedure1&lt;Task&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="runnable-org.eclipse.app4mc.amalthea.model.SWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="runnable(org.eclipse.app4mc.amalthea.model.SWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>runnable</h4>
-<pre>public&nbsp;void&nbsp;runnable(SWModel&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;runnable&#8203;(SWModel&nbsp;container,
                      Procedures.Procedure1&lt;Runnable&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="label-org.eclipse.app4mc.amalthea.model.SWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="label(org.eclipse.app4mc.amalthea.model.SWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>label</h4>
-<pre>public&nbsp;void&nbsp;label(SWModel&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;label&#8203;(SWModel&nbsp;container,
                   Procedures.Procedure1&lt;Label&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="channel-org.eclipse.app4mc.amalthea.model.SWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="channel(org.eclipse.app4mc.amalthea.model.SWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>channel</h4>
-<pre>public&nbsp;void&nbsp;channel(SWModel&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;channel&#8203;(SWModel&nbsp;container,
                     Procedures.Procedure1&lt;Channel&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="processPrototype-org.eclipse.app4mc.amalthea.model.SWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="processPrototype(org.eclipse.app4mc.amalthea.model.SWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>processPrototype</h4>
-<pre>public&nbsp;void&nbsp;processPrototype(SWModel&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;processPrototype&#8203;(SWModel&nbsp;container,
                              Procedures.Procedure1&lt;ProcessPrototype&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="section-org.eclipse.app4mc.amalthea.model.SWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="section(org.eclipse.app4mc.amalthea.model.SWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>section</h4>
-<pre>public&nbsp;void&nbsp;section(SWModel&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;section&#8203;(SWModel&nbsp;container,
                     Procedures.Procedure1&lt;Section&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="activation_Single-org.eclipse.app4mc.amalthea.model.SWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="activation_Single(org.eclipse.app4mc.amalthea.model.SWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>activation_Single</h4>
-<pre>public&nbsp;void&nbsp;activation_Single(SWModel&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;activation_Single&#8203;(SWModel&nbsp;container,
                               Procedures.Procedure1&lt;SingleActivation&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="activation_Sporadic-org.eclipse.app4mc.amalthea.model.SWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="activation_Sporadic(org.eclipse.app4mc.amalthea.model.SWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>activation_Sporadic</h4>
-<pre>public&nbsp;void&nbsp;activation_Sporadic(SWModel&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;activation_Sporadic&#8203;(SWModel&nbsp;container,
                                 Procedures.Procedure1&lt;SporadicActivation&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="activation_Periodic-org.eclipse.app4mc.amalthea.model.SWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="activation_Periodic(org.eclipse.app4mc.amalthea.model.SWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>activation_Periodic</h4>
-<pre>public&nbsp;void&nbsp;activation_Periodic(SWModel&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;activation_Periodic&#8203;(SWModel&nbsp;container,
                                 Procedures.Procedure1&lt;PeriodicActivation&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="activation_Event-org.eclipse.app4mc.amalthea.model.SWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="activation_Event(org.eclipse.app4mc.amalthea.model.SWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>activation_Event</h4>
-<pre>public&nbsp;void&nbsp;activation_Event(SWModel&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;activation_Event&#8203;(SWModel&nbsp;container,
                              Procedures.Procedure1&lt;EventActivation&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="activation_VariableRate-org.eclipse.app4mc.amalthea.model.SWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="activation_VariableRate(org.eclipse.app4mc.amalthea.model.SWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>activation_VariableRate</h4>
-<pre>public&nbsp;void&nbsp;activation_VariableRate(SWModel&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;activation_VariableRate&#8203;(SWModel&nbsp;container,
                                     Procedures.Procedure1&lt;VariableRateActivation&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="activation_Custom-org.eclipse.app4mc.amalthea.model.SWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="activation_Custom(org.eclipse.app4mc.amalthea.model.SWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>activation_Custom</h4>
-<pre>public&nbsp;void&nbsp;activation_Custom(SWModel&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;activation_Custom&#8203;(SWModel&nbsp;container,
                               Procedures.Procedure1&lt;CustomActivation&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="mode_Enum-org.eclipse.app4mc.amalthea.model.SWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="mode_Enum(org.eclipse.app4mc.amalthea.model.SWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>mode_Enum</h4>
-<pre>public&nbsp;void&nbsp;mode_Enum(SWModel&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;mode_Enum&#8203;(SWModel&nbsp;container,
                       Procedures.Procedure1&lt;EnumMode&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="mode_Numeric-org.eclipse.app4mc.amalthea.model.SWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="mode_Numeric(org.eclipse.app4mc.amalthea.model.SWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>mode_Numeric</h4>
-<pre>public&nbsp;void&nbsp;mode_Numeric(SWModel&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;mode_Numeric&#8203;(SWModel&nbsp;container,
                          Procedures.Procedure1&lt;NumericMode&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="modeLabel-org.eclipse.app4mc.amalthea.model.SWModel-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="modeLabel(org.eclipse.app4mc.amalthea.model.SWModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>modeLabel</h4>
-<pre>public&nbsp;void&nbsp;modeLabel(SWModel&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;modeLabel&#8203;(SWModel&nbsp;container,
                       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 id="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,
+<pre class="methodSignature">public&nbsp;void&nbsp;osEvent&#8203;(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 id="literal(org.eclipse.app4mc.amalthea.model.EnumMode,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>literal</h4>
-<pre>public&nbsp;void&nbsp;literal(EnumMode&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;literal&#8203;(EnumMode&nbsp;container,
                     Procedures.Procedure1&lt;ModeLiteral&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="callGraph-org.eclipse.app4mc.amalthea.model.Task-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="activityGraph(org.eclipse.app4mc.amalthea.model.Task,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>callGraph</h4>
-<pre>public&nbsp;void&nbsp;callGraph(Task&nbsp;container,
-                      Procedures.Procedure1&lt;CallGraph&gt;&nbsp;initializer)</pre>
+<h4>activityGraph</h4>
+<pre class="methodSignature">public&nbsp;void&nbsp;activityGraph&#8203;(Task&nbsp;container,
+                          Procedures.Procedure1&lt;ActivityGraph&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="callGraph-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="activityGraph(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>callGraph</h4>
-<pre>public&nbsp;void&nbsp;callGraph(Runnable&nbsp;container,
-                      Procedures.Procedure1&lt;CallGraph&gt;&nbsp;initializer)</pre>
+<h4>activityGraph</h4>
+<pre class="methodSignature">public&nbsp;void&nbsp;activityGraph&#8203;(Runnable&nbsp;container,
+                          Procedures.Procedure1&lt;ActivityGraph&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="modeSwitch-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="modeSwitch(org.eclipse.app4mc.amalthea.model.IActivityGraphItemContainer,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>modeSwitch</h4>
-<pre>public&nbsp;void&nbsp;modeSwitch(ICallGraphItemContainer&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;modeSwitch&#8203;(IActivityGraphItemContainer&nbsp;container,
                        Procedures.Procedure1&lt;ModeSwitch&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="entry-org.eclipse.app4mc.amalthea.model.ModeSwitch-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
-<!--   -->
-</a>
-<ul class="blockList">
-<li class="blockList">
-<h4>entry</h4>
-<pre>public&nbsp;void&nbsp;entry(ModeSwitch&nbsp;container,
-                  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-">
+<a id="defaultEntry(org.eclipse.app4mc.amalthea.model.ModeSwitch,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>defaultEntry</h4>
-<pre>public&nbsp;void&nbsp;defaultEntry(ModeSwitch&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;defaultEntry&#8203;(ModeSwitch&nbsp;container,
                          Procedures.Procedure1&lt;ModeSwitchDefault&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<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(ICallGraphItemContainer&nbsp;container,
-                              Procedures.Procedure1&lt;ProbabilitySwitch&gt;&nbsp;initializer)</pre>
-</li>
-</ul>
-<a name="entry-org.eclipse.app4mc.amalthea.model.ProbabilitySwitch-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="entry(org.eclipse.app4mc.amalthea.model.ModeSwitch,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>entry</h4>
-<pre>public&nbsp;void&nbsp;entry(ProbabilitySwitch&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;entry&#8203;(ModeSwitch&nbsp;container,
+                  Procedures.Procedure1&lt;ModeSwitchEntry&gt;&nbsp;initializer)</pre>
+</li>
+</ul>
+<a id="condition_OR(org.eclipse.app4mc.amalthea.model.ModeSwitchEntry,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>condition_OR</h4>
+<pre class="methodSignature">public&nbsp;void&nbsp;condition_OR&#8203;(ModeSwitchEntry&nbsp;container,
+                         Procedures.Procedure1&lt;ModeConditionDisjunction&gt;&nbsp;initializer)</pre>
+</li>
+</ul>
+<a id="condition(org.eclipse.app4mc.amalthea.model.ModeConditionDisjunction,org.eclipse.app4mc.amalthea.model.ModeLabel,org.eclipse.app4mc.amalthea.model.RelationalOperator,java.lang.String)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>condition</h4>
+<pre class="methodSignature">public&nbsp;void&nbsp;condition&#8203;(ModeConditionDisjunction&nbsp;container,
+                      ModeLabel&nbsp;label,
+                      RelationalOperator&nbsp;relation,
+                      String&nbsp;value)</pre>
+</li>
+</ul>
+<a id="condition(org.eclipse.app4mc.amalthea.model.ModeConditionDisjunction,org.eclipse.app4mc.amalthea.model.ModeLabel,org.eclipse.app4mc.amalthea.model.RelationalOperator,org.eclipse.app4mc.amalthea.model.ModeLabel)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>condition</h4>
+<pre class="methodSignature">public&nbsp;void&nbsp;condition&#8203;(ModeConditionDisjunction&nbsp;container,
+                      ModeLabel&nbsp;label1,
+                      RelationalOperator&nbsp;relation,
+                      ModeLabel&nbsp;label2)</pre>
+</li>
+</ul>
+<a id="condition_AND(org.eclipse.app4mc.amalthea.model.ModeConditionDisjunction,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>condition_AND</h4>
+<pre class="methodSignature">public&nbsp;void&nbsp;condition_AND&#8203;(ModeConditionDisjunction&nbsp;container,
+                          Procedures.Procedure1&lt;ModeConditionConjunction&gt;&nbsp;initializer)</pre>
+</li>
+</ul>
+<a id="condition(org.eclipse.app4mc.amalthea.model.ModeConditionConjunction,org.eclipse.app4mc.amalthea.model.ModeLabel,org.eclipse.app4mc.amalthea.model.RelationalOperator,java.lang.String)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>condition</h4>
+<pre class="methodSignature">public&nbsp;void&nbsp;condition&#8203;(ModeConditionConjunction&nbsp;container,
+                      ModeLabel&nbsp;label,
+                      RelationalOperator&nbsp;relation,
+                      String&nbsp;value)</pre>
+</li>
+</ul>
+<a id="condition(org.eclipse.app4mc.amalthea.model.ModeConditionConjunction,org.eclipse.app4mc.amalthea.model.ModeLabel,org.eclipse.app4mc.amalthea.model.RelationalOperator,org.eclipse.app4mc.amalthea.model.ModeLabel)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>condition</h4>
+<pre class="methodSignature">public&nbsp;void&nbsp;condition&#8203;(ModeConditionConjunction&nbsp;container,
+                      ModeLabel&nbsp;label1,
+                      RelationalOperator&nbsp;relation,
+                      ModeLabel&nbsp;label2)</pre>
+</li>
+</ul>
+<a id="probabilitySwitch(org.eclipse.app4mc.amalthea.model.IActivityGraphItemContainer,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>probabilitySwitch</h4>
+<pre class="methodSignature">public&nbsp;void&nbsp;probabilitySwitch&#8203;(IActivityGraphItemContainer&nbsp;container,
+                              Procedures.Procedure1&lt;ProbabilitySwitch&gt;&nbsp;initializer)</pre>
+</li>
+</ul>
+<a id="entry(org.eclipse.app4mc.amalthea.model.ProbabilitySwitch,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>entry</h4>
+<pre class="methodSignature">public&nbsp;void&nbsp;entry&#8203;(ProbabilitySwitch&nbsp;container,
                   Procedures.Procedure1&lt;ProbabilitySwitchEntry&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="schedulePoint-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="schedulePoint(org.eclipse.app4mc.amalthea.model.IActivityGraphItemContainer,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>schedulePoint</h4>
-<pre>public&nbsp;void&nbsp;schedulePoint(ICallGraphItemContainer&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;schedulePoint&#8203;(IActivityGraphItemContainer&nbsp;container,
                           Procedures.Procedure1&lt;SchedulePoint&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="interProcessTrigger-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="interProcessTrigger(org.eclipse.app4mc.amalthea.model.IActivityGraphItemContainer,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>interProcessTrigger</h4>
-<pre>public&nbsp;void&nbsp;interProcessTrigger(ICallGraphItemContainer&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;interProcessTrigger&#8203;(IActivityGraphItemContainer&nbsp;container,
                                 Procedures.Procedure1&lt;InterProcessTrigger&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="enforcedMigration-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="enforcedMigration(org.eclipse.app4mc.amalthea.model.IActivityGraphItemContainer,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>enforcedMigration</h4>
-<pre>public&nbsp;void&nbsp;enforcedMigration(ICallGraphItemContainer&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;enforcedMigration&#8203;(IActivityGraphItemContainer&nbsp;container,
                               Procedures.Procedure1&lt;EnforcedMigration&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="terminateProcess-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="terminateProcess(org.eclipse.app4mc.amalthea.model.IActivityGraphItemContainer,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>terminateProcess</h4>
-<pre>public&nbsp;void&nbsp;terminateProcess(ICallGraphItemContainer&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;terminateProcess&#8203;(IActivityGraphItemContainer&nbsp;container,
                              Procedures.Procedure1&lt;TerminateProcess&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="clearEvent-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="clearEvent(org.eclipse.app4mc.amalthea.model.IActivityGraphItemContainer,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>clearEvent</h4>
-<pre>public&nbsp;void&nbsp;clearEvent(ICallGraphItemContainer&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;clearEvent&#8203;(IActivityGraphItemContainer&nbsp;container,
                        Procedures.Procedure1&lt;ClearEvent&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="waitEvent-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="waitEvent(org.eclipse.app4mc.amalthea.model.IActivityGraphItemContainer,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>waitEvent</h4>
-<pre>public&nbsp;void&nbsp;waitEvent(ICallGraphItemContainer&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;waitEvent&#8203;(IActivityGraphItemContainer&nbsp;container,
                       Procedures.Procedure1&lt;WaitEvent&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="setEvent-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="setEvent(org.eclipse.app4mc.amalthea.model.IActivityGraphItemContainer,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>setEvent</h4>
-<pre>public&nbsp;void&nbsp;setEvent(ICallGraphItemContainer&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;setEvent&#8203;(IActivityGraphItemContainer&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 id="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,
+<pre class="methodSignature">public&nbsp;void&nbsp;eventMask&#8203;(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 id="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,
+<pre class="methodSignature">public&nbsp;void&nbsp;eventMask&#8203;(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 id="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,
+<pre class="methodSignature">public&nbsp;void&nbsp;eventMask&#8203;(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 id="parameter(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>parameter</h4>
-<pre>public&nbsp;void&nbsp;parameter(Runnable&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;parameter&#8203;(Runnable&nbsp;container,
                       Procedures.Procedure1&lt;RunnableParameter&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="group-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="group(org.eclipse.app4mc.amalthea.model.IActivityGraphItemContainer,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>group</h4>
-<pre>public&nbsp;void&nbsp;group(ICallGraphItemContainer&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;group&#8203;(IActivityGraphItemContainer&nbsp;container,
                   Procedures.Procedure1&lt;Group&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="labelAccess-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="labelAccess(org.eclipse.app4mc.amalthea.model.IActivityGraphItemContainer,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>labelAccess</h4>
-<pre>public&nbsp;void&nbsp;labelAccess(ICallGraphItemContainer&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;labelAccess&#8203;(IActivityGraphItemContainer&nbsp;container,
                         Procedures.Procedure1&lt;LabelAccess&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="modeLabelAccess-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="modeLabelAccess(org.eclipse.app4mc.amalthea.model.IActivityGraphItemContainer,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>modeLabelAccess</h4>
-<pre>public&nbsp;void&nbsp;modeLabelAccess(ICallGraphItemContainer&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;modeLabelAccess&#8203;(IActivityGraphItemContainer&nbsp;container,
                             Procedures.Procedure1&lt;ModeLabelAccess&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="runnableCall-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="runnableCall(org.eclipse.app4mc.amalthea.model.IActivityGraphItemContainer,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>runnableCall</h4>
-<pre>public&nbsp;void&nbsp;runnableCall(ICallGraphItemContainer&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;runnableCall&#8203;(IActivityGraphItemContainer&nbsp;container,
                          Procedures.Procedure1&lt;RunnableCall&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="asynchronousServerCall-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="asynchronousServerCall(org.eclipse.app4mc.amalthea.model.IActivityGraphItemContainer,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>asynchronousServerCall</h4>
-<pre>public&nbsp;void&nbsp;asynchronousServerCall(ICallGraphItemContainer&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;asynchronousServerCall&#8203;(IActivityGraphItemContainer&nbsp;container,
                                    Procedures.Procedure1&lt;AsynchronousServerCall&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="execNeed-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="execNeed(org.eclipse.app4mc.amalthea.model.IActivityGraphItemContainer,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>execNeed</h4>
-<pre>public&nbsp;void&nbsp;execNeed(ICallGraphItemContainer&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;execNeed&#8203;(IActivityGraphItemContainer&nbsp;container,
                      Procedures.Procedure1&lt;ExecutionNeed&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="need-org.eclipse.app4mc.amalthea.model.ExecutionNeed-java.lang.String-org.eclipse.app4mc.amalthea.model.IDiscreteValueDeviation-">
+<a id="need(org.eclipse.app4mc.amalthea.model.ExecutionNeed,java.lang.String,org.eclipse.app4mc.amalthea.model.IDiscreteValueDeviation)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>need</h4>
-<pre>public&nbsp;void&nbsp;need(ExecutionNeed&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;need&#8203;(ExecutionNeed&nbsp;container,
                  String&nbsp;key,
                  IDiscreteValueDeviation&nbsp;need)</pre>
 </li>
 </ul>
-<a name="ticks-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.xtext.xbase.lib.Procedures.Procedure1-">
+<a id="ticks(org.eclipse.app4mc.amalthea.model.IActivityGraphItemContainer,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>ticks</h4>
-<pre>public&nbsp;void&nbsp;ticks(ICallGraphItemContainer&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;ticks&#8203;(IActivityGraphItemContainer&nbsp;container,
                   Procedures.Procedure1&lt;Ticks&gt;&nbsp;initializer)</pre>
 </li>
 </ul>
-<a name="defaultDeviation-org.eclipse.app4mc.amalthea.model.Ticks-org.eclipse.app4mc.amalthea.model.IDiscreteValueDeviation-">
+<a id="defaultDeviation(org.eclipse.app4mc.amalthea.model.Ticks,org.eclipse.app4mc.amalthea.model.IDiscreteValueDeviation)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>defaultDeviation</h4>
-<pre>public&nbsp;void&nbsp;defaultDeviation(Ticks&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;defaultDeviation&#8203;(Ticks&nbsp;container,
                              IDiscreteValueDeviation&nbsp;ticks)</pre>
 </li>
 </ul>
-<a name="defaultConstant-org.eclipse.app4mc.amalthea.model.Ticks-long-">
+<a id="defaultConstant(org.eclipse.app4mc.amalthea.model.Ticks,long)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>defaultConstant</h4>
-<pre>public&nbsp;void&nbsp;defaultConstant(Ticks&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;defaultConstant&#8203;(Ticks&nbsp;container,
                             long&nbsp;ticks)</pre>
 </li>
 </ul>
-<a name="extended-org.eclipse.app4mc.amalthea.model.Ticks-org.eclipse.app4mc.amalthea.model.ProcessingUnitDefinition-org.eclipse.app4mc.amalthea.model.IDiscreteValueDeviation-">
+<a id="extended(org.eclipse.app4mc.amalthea.model.Ticks,org.eclipse.app4mc.amalthea.model.ProcessingUnitDefinition,org.eclipse.app4mc.amalthea.model.IDiscreteValueDeviation)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>extended</h4>
-<pre>public&nbsp;void&nbsp;extended(Ticks&nbsp;container,
+<pre class="methodSignature">public&nbsp;void&nbsp;extended&#8203;(Ticks&nbsp;container,
                      ProcessingUnitDefinition&nbsp;puDef,
                      IDiscreteValueDeviation&nbsp;ticks)</pre>
 </li>
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
 </div>
+</main>
 <!-- ========= END OF CLASS DATA ========= -->
 </body>
 </html>
diff --git a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/builder/StimuliBuilder.html b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/builder/StimuliBuilder.html
new file mode 100644
index 0000000..dfb64e0
--- /dev/null
+++ b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/builder/StimuliBuilder.html
@@ -0,0 +1,176 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="de">
+<head>
+<!-- Generated by javadoc (11.0.8) on Mon Nov 30 13:15:36 CET 2020 -->
+<title>StimuliBuilder</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-11-30">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+
+</head>
+<body>
+<!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
+<div class="header">
+<div class="subTitle"><span class="packageLabelInType">Package</span>&nbsp;<a href="package-summary.html">org.eclipse.app4mc.amalthea.model.builder</a></div>
+<h2 title="Class StimuliBuilder" class="title">Class StimuliBuilder</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>Object</li>
+<li>
+<ul class="inheritance">
+<li>StimuliBuilder</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<pre>public class <span class="typeNameLabel">StimuliBuilder</span>
+extends Object</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E()">StimuliBuilder</a></span>()</code></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#clockStepList(org.eclipse.app4mc.amalthea.model.StimuliModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">clockStepList</a></span>&#8203;(StimuliModel&nbsp;container,
+             Procedures.Procedure1&lt;ClockStepList&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#periodicStimulus(org.eclipse.app4mc.amalthea.model.StimuliModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">periodicStimulus</a></span>&#8203;(StimuliModel&nbsp;container,
+                Procedures.Procedure1&lt;PeriodicStimulus&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#variableRateStimulus(org.eclipse.app4mc.amalthea.model.StimuliModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">variableRateStimulus</a></span>&#8203;(StimuliModel&nbsp;container,
+                    Procedures.Procedure1&lt;VariableRateStimulus&gt;&nbsp;initializer)</code></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a id="methods.inherited.from.class.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a id="&lt;init&gt;()">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>StimuliBuilder</h4>
+<pre>public&nbsp;StimuliBuilder()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ============ METHOD DETAIL ========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a id="periodicStimulus(org.eclipse.app4mc.amalthea.model.StimuliModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>periodicStimulus</h4>
+<pre class="methodSignature">public&nbsp;void&nbsp;periodicStimulus&#8203;(StimuliModel&nbsp;container,
+                             Procedures.Procedure1&lt;PeriodicStimulus&gt;&nbsp;initializer)</pre>
+</li>
+</ul>
+<a id="variableRateStimulus(org.eclipse.app4mc.amalthea.model.StimuliModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>variableRateStimulus</h4>
+<pre class="methodSignature">public&nbsp;void&nbsp;variableRateStimulus&#8203;(StimuliModel&nbsp;container,
+                                 Procedures.Procedure1&lt;VariableRateStimulus&gt;&nbsp;initializer)</pre>
+</li>
+</ul>
+<a id="clockStepList(org.eclipse.app4mc.amalthea.model.StimuliModel,org.eclipse.xtext.xbase.lib.Procedures.Procedure1)">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>clockStepList</h4>
+<pre class="methodSignature">public&nbsp;void&nbsp;clockStepList&#8203;(StimuliModel&nbsp;container,
+                          Procedures.Procedure1&lt;ClockStepList&gt;&nbsp;initializer)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+</div>
+</main>
+<!-- ========= END OF CLASS DATA ========= -->
+</body>
+</html>
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 23ea62f..820ba32 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
@@ -1,10 +1,11 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML>
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
+<!-- Generated by javadoc (11.0.8) on Mon Nov 30 13:15:36 CET 2020 -->
 <title>org.eclipse.app4mc.amalthea.model.builder</title>
-<meta name="date" content="2019-07-31">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-11-30">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
@@ -14,7 +15,7 @@
 <div class="contentContainer">
 <ul class="blockList">
 <li class="blockList">
-<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
+<table class="typeSummary">
 <caption><span>Class Summary</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Class</th>
@@ -22,41 +23,45 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><a href="AmaltheaBuilder.html" title="class in org.eclipse.app4mc.amalthea.model.builder">AmaltheaBuilder</a></td>
+<th class="colFirst" scope="row"><a href="AmaltheaBuilder.html" title="class in org.eclipse.app4mc.amalthea.model.builder">AmaltheaBuilder</a></th>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a href="CommonElementsBuilder.html" title="class in org.eclipse.app4mc.amalthea.model.builder">CommonElementsBuilder</a></td>
+<th class="colFirst" scope="row"><a href="CommonElementsBuilder.html" title="class in org.eclipse.app4mc.amalthea.model.builder">CommonElementsBuilder</a></th>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a href="ConstraintsBuilder.html" title="class in org.eclipse.app4mc.amalthea.model.builder">ConstraintsBuilder</a></td>
+<th class="colFirst" scope="row"><a href="ConstraintsBuilder.html" title="class in org.eclipse.app4mc.amalthea.model.builder">ConstraintsBuilder</a></th>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a href="DatatypeBuilder.html" title="class in org.eclipse.app4mc.amalthea.model.builder">DatatypeBuilder</a></td>
+<th class="colFirst" scope="row"><a href="DatatypeBuilder.html" title="class in org.eclipse.app4mc.amalthea.model.builder">DatatypeBuilder</a></th>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a href="HardwareBuilder.html" title="class in org.eclipse.app4mc.amalthea.model.builder">HardwareBuilder</a></td>
+<th class="colFirst" scope="row"><a href="HardwareBuilder.html" title="class in org.eclipse.app4mc.amalthea.model.builder">HardwareBuilder</a></th>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a href="InstructionsBuilder.html" title="class in org.eclipse.app4mc.amalthea.model.builder">InstructionsBuilder</a></td>
-<td class="colLast">Deprecated
-<div class="block"><span class="deprecationComment">(0.9.3) use <code>Ticks</code> instead.</span></div>
+<th class="colFirst" scope="row"><a href="InstructionsBuilder.html" title="class in org.eclipse.app4mc.amalthea.model.builder">InstructionsBuilder</a></th>
+<td class="colLast">Deprecated.
+<div class="deprecationComment">(0.9.3) use <code>Ticks</code> instead.</div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a href="MappingBuilder.html" title="class in org.eclipse.app4mc.amalthea.model.builder">MappingBuilder</a></td>
+<th class="colFirst" scope="row"><a href="MappingBuilder.html" title="class in org.eclipse.app4mc.amalthea.model.builder">MappingBuilder</a></th>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a href="OperatingSystemBuilder.html" title="class in org.eclipse.app4mc.amalthea.model.builder">OperatingSystemBuilder</a></td>
+<th class="colFirst" scope="row"><a href="OperatingSystemBuilder.html" title="class in org.eclipse.app4mc.amalthea.model.builder">OperatingSystemBuilder</a></th>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a href="SoftwareBuilder.html" title="class in org.eclipse.app4mc.amalthea.model.builder">SoftwareBuilder</a></td>
+<th class="colFirst" scope="row"><a href="SoftwareBuilder.html" title="class in org.eclipse.app4mc.amalthea.model.builder">SoftwareBuilder</a></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<th class="colFirst" scope="row"><a href="StimuliBuilder.html" title="class in org.eclipse.app4mc.amalthea.model.builder">StimuliBuilder</a></th>
 <td class="colLast">&nbsp;</td>
 </tr>
 </tbody>
@@ -64,5 +69,6 @@
 </li>
 </ul>
 </div>
+</main>
 </body>
 </html>
diff --git a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/io/AmaltheaFileHelper.html b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/io/AmaltheaFileHelper.html
new file mode 100644
index 0000000..b9b2a16
--- /dev/null
+++ b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/io/AmaltheaFileHelper.html
@@ -0,0 +1,230 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="de">
+<head>
+<!-- Generated by javadoc (11.0.8) on Mon Nov 30 13:15:36 CET 2020 -->
+<title>AmaltheaFileHelper</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-11-30">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
+<div class="header">
+<div class="subTitle"><span class="packageLabelInType">Package</span>&nbsp;<a href="package-summary.html">org.eclipse.app4mc.amalthea.model.io</a></div>
+<h2 title="Class AmaltheaFileHelper" class="title">Class AmaltheaFileHelper</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>Object</li>
+<li>
+<ul class="inheritance">
+<li>AmaltheaFileHelper</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<pre>public final class <span class="typeNameLabel">AmaltheaFileHelper</span>
+extends Object</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Field</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static String</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#INVALID">INVALID</a></span></code></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>static String</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getNamespaceFromFile(java.nio.file.Path)">getNamespaceFromFile</a></span>&#8203;(Path&nbsp;inputPath)</code></th>
+<td class="colLast">
+<div class="block">Extract the model namespace of the given input file.</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>static String</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getNamespaceFromModel(java.io.File)">getNamespaceFromModel</a></span>&#8203;(File&nbsp;inputFile)</code></th>
+<td class="colLast">
+<div class="block">Extract the model namespace of the given input file.</div>
+</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>static String</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getNamespaceFromZip(java.nio.file.Path)">getNamespaceFromZip</a></span>&#8203;(Path&nbsp;inputPath)</code></th>
+<td class="colLast">
+<div class="block">Extract the model namespace of the given input file.</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>static boolean</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#isZipFile(java.io.File)">isZipFile</a></span>&#8203;(File&nbsp;file)</code></th>
+<td class="colLast">
+<div class="block">Check if the given file is a zip archive.</div>
+</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a id="methods.inherited.from.class.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a id="INVALID">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>INVALID</h4>
+<pre>public static final&nbsp;String INVALID</pre>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../../../constant-values.html#org.eclipse.app4mc.amalthea.model.io.AmaltheaFileHelper.INVALID">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ============ METHOD DETAIL ========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a id="isZipFile(java.io.File)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>isZipFile</h4>
+<pre class="methodSignature">public static&nbsp;boolean&nbsp;isZipFile&#8203;(File&nbsp;file)</pre>
+<div class="block">Check if the given file is a zip archive.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>file</code> - The <code>File</code> to check.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd><code>true</code> if the given file is a zip archive,
+         <code>false</code> if not.</dd>
+</dl>
+</li>
+</ul>
+<a id="getNamespaceFromModel(java.io.File)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getNamespaceFromModel</h4>
+<pre class="methodSignature">public static&nbsp;String&nbsp;getNamespaceFromModel&#8203;(File&nbsp;inputFile)</pre>
+<div class="block">Extract the model namespace of the given input file.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>inputFile</code> - The file for which the model namespace is
+                       requested.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The model namespace of the given input file or <i>invalid</i> if
+         an error occurs on parsing or the model namespace is invalid.</dd>
+</dl>
+</li>
+</ul>
+<a id="getNamespaceFromZip(java.nio.file.Path)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getNamespaceFromZip</h4>
+<pre class="methodSignature">public static&nbsp;String&nbsp;getNamespaceFromZip&#8203;(Path&nbsp;inputPath)</pre>
+<div class="block">Extract the model namespace of the given input file.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>inputPath</code> - The <code>Path</code> of the model file for which the model
+                  namespace is requested.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The model namespace of the given input file or <i>invalid</i> if an
+         error occurs on parsing or the model namespace is invalid.</dd>
+</dl>
+</li>
+</ul>
+<a id="getNamespaceFromFile(java.nio.file.Path)">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getNamespaceFromFile</h4>
+<pre class="methodSignature">public static&nbsp;String&nbsp;getNamespaceFromFile&#8203;(Path&nbsp;inputPath)</pre>
+<div class="block">Extract the model namespace of the given input file.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>inputPath</code> - The <code>Path</code> of the model file for which the model
+                  namespace is requested.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>The model namespace of the given input file or <i>invalid</i> if an
+         error occurs on parsing or the model namespace is invalid.</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+</div>
+</main>
+<!-- ========= END OF CLASS DATA ========= -->
+</body>
+</html>
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 6af0177..7599885 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
@@ -1,16 +1,18 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML>
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
+<!-- Generated by javadoc (11.0.8) on Mon Nov 30 13:15:36 CET 2020 -->
 <title>AmaltheaLoader</title>
-<meta name="date" content="2019-07-31">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-11-30">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
 <!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
 <div class="header">
-<div class="subTitle">org.eclipse.app4mc.amalthea.model.io</div>
+<div class="subTitle"><span class="packageLabelInType">Package</span>&nbsp;<a href="package-summary.html">org.eclipse.app4mc.amalthea.model.io</a></div>
 <h2 title="Class AmaltheaLoader" class="title">Class AmaltheaLoader</h2>
 </div>
 <div class="contentContainer">
@@ -26,7 +28,6 @@
 <ul class="blockList">
 <li class="blockList">
 <hr>
-<br>
 <pre>public class <span class="typeNameLabel">AmaltheaLoader</span>
 extends Object</pre>
 </li>
@@ -35,57 +36,44 @@
 <div class="summary">
 <ul class="blockList">
 <li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="#AmaltheaLoader--">AmaltheaLoader</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
 <!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a id="method.summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<table class="memberSummary">
 <caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>static Amalthea</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#loadFromFile-java.io.File-">loadFromFile</a></span>(File&nbsp;file)</code>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#loadFromFile(java.io.File)">loadFromFile</a></span>&#8203;(File&nbsp;file)</code></th>
+<td class="colLast">
 <div class="block">Static method to load an AMALTHEA model from a file.</div>
 </td>
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>static Amalthea</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#loadFromFileNamed-java.lang.String-">loadFromFileNamed</a></span>(String&nbsp;pathname)</code>
-<div class="block">Static method to load an AMALTHEA model from a file with a given pathname
- string.</div>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#loadFromFileNamed(java.lang.String)">loadFromFileNamed</a></span>&#8203;(String&nbsp;pathname)</code></th>
+<td class="colLast">
+<div class="block">Static method to load an AMALTHEA model from a file with a given pathname string.</div>
 </td>
 </tr>
 <tr id="i2" class="altColor">
 <td class="colFirst"><code>static Amalthea</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#loadFromURI-org.eclipse.emf.common.util.URI-">loadFromURI</a></span>(URI&nbsp;uri)</code>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#loadFromURI(org.eclipse.emf.common.util.URI)">loadFromURI</a></span>&#8203;(URI&nbsp;uri)</code></th>
+<td class="colLast">
 <div class="block">Static method to load an AMALTHEA model from a file URI.</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.Object">
+<li class="blockList"><a id="methods.inherited.from.class.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;Object</h3>
@@ -93,44 +81,28 @@
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
 <div class="details">
 <ul class="blockList">
 <li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="AmaltheaLoader--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>AmaltheaLoader</h4>
-<pre>public&nbsp;AmaltheaLoader()</pre>
-</li>
-</ul>
-</li>
-</ul>
 <!-- ============ METHOD DETAIL ========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a id="method.detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="loadFromFileNamed-java.lang.String-">
+<a id="loadFromFileNamed(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>loadFromFileNamed</h4>
-<pre>public static&nbsp;Amalthea&nbsp;loadFromFileNamed(String&nbsp;pathname)</pre>
-<div class="block">Static method to load an AMALTHEA model from a file with a given pathname
- string.
+<pre class="methodSignature">public static&nbsp;Amalthea&nbsp;loadFromFileNamed&#8203;(String&nbsp;pathname)</pre>
+<div class="block">Static method to load an AMALTHEA model from a file with a given pathname string.
  <p>
  Possible path names:
  <ul>
@@ -145,13 +117,13 @@
 </dl>
 </li>
 </ul>
-<a name="loadFromFile-java.io.File-">
+<a id="loadFromFile(java.io.File)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>loadFromFile</h4>
-<pre>public static&nbsp;Amalthea&nbsp;loadFromFile(File&nbsp;file)</pre>
+<pre class="methodSignature">public static&nbsp;Amalthea&nbsp;loadFromFile&#8203;(File&nbsp;file)</pre>
 <div class="block">Static method to load an AMALTHEA model from a file.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -161,13 +133,13 @@
 </dl>
 </li>
 </ul>
-<a name="loadFromURI-org.eclipse.emf.common.util.URI-">
+<a id="loadFromURI(org.eclipse.emf.common.util.URI)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>loadFromURI</h4>
-<pre>public static&nbsp;Amalthea&nbsp;loadFromURI(URI&nbsp;uri)</pre>
+<pre class="methodSignature">public static&nbsp;Amalthea&nbsp;loadFromURI&#8203;(URI&nbsp;uri)</pre>
 <div class="block">Static method to load an AMALTHEA model from a file URI.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -179,10 +151,12 @@
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
 </div>
+</main>
 <!-- ========= END OF CLASS DATA ========= -->
 </body>
 </html>
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 d5ce5ca..3ae0d45 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
@@ -1,16 +1,18 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML>
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
+<!-- Generated by javadoc (11.0.8) on Mon Nov 30 13:15:36 CET 2020 -->
 <title>AmaltheaWriter</title>
-<meta name="date" content="2019-07-31">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-11-30">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
 <!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
 <div class="header">
-<div class="subTitle">org.eclipse.app4mc.amalthea.model.io</div>
+<div class="subTitle"><span class="packageLabelInType">Package</span>&nbsp;<a href="package-summary.html">org.eclipse.app4mc.amalthea.model.io</a></div>
 <h2 title="Class AmaltheaWriter" class="title">Class AmaltheaWriter</h2>
 </div>
 <div class="contentContainer">
@@ -26,7 +28,6 @@
 <ul class="blockList">
 <li class="blockList">
 <hr>
-<br>
 <pre>public class <span class="typeNameLabel">AmaltheaWriter</span>
 extends Object</pre>
 </li>
@@ -35,59 +36,47 @@
 <div class="summary">
 <ul class="blockList">
 <li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="#AmaltheaWriter--">AmaltheaWriter</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
 <!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a id="method.summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<table class="memberSummary">
 <caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>static boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#writeToFile-org.eclipse.app4mc.amalthea.model.Amalthea-java.io.File-">writeToFile</a></span>(Amalthea&nbsp;model,
-           File&nbsp;file)</code>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#writeToFile(org.eclipse.app4mc.amalthea.model.Amalthea,java.io.File)">writeToFile</a></span>&#8203;(Amalthea&nbsp;model,
+           File&nbsp;file)</code></th>
+<td class="colLast">
 <div class="block">Static method to save an AMALTHEA model to a file.</div>
 </td>
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>static boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#writeToFileNamed-org.eclipse.app4mc.amalthea.model.Amalthea-java.lang.String-">writeToFileNamed</a></span>(Amalthea&nbsp;model,
-                String&nbsp;pathname)</code>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#writeToFileNamed(org.eclipse.app4mc.amalthea.model.Amalthea,java.lang.String)">writeToFileNamed</a></span>&#8203;(Amalthea&nbsp;model,
+                String&nbsp;pathname)</code></th>
+<td class="colLast">
 <div class="block">Static method to save an AMALTHEA model to a file with a given pathname string.</div>
 </td>
 </tr>
 <tr id="i2" class="altColor">
 <td class="colFirst"><code>static boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#writeToURI-org.eclipse.app4mc.amalthea.model.Amalthea-org.eclipse.emf.common.util.URI-">writeToURI</a></span>(Amalthea&nbsp;model,
-          URI&nbsp;uri)</code>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#writeToURI(org.eclipse.app4mc.amalthea.model.Amalthea,org.eclipse.emf.common.util.URI)">writeToURI</a></span>&#8203;(Amalthea&nbsp;model,
+          URI&nbsp;uri)</code></th>
+<td class="colLast">
 <div class="block">Static method to save an AMALTHEA model to a file URI.</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.Object">
+<li class="blockList"><a id="methods.inherited.from.class.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;Object</h3>
@@ -95,42 +84,27 @@
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
 <div class="details">
 <ul class="blockList">
 <li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="AmaltheaWriter--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>AmaltheaWriter</h4>
-<pre>public&nbsp;AmaltheaWriter()</pre>
-</li>
-</ul>
-</li>
-</ul>
 <!-- ============ METHOD DETAIL ========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a id="method.detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="writeToFileNamed-org.eclipse.app4mc.amalthea.model.Amalthea-java.lang.String-">
+<a id="writeToFileNamed(org.eclipse.app4mc.amalthea.model.Amalthea,java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>writeToFileNamed</h4>
-<pre>public static&nbsp;boolean&nbsp;writeToFileNamed(Amalthea&nbsp;model,
+<pre class="methodSignature">public static&nbsp;boolean&nbsp;writeToFileNamed&#8203;(Amalthea&nbsp;model,
                                        String&nbsp;pathname)</pre>
 <div class="block">Static method to save an AMALTHEA model to a file with a given pathname string.
  <p>
@@ -148,13 +122,13 @@
 </dl>
 </li>
 </ul>
-<a name="writeToFile-org.eclipse.app4mc.amalthea.model.Amalthea-java.io.File-">
+<a id="writeToFile(org.eclipse.app4mc.amalthea.model.Amalthea,java.io.File)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>writeToFile</h4>
-<pre>public static&nbsp;boolean&nbsp;writeToFile(Amalthea&nbsp;model,
+<pre class="methodSignature">public static&nbsp;boolean&nbsp;writeToFile&#8203;(Amalthea&nbsp;model,
                                   File&nbsp;file)</pre>
 <div class="block">Static method to save an AMALTHEA model to a file.</div>
 <dl>
@@ -166,13 +140,13 @@
 </dl>
 </li>
 </ul>
-<a name="writeToURI-org.eclipse.app4mc.amalthea.model.Amalthea-org.eclipse.emf.common.util.URI-">
+<a id="writeToURI(org.eclipse.app4mc.amalthea.model.Amalthea,org.eclipse.emf.common.util.URI)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>writeToURI</h4>
-<pre>public static&nbsp;boolean&nbsp;writeToURI(Amalthea&nbsp;model,
+<pre class="methodSignature">public static&nbsp;boolean&nbsp;writeToURI&#8203;(Amalthea&nbsp;model,
                                  URI&nbsp;uri)</pre>
 <div class="block">Static method to save an AMALTHEA model to a file URI.</div>
 <dl>
@@ -186,10 +160,12 @@
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
 </div>
+</main>
 <!-- ========= END OF CLASS DATA ========= -->
 </body>
 </html>
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 bde6e85..1bfe902 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
@@ -1,20 +1,22 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML>
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
+<!-- Generated by javadoc (11.0.8) on Mon Nov 30 13:15:36 CET 2020 -->
 <title>org.eclipse.app4mc.amalthea.model.io</title>
-<meta name="date" content="2019-07-31">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-11-30">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
+<main role="main">
 <div class="header">
 <h1 title="Package" class="title">Package&nbsp;org.eclipse.app4mc.amalthea.model.io</h1>
 </div>
 <div class="contentContainer">
 <ul class="blockList">
 <li class="blockList">
-<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
+<table class="typeSummary">
 <caption><span>Class Summary</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Class</th>
@@ -22,11 +24,15 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><a href="AmaltheaLoader.html" title="class in org.eclipse.app4mc.amalthea.model.io">AmaltheaLoader</a></td>
+<th class="colFirst" scope="row"><a href="AmaltheaFileHelper.html" title="class in org.eclipse.app4mc.amalthea.model.io">AmaltheaFileHelper</a></th>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a href="AmaltheaWriter.html" title="class in org.eclipse.app4mc.amalthea.model.io">AmaltheaWriter</a></td>
+<th class="colFirst" scope="row"><a href="AmaltheaLoader.html" title="class in org.eclipse.app4mc.amalthea.model.io">AmaltheaLoader</a></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<th class="colFirst" scope="row"><a href="AmaltheaWriter.html" title="class in org.eclipse.app4mc.amalthea.model.io">AmaltheaWriter</a></th>
 <td class="colLast">&nbsp;</td>
 </tr>
 </tbody>
@@ -34,5 +40,6 @@
 </li>
 </ul>
 </div>
+</main>
 </body>
 </html>
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 04b5bbf..9eb3830 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
@@ -1,10 +1,11 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML>
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
+<!-- Generated by javadoc (11.0.8) on Mon Nov 30 13:15:36 CET 2020 -->
 <title>org.eclipse.app4mc.amalthea.model</title>
-<meta name="date" content="2019-07-31">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-11-30">
 <link rel="stylesheet" type="text/css" href="../stylesheet.css" title="Style">
 </head>
 <body>
@@ -14,7 +15,7 @@
 <div class="contentContainer">
 <ul class="blockList">
 <li class="blockList">
-<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
+<table class="typeSummary">
 <caption><span>Class Summary</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Class</th>
@@ -22,27 +23,30 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><a href="AmaltheaIndex.html" title="class in org.eclipse.app4mc.amalthea.model">AmaltheaIndex</a></td>
+<th class="colFirst" scope="row"><a href="AmaltheaIndex.html" title="class in org.eclipse.app4mc.amalthea.model">AmaltheaIndex</a></th>
 <td class="colLast">
 <div class="block">This class provides static methods for efficient model navigation, search and delete.</div>
 </td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a href="AmaltheaMerger.html" title="class in org.eclipse.app4mc.amalthea.model">AmaltheaMerger</a></td>
+<th class="colFirst" scope="row"><a href="AmaltheaMerger.html" title="class in org.eclipse.app4mc.amalthea.model">AmaltheaMerger</a></th>
 <td class="colLast">
 <div class="block">This class provides static methods to extend a model with major elements of a second model.</div>
 </td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a href="AmaltheaServices.html" title="class in org.eclipse.app4mc.amalthea.model">AmaltheaServices</a></td>
+<th class="colFirst" scope="row"><a href="AmaltheaServices.html" title="class in org.eclipse.app4mc.amalthea.model">AmaltheaServices</a></th>
 <td class="colLast">
-<div class="block">This class provides static methods that implement operations of the Amalthea EMF model.</div>
+<div class="block">This class provides static methods that implement operations of the Amalthea
+ EMF model.</div>
 </td>
 </tr>
+
 </tbody>
 </table>
 </li>
 </ul>
 </div>
+</main>
 </body>
 </html>
diff --git a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/ConstraintsUtil.html b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/ConstraintsUtil.html
new file mode 100644
index 0000000..098b8b5
--- /dev/null
+++ b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/ConstraintsUtil.html
@@ -0,0 +1,375 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="de">
+<head>
+<!-- Generated by javadoc (11.0.8) on Mon Nov 30 13:15:36 CET 2020 -->
+<title>ConstraintsUtil</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-11-30">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+</head>
+<body>
+<!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
+<div class="header">
+<div class="subTitle"><span class="packageLabelInType">Package</span>&nbsp;<a href="package-summary.html">org.eclipse.app4mc.amalthea.model.util</a></div>
+<h2 title="Class ConstraintsUtil" class="title">Class ConstraintsUtil</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>Object</li>
+<li>
+<ul class="inheritance">
+<li>ConstraintsUtil</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<pre>public class <span class="typeNameLabel">ConstraintsUtil</span>
+extends Object</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>static void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#addNewDeadlineRequirement(org.eclipse.app4mc.amalthea.model.ConstraintsModel,org.eclipse.app4mc.amalthea.model.AbstractProcess,org.eclipse.app4mc.amalthea.model.Time)">addNewDeadlineRequirement</a></span>&#8203;(@NonNull ConstraintsModel&nbsp;container,
+                         @NonNull AbstractProcess&nbsp;process,
+                         @NonNull Time&nbsp;deadline)</code></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>static void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#addNewDeadlineRequirement(org.eclipse.app4mc.amalthea.model.ConstraintsModel,org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.app4mc.amalthea.model.Time)">addNewDeadlineRequirement</a></span>&#8203;(@NonNull ConstraintsModel&nbsp;container,
+                         @NonNull Runnable&nbsp;runnable,
+                         @NonNull Time&nbsp;deadline)</code></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>static List&lt;AbstractEventChain&gt;</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getAllAbstractEventChains(org.eclipse.app4mc.amalthea.model.ConstraintsModel)">getAllAbstractEventChains</a></span>&#8203;(@NonNull ConstraintsModel&nbsp;constModel)</code></th>
+<td class="colLast">
+<div class="block">Retrieve all abstract event chains from the constraints model.</div>
+</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>static @Nullable Time</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getDeadline(org.eclipse.app4mc.amalthea.model.AbstractProcess)">getDeadline</a></span>&#8203;(@NonNull AbstractProcess&nbsp;process)</code></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>static @Nullable Time</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getDeadline(org.eclipse.app4mc.amalthea.model.AbstractProcess,org.eclipse.app4mc.amalthea.model.ConstraintsModel)">getDeadline</a></span>&#8203;(@NonNull AbstractProcess&nbsp;process,
+           @NonNull ConstraintsModel&nbsp;constModel)</code></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>static @Nullable Time</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getDeadline(org.eclipse.app4mc.amalthea.model.Runnable)">getDeadline</a></span>&#8203;(@NonNull Runnable&nbsp;runnable)</code></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>static @Nullable Time</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getDeadline(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.app4mc.amalthea.model.ConstraintsModel)">getDeadline</a></span>&#8203;(@NonNull Runnable&nbsp;runnable,
+           @NonNull ConstraintsModel&nbsp;constModel)</code></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code>static List&lt;ProcessRequirement&gt;</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getDeadlineRequirements(org.eclipse.app4mc.amalthea.model.AbstractProcess,org.eclipse.app4mc.amalthea.model.ConstraintsModel)">getDeadlineRequirements</a></span>&#8203;(@NonNull AbstractProcess&nbsp;process,
+                       @NonNull ConstraintsModel&nbsp;constModel)</code></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr id="i8" class="altColor">
+<td class="colFirst"><code>static List&lt;RunnableRequirement&gt;</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getDeadlineRequirements(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.app4mc.amalthea.model.ConstraintsModel)">getDeadlineRequirements</a></span>&#8203;(@NonNull Runnable&nbsp;runnable,
+                       @NonNull ConstraintsModel&nbsp;constModel)</code></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr id="i9" class="rowColor">
+<td class="colFirst"><code>static void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#updateDeadlineRequirement(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.app4mc.amalthea.model.Time)">updateDeadlineRequirement</a></span>&#8203;(@NonNull Runnable&nbsp;runnable,
+                         @NonNull Time&nbsp;deadline)</code></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr id="i10" class="altColor">
+<td class="colFirst"><code>static void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#updateDeadlineRequirement(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.app4mc.amalthea.model.Time,org.eclipse.app4mc.amalthea.model.ConstraintsModel)">updateDeadlineRequirement</a></span>&#8203;(@NonNull Runnable&nbsp;runnable,
+                         @NonNull Time&nbsp;deadline,
+                         @NonNull ConstraintsModel&nbsp;constModel)</code></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr id="i11" class="rowColor">
+<td class="colFirst"><code>static void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#updateDeadlineRequirement(org.eclipse.app4mc.amalthea.model.Task,org.eclipse.app4mc.amalthea.model.Time)">updateDeadlineRequirement</a></span>&#8203;(@NonNull Task&nbsp;task,
+                         @NonNull Time&nbsp;deadline)</code></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr id="i12" class="altColor">
+<td class="colFirst"><code>static void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#updateDeadlineRequirement(org.eclipse.app4mc.amalthea.model.Task,org.eclipse.app4mc.amalthea.model.Time,org.eclipse.app4mc.amalthea.model.ConstraintsModel)">updateDeadlineRequirement</a></span>&#8203;(@NonNull Task&nbsp;task,
+                         @NonNull Time&nbsp;deadline,
+                         @NonNull ConstraintsModel&nbsp;constModel)</code></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a id="methods.inherited.from.class.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a id="getDeadline(org.eclipse.app4mc.amalthea.model.AbstractProcess)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getDeadline</h4>
+<pre class="methodSignature">public static&nbsp;@Nullable Time&nbsp;getDeadline&#8203;(@NonNull AbstractProcess&nbsp;process)</pre>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>process</code> - </dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+</dl>
+</li>
+</ul>
+<a id="getDeadline(org.eclipse.app4mc.amalthea.model.AbstractProcess,org.eclipse.app4mc.amalthea.model.ConstraintsModel)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getDeadline</h4>
+<pre class="methodSignature">public static&nbsp;@Nullable Time&nbsp;getDeadline&#8203;(@NonNull AbstractProcess&nbsp;process,
+                                         @NonNull ConstraintsModel&nbsp;constModel)</pre>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>process</code> - </dd>
+<dd><code>constModel</code> - </dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+</dl>
+</li>
+</ul>
+<a id="getDeadline(org.eclipse.app4mc.amalthea.model.Runnable)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getDeadline</h4>
+<pre class="methodSignature">public static&nbsp;@Nullable Time&nbsp;getDeadline&#8203;(@NonNull Runnable&nbsp;runnable)</pre>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>runnable</code> - </dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+</dl>
+</li>
+</ul>
+<a id="getDeadline(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.app4mc.amalthea.model.ConstraintsModel)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getDeadline</h4>
+<pre class="methodSignature">public static&nbsp;@Nullable Time&nbsp;getDeadline&#8203;(@NonNull Runnable&nbsp;runnable,
+                                         @NonNull ConstraintsModel&nbsp;constModel)</pre>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>runnable</code> - </dd>
+<dd><code>constModel</code> - </dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+</dl>
+</li>
+</ul>
+<a id="addNewDeadlineRequirement(org.eclipse.app4mc.amalthea.model.ConstraintsModel,org.eclipse.app4mc.amalthea.model.AbstractProcess,org.eclipse.app4mc.amalthea.model.Time)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>addNewDeadlineRequirement</h4>
+<pre class="methodSignature">public static&nbsp;void&nbsp;addNewDeadlineRequirement&#8203;(@NonNull ConstraintsModel&nbsp;container,
+                                             @NonNull AbstractProcess&nbsp;process,
+                                             @NonNull Time&nbsp;deadline)</pre>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>container</code> - </dd>
+<dd><code>process</code> - </dd>
+<dd><code>deadline</code> - </dd>
+</dl>
+</li>
+</ul>
+<a id="addNewDeadlineRequirement(org.eclipse.app4mc.amalthea.model.ConstraintsModel,org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.app4mc.amalthea.model.Time)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>addNewDeadlineRequirement</h4>
+<pre class="methodSignature">public static&nbsp;void&nbsp;addNewDeadlineRequirement&#8203;(@NonNull ConstraintsModel&nbsp;container,
+                                             @NonNull Runnable&nbsp;runnable,
+                                             @NonNull Time&nbsp;deadline)</pre>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>container</code> - </dd>
+<dd><code>runnable</code> - </dd>
+<dd><code>deadline</code> - </dd>
+</dl>
+</li>
+</ul>
+<a id="updateDeadlineRequirement(org.eclipse.app4mc.amalthea.model.Task,org.eclipse.app4mc.amalthea.model.Time)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>updateDeadlineRequirement</h4>
+<pre class="methodSignature">public static&nbsp;void&nbsp;updateDeadlineRequirement&#8203;(@NonNull Task&nbsp;task,
+                                             @NonNull Time&nbsp;deadline)</pre>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>task</code> - </dd>
+<dd><code>deadline</code> - </dd>
+</dl>
+</li>
+</ul>
+<a id="updateDeadlineRequirement(org.eclipse.app4mc.amalthea.model.Task,org.eclipse.app4mc.amalthea.model.Time,org.eclipse.app4mc.amalthea.model.ConstraintsModel)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>updateDeadlineRequirement</h4>
+<pre class="methodSignature">public static&nbsp;void&nbsp;updateDeadlineRequirement&#8203;(@NonNull Task&nbsp;task,
+                                             @NonNull Time&nbsp;deadline,
+                                             @NonNull ConstraintsModel&nbsp;constModel)</pre>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>task</code> - </dd>
+<dd><code>deadline</code> - </dd>
+<dd><code>constModel</code> - </dd>
+</dl>
+</li>
+</ul>
+<a id="updateDeadlineRequirement(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.app4mc.amalthea.model.Time)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>updateDeadlineRequirement</h4>
+<pre class="methodSignature">public static&nbsp;void&nbsp;updateDeadlineRequirement&#8203;(@NonNull Runnable&nbsp;runnable,
+                                             @NonNull Time&nbsp;deadline)</pre>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>runnable</code> - </dd>
+<dd><code>deadline</code> - </dd>
+</dl>
+</li>
+</ul>
+<a id="updateDeadlineRequirement(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.app4mc.amalthea.model.Time,org.eclipse.app4mc.amalthea.model.ConstraintsModel)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>updateDeadlineRequirement</h4>
+<pre class="methodSignature">public static&nbsp;void&nbsp;updateDeadlineRequirement&#8203;(@NonNull Runnable&nbsp;runnable,
+                                             @NonNull Time&nbsp;deadline,
+                                             @NonNull ConstraintsModel&nbsp;constModel)</pre>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>runnable</code> - </dd>
+<dd><code>deadline</code> - </dd>
+<dd><code>constModel</code> - </dd>
+</dl>
+</li>
+</ul>
+<a id="getDeadlineRequirements(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.app4mc.amalthea.model.ConstraintsModel)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getDeadlineRequirements</h4>
+<pre class="methodSignature">public static&nbsp;List&lt;RunnableRequirement&gt;&nbsp;getDeadlineRequirements&#8203;(@NonNull Runnable&nbsp;runnable,
+                                                                @NonNull ConstraintsModel&nbsp;constModel)</pre>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>runnable</code> - </dd>
+<dd><code>constModel</code> - </dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+</dl>
+</li>
+</ul>
+<a id="getDeadlineRequirements(org.eclipse.app4mc.amalthea.model.AbstractProcess,org.eclipse.app4mc.amalthea.model.ConstraintsModel)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getDeadlineRequirements</h4>
+<pre class="methodSignature">public static&nbsp;List&lt;ProcessRequirement&gt;&nbsp;getDeadlineRequirements&#8203;(@NonNull AbstractProcess&nbsp;process,
+                                                               @NonNull ConstraintsModel&nbsp;constModel)</pre>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>process</code> - </dd>
+<dd><code>constModel</code> - </dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+</dl>
+</li>
+</ul>
+<a id="getAllAbstractEventChains(org.eclipse.app4mc.amalthea.model.ConstraintsModel)">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getAllAbstractEventChains</h4>
+<pre class="methodSignature">public static&nbsp;List&lt;AbstractEventChain&gt;&nbsp;getAllAbstractEventChains&#8203;(@NonNull ConstraintsModel&nbsp;constModel)</pre>
+<div class="block">Retrieve all abstract event chains from the constraints model.
+ This includes event chains and sub event chains (contained as items).</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>constModel</code> - The constraints model from which we want to have all abstract event chains.</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>All abstract event chains.</dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+</div>
+</main>
+<!-- ========= END OF CLASS DATA ========= -->
+</body>
+</html>
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 2888494..f30d3dc 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
@@ -1,16 +1,18 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML>
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:26:59 CEST 2019 -->
+<!-- Generated by javadoc (11.0.8) on Mon Nov 30 13:15:36 CET 2020 -->
 <title>CustomPropertyUtil</title>
-<meta name="date" content="2019-07-31">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-11-30">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
 <!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
 <div class="header">
-<div class="subTitle">org.eclipse.app4mc.amalthea.model.util</div>
+<div class="subTitle"><span class="packageLabelInType">Package</span>&nbsp;<a href="package-summary.html">org.eclipse.app4mc.amalthea.model.util</a></div>
 <h2 title="Class CustomPropertyUtil" class="title">Class CustomPropertyUtil</h2>
 </div>
 <div class="contentContainer">
@@ -26,7 +28,6 @@
 <ul class="blockList">
 <li class="blockList">
 <hr>
-<br>
 <pre>public final class <span class="typeNameLabel">CustomPropertyUtil</span>
 extends Object</pre>
 </li>
@@ -35,82 +36,75 @@
 <div class="summary">
 <ul class="blockList">
 <li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="#CustomPropertyUtil--">CustomPropertyUtil</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
 <!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a id="method.summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<table class="memberSummary">
 <caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>static Integer</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#customGetInteger-org.eclipse.app4mc.amalthea.model.IAnnotatable-java.lang.String-">customGetInteger</a></span>(@NonNull IAnnotatable&nbsp;object,
-                @NonNull String&nbsp;key)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#customGetInteger(org.eclipse.app4mc.amalthea.model.IAnnotatable,java.lang.String)">customGetInteger</a></span>&#8203;(@NonNull IAnnotatable&nbsp;object,
+                @NonNull String&nbsp;key)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>static IReferable</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#customGetReference-org.eclipse.app4mc.amalthea.model.IAnnotatable-java.lang.String-">customGetReference</a></span>(@NonNull IAnnotatable&nbsp;object,
-                  @NonNull String&nbsp;key)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#customGetReference(org.eclipse.app4mc.amalthea.model.IAnnotatable,java.lang.String)">customGetReference</a></span>&#8203;(@NonNull IAnnotatable&nbsp;object,
+                  @NonNull String&nbsp;key)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i2" class="altColor">
 <td class="colFirst"><code>static String</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#customGetString-org.eclipse.app4mc.amalthea.model.IAnnotatable-java.lang.String-">customGetString</a></span>(@NonNull IAnnotatable&nbsp;object,
-               @NonNull String&nbsp;key)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#customGetString(org.eclipse.app4mc.amalthea.model.IAnnotatable,java.lang.String)">customGetString</a></span>&#8203;(@NonNull IAnnotatable&nbsp;object,
+               @NonNull String&nbsp;key)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i3" class="rowColor">
 <td class="colFirst"><code>static Time</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#customGetTime-org.eclipse.app4mc.amalthea.model.IAnnotatable-java.lang.String-">customGetTime</a></span>(@NonNull IAnnotatable&nbsp;object,
-             @NonNull String&nbsp;key)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#customGetTime(org.eclipse.app4mc.amalthea.model.IAnnotatable,java.lang.String)">customGetTime</a></span>&#8203;(@NonNull IAnnotatable&nbsp;object,
+             @NonNull String&nbsp;key)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i4" class="altColor">
 <td class="colFirst"><code>static Value</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#customPut-org.eclipse.app4mc.amalthea.model.IAnnotatable-java.lang.String-int-">customPut</a></span>(@NonNull IAnnotatable&nbsp;object,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#customPut(org.eclipse.app4mc.amalthea.model.IAnnotatable,java.lang.String,int)">customPut</a></span>&#8203;(@NonNull IAnnotatable&nbsp;object,
          @NonNull String&nbsp;key,
-         int&nbsp;num)</code>&nbsp;</td>
+         int&nbsp;num)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i5" class="rowColor">
 <td class="colFirst"><code>static Value</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#customPut-org.eclipse.app4mc.amalthea.model.IAnnotatable-java.lang.String-org.eclipse.app4mc.amalthea.model.IReferable-">customPut</a></span>(@NonNull IAnnotatable&nbsp;object,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#customPut(org.eclipse.app4mc.amalthea.model.IAnnotatable,java.lang.String,java.lang.String)">customPut</a></span>&#8203;(@NonNull IAnnotatable&nbsp;object,
          @NonNull String&nbsp;key,
-         IReferable&nbsp;reference)</code>&nbsp;</td>
+         String&nbsp;str)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i6" class="altColor">
 <td class="colFirst"><code>static Value</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#customPut-org.eclipse.app4mc.amalthea.model.IAnnotatable-java.lang.String-java.lang.String-">customPut</a></span>(@NonNull IAnnotatable&nbsp;object,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#customPut(org.eclipse.app4mc.amalthea.model.IAnnotatable,java.lang.String,org.eclipse.app4mc.amalthea.model.IReferable)">customPut</a></span>&#8203;(@NonNull IAnnotatable&nbsp;object,
          @NonNull String&nbsp;key,
-         String&nbsp;str)</code>&nbsp;</td>
+         IReferable&nbsp;reference)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i7" class="rowColor">
 <td class="colFirst"><code>static Value</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#customPut-org.eclipse.app4mc.amalthea.model.IAnnotatable-java.lang.String-org.eclipse.app4mc.amalthea.model.Time-">customPut</a></span>(@NonNull IAnnotatable&nbsp;object,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#customPut(org.eclipse.app4mc.amalthea.model.IAnnotatable,java.lang.String,org.eclipse.app4mc.amalthea.model.Time)">customPut</a></span>&#8203;(@NonNull IAnnotatable&nbsp;object,
          @NonNull String&nbsp;key,
-         Time&nbsp;time)</code>&nbsp;</td>
+         Time&nbsp;time)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.Object">
+<li class="blockList"><a id="methods.inherited.from.class.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;Object</h3>
@@ -118,125 +112,112 @@
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
 <div class="details">
 <ul class="blockList">
 <li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="CustomPropertyUtil--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>CustomPropertyUtil</h4>
-<pre>public&nbsp;CustomPropertyUtil()</pre>
-</li>
-</ul>
-</li>
-</ul>
 <!-- ============ METHOD DETAIL ========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a id="method.detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="customPut-org.eclipse.app4mc.amalthea.model.IAnnotatable-java.lang.String-int-">
+<a id="customPut(org.eclipse.app4mc.amalthea.model.IAnnotatable,java.lang.String,int)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>customPut</h4>
-<pre>public static&nbsp;Value&nbsp;customPut(@NonNull IAnnotatable&nbsp;object,
+<pre class="methodSignature">public static&nbsp;Value&nbsp;customPut&#8203;(@NonNull IAnnotatable&nbsp;object,
                               @NonNull String&nbsp;key,
                               int&nbsp;num)</pre>
 </li>
 </ul>
-<a name="customPut-org.eclipse.app4mc.amalthea.model.IAnnotatable-java.lang.String-java.lang.String-">
+<a id="customPut(org.eclipse.app4mc.amalthea.model.IAnnotatable,java.lang.String,java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>customPut</h4>
-<pre>public static&nbsp;Value&nbsp;customPut(@NonNull IAnnotatable&nbsp;object,
+<pre class="methodSignature">public static&nbsp;Value&nbsp;customPut&#8203;(@NonNull IAnnotatable&nbsp;object,
                               @NonNull String&nbsp;key,
                               String&nbsp;str)</pre>
 </li>
 </ul>
-<a name="customPut-org.eclipse.app4mc.amalthea.model.IAnnotatable-java.lang.String-org.eclipse.app4mc.amalthea.model.Time-">
+<a id="customPut(org.eclipse.app4mc.amalthea.model.IAnnotatable,java.lang.String,org.eclipse.app4mc.amalthea.model.Time)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>customPut</h4>
-<pre>public static&nbsp;Value&nbsp;customPut(@NonNull IAnnotatable&nbsp;object,
+<pre class="methodSignature">public static&nbsp;Value&nbsp;customPut&#8203;(@NonNull IAnnotatable&nbsp;object,
                               @NonNull String&nbsp;key,
                               Time&nbsp;time)</pre>
 </li>
 </ul>
-<a name="customPut-org.eclipse.app4mc.amalthea.model.IAnnotatable-java.lang.String-org.eclipse.app4mc.amalthea.model.IReferable-">
+<a id="customPut(org.eclipse.app4mc.amalthea.model.IAnnotatable,java.lang.String,org.eclipse.app4mc.amalthea.model.IReferable)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>customPut</h4>
-<pre>public static&nbsp;Value&nbsp;customPut(@NonNull IAnnotatable&nbsp;object,
+<pre class="methodSignature">public static&nbsp;Value&nbsp;customPut&#8203;(@NonNull IAnnotatable&nbsp;object,
                               @NonNull String&nbsp;key,
                               IReferable&nbsp;reference)</pre>
 </li>
 </ul>
-<a name="customGetInteger-org.eclipse.app4mc.amalthea.model.IAnnotatable-java.lang.String-">
+<a id="customGetInteger(org.eclipse.app4mc.amalthea.model.IAnnotatable,java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>customGetInteger</h4>
-<pre>public static&nbsp;Integer&nbsp;customGetInteger(@NonNull IAnnotatable&nbsp;object,
+<pre class="methodSignature">public static&nbsp;Integer&nbsp;customGetInteger&#8203;(@NonNull IAnnotatable&nbsp;object,
                                        @NonNull String&nbsp;key)</pre>
 </li>
 </ul>
-<a name="customGetString-org.eclipse.app4mc.amalthea.model.IAnnotatable-java.lang.String-">
+<a id="customGetString(org.eclipse.app4mc.amalthea.model.IAnnotatable,java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>customGetString</h4>
-<pre>public static&nbsp;String&nbsp;customGetString(@NonNull IAnnotatable&nbsp;object,
+<pre class="methodSignature">public static&nbsp;String&nbsp;customGetString&#8203;(@NonNull IAnnotatable&nbsp;object,
                                      @NonNull String&nbsp;key)</pre>
 </li>
 </ul>
-<a name="customGetTime-org.eclipse.app4mc.amalthea.model.IAnnotatable-java.lang.String-">
+<a id="customGetTime(org.eclipse.app4mc.amalthea.model.IAnnotatable,java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>customGetTime</h4>
-<pre>public static&nbsp;Time&nbsp;customGetTime(@NonNull IAnnotatable&nbsp;object,
+<pre class="methodSignature">public static&nbsp;Time&nbsp;customGetTime&#8203;(@NonNull IAnnotatable&nbsp;object,
                                  @NonNull String&nbsp;key)</pre>
 </li>
 </ul>
-<a name="customGetReference-org.eclipse.app4mc.amalthea.model.IAnnotatable-java.lang.String-">
+<a id="customGetReference(org.eclipse.app4mc.amalthea.model.IAnnotatable,java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>customGetReference</h4>
-<pre>public static&nbsp;IReferable&nbsp;customGetReference(@NonNull IAnnotatable&nbsp;object,
+<pre class="methodSignature">public static&nbsp;IReferable&nbsp;customGetReference&#8203;(@NonNull IAnnotatable&nbsp;object,
                                             @NonNull String&nbsp;key)</pre>
 </li>
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
 </div>
+</main>
 <!-- ========= END OF CLASS DATA ========= -->
 </body>
 </html>
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 da4ef1a..51681ce 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
@@ -1,16 +1,18 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML>
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
+<!-- Generated by javadoc (11.0.8) on Mon Nov 30 13:15:36 CET 2020 -->
 <title>DeploymentUtil</title>
-<meta name="date" content="2019-07-31">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-11-30">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
 <!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
 <div class="header">
-<div class="subTitle">org.eclipse.app4mc.amalthea.model.util</div>
+<div class="subTitle"><span class="packageLabelInType">Package</span>&nbsp;<a href="package-summary.html">org.eclipse.app4mc.amalthea.model.util</a></div>
 <h2 title="Class DeploymentUtil" class="title">Class DeploymentUtil</h2>
 </div>
 <div class="contentContainer">
@@ -26,7 +28,6 @@
 <ul class="blockList">
 <li class="blockList">
 <hr>
-<br>
 <pre>public class <span class="typeNameLabel">DeploymentUtil</span>
 extends Object</pre>
 </li>
@@ -35,105 +36,101 @@
 <div class="summary">
 <ul class="blockList">
 <li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="#DeploymentUtil--">DeploymentUtil</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
 <!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a id="method.summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<table class="memberSummary">
 <caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>static Set&lt;ProcessingUnit&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getAssignedCoreForProcess-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.app4mc.amalthea.model.Amalthea-">getAssignedCoreForProcess</a></span>(Process&nbsp;process,
-                         Amalthea&nbsp;model)</code>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getAssignedCoreForProcess(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.app4mc.amalthea.model.Amalthea)">getAssignedCoreForProcess</a></span>&#8203;(Process&nbsp;process,
+                         Amalthea&nbsp;model)</code></th>
+<td class="colLast">
 <div class="block">Returns the cores the process is assigned to.</div>
 </td>
 </tr>
 <tr id="i1" class="rowColor">
-<td class="colFirst"><code>List&lt;HwFeatureCategory&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getFeatureCategories-org.eclipse.app4mc.amalthea.model.ProcessingUnitDefinition-">getFeatureCategories</a></span>(ProcessingUnitDefinition&nbsp;procUnitDef)</code>&nbsp;</td>
+<td class="colFirst"><code>static List&lt;HwFeatureCategory&gt;</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getFeatureCategories(org.eclipse.app4mc.amalthea.model.ProcessingUnitDefinition)">getFeatureCategories</a></span>&#8203;(ProcessingUnitDefinition&nbsp;procUnitDef)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i2" class="altColor">
 <td class="colFirst"><code>static Set&lt;ISR&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getISRsMappedToCore-org.eclipse.app4mc.amalthea.model.ProcessingUnit-org.eclipse.app4mc.amalthea.model.Amalthea-">getISRsMappedToCore</a></span>(ProcessingUnit&nbsp;core,
-                   Amalthea&nbsp;model)</code>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getISRsMappedToCore(org.eclipse.app4mc.amalthea.model.ProcessingUnit,org.eclipse.app4mc.amalthea.model.Amalthea)">getISRsMappedToCore</a></span>&#8203;(ProcessingUnit&nbsp;core,
+                   Amalthea&nbsp;model)</code></th>
+<td class="colLast">
 <div class="block">Returns a set of all ISR mapped to that core</div>
 </td>
 </tr>
 <tr id="i3" class="rowColor">
 <td class="colFirst"><code>static Set&lt;Memory&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getLabelMapping-org.eclipse.app4mc.amalthea.model.Label-">getLabelMapping</a></span>(Label&nbsp;label)</code>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getLabelMapping(org.eclipse.app4mc.amalthea.model.Label)">getLabelMapping</a></span>&#8203;(Label&nbsp;label)</code></th>
+<td class="colLast">
 <div class="block">Set of memories the label is mapped to (should be only one!)</div>
 </td>
 </tr>
 <tr id="i4" class="altColor">
 <td class="colFirst"><code>static Set&lt;Process&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getProcessesMappedToCore-org.eclipse.app4mc.amalthea.model.ProcessingUnit-org.eclipse.app4mc.amalthea.model.Amalthea-">getProcessesMappedToCore</a></span>(ProcessingUnit&nbsp;core,
-                        Amalthea&nbsp;model)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getProcessesMappedToCore(org.eclipse.app4mc.amalthea.model.ProcessingUnit,org.eclipse.app4mc.amalthea.model.Amalthea)">getProcessesMappedToCore</a></span>&#8203;(ProcessingUnit&nbsp;core,
+                        Amalthea&nbsp;model)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i5" class="rowColor">
-<td class="colFirst"><code>List&lt;ProcessingUnitDefinition&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getProcessingUnitDefinitionsForHwCategories-org.eclipse.app4mc.amalthea.model.HwFeatureCategory-java.util.List-">getProcessingUnitDefinitionsForHwCategories</a></span>(HwFeatureCategory&nbsp;hwFeatureCat,
-                                           List&lt;ProcessingUnitDefinition&gt;&nbsp;procUnitDefinitons)</code>&nbsp;</td>
+<td class="colFirst"><code>static List&lt;ProcessingUnitDefinition&gt;</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getProcessingUnitDefinitionsForHwCategories(org.eclipse.app4mc.amalthea.model.HwFeatureCategory,java.util.List)">getProcessingUnitDefinitionsForHwCategories</a></span>&#8203;(HwFeatureCategory&nbsp;hwFeatureCat,
+                                           List&lt;ProcessingUnitDefinition&gt;&nbsp;procUnitDefinitons)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i6" class="altColor">
-<td class="colFirst"><code>List&lt;ProcessingUnitDefinition&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getProcessingUnitDefinitionsForHwFeature-org.eclipse.app4mc.amalthea.model.HwFeature-java.util.List-">getProcessingUnitDefinitionsForHwFeature</a></span>(HwFeature&nbsp;feature,
-                                        List&lt;ProcessingUnitDefinition&gt;&nbsp;procUnitDefinitons)</code>&nbsp;</td>
+<td class="colFirst"><code>static List&lt;ProcessingUnitDefinition&gt;</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getProcessingUnitDefinitionsForHwFeature(org.eclipse.app4mc.amalthea.model.HwFeature,java.util.List)">getProcessingUnitDefinitionsForHwFeature</a></span>&#8203;(HwFeature&nbsp;feature,
+                                        List&lt;ProcessingUnitDefinition&gt;&nbsp;procUnitDefinitons)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i7" class="rowColor">
 <td class="colFirst"><code>static List&lt;TaskAllocation&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getTaskAllocations-org.eclipse.app4mc.amalthea.model.Task-org.eclipse.app4mc.amalthea.model.Amalthea-">getTaskAllocations</a></span>(Task&nbsp;task,
-                  Amalthea&nbsp;model)</code>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getTaskAllocations(org.eclipse.app4mc.amalthea.model.Task,org.eclipse.app4mc.amalthea.model.Amalthea)">getTaskAllocations</a></span>&#8203;(Task&nbsp;task,
+                  Amalthea&nbsp;model)</code></th>
+<td class="colLast">
 <div class="block">Returns a list of all allocations of a task</div>
 </td>
 </tr>
 <tr id="i8" class="altColor">
 <td class="colFirst"><code>static Set&lt;Task&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getTasksMappedToCore-org.eclipse.app4mc.amalthea.model.ProcessingUnit-org.eclipse.app4mc.amalthea.model.Amalthea-">getTasksMappedToCore</a></span>(ProcessingUnit&nbsp;core,
-                    Amalthea&nbsp;model)</code>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getTasksMappedToCore(org.eclipse.app4mc.amalthea.model.ProcessingUnit,org.eclipse.app4mc.amalthea.model.Amalthea)">getTasksMappedToCore</a></span>&#8203;(ProcessingUnit&nbsp;core,
+                    Amalthea&nbsp;model)</code></th>
+<td class="colLast">
 <div class="block">Returns a set of tasks mapped to a core.</div>
 </td>
 </tr>
 <tr id="i9" class="rowColor">
 <td class="colFirst"><code>static boolean</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#isMapped-org.eclipse.app4mc.amalthea.model.Label-">isMapped</a></span>(Label&nbsp;label)</code>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#isMapped(org.eclipse.app4mc.amalthea.model.Label)">isMapped</a></span>&#8203;(Label&nbsp;label)</code></th>
+<td class="colLast">
 <div class="block">Returns true if at least a label mapping exists</div>
 </td>
 </tr>
 <tr id="i10" class="altColor">
 <td class="colFirst"><code>static MemoryMapping</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#setLabelMapping-org.eclipse.app4mc.amalthea.model.Label-org.eclipse.app4mc.amalthea.model.Memory-org.eclipse.app4mc.amalthea.model.Amalthea-">setLabelMapping</a></span>(Label&nbsp;label,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setLabelMapping(org.eclipse.app4mc.amalthea.model.Label,org.eclipse.app4mc.amalthea.model.Memory,org.eclipse.app4mc.amalthea.model.Amalthea)">setLabelMapping</a></span>&#8203;(Label&nbsp;label,
                Memory&nbsp;mem,
-               Amalthea&nbsp;model)</code>
+               Amalthea&nbsp;model)</code></th>
+<td class="colLast">
 <div class="block">Returns a created LabelMapping element which was already added to the model</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.Object">
+<li class="blockList"><a id="methods.inherited.from.class.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;Object</h3>
@@ -141,52 +138,37 @@
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
 <div class="details">
 <ul class="blockList">
 <li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="DeploymentUtil--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>DeploymentUtil</h4>
-<pre>public&nbsp;DeploymentUtil()</pre>
-</li>
-</ul>
-</li>
-</ul>
 <!-- ============ METHOD DETAIL ========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a id="method.detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="getProcessesMappedToCore-org.eclipse.app4mc.amalthea.model.ProcessingUnit-org.eclipse.app4mc.amalthea.model.Amalthea-">
+<a id="getProcessesMappedToCore(org.eclipse.app4mc.amalthea.model.ProcessingUnit,org.eclipse.app4mc.amalthea.model.Amalthea)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getProcessesMappedToCore</h4>
-<pre>public static&nbsp;Set&lt;Process&gt;&nbsp;getProcessesMappedToCore(ProcessingUnit&nbsp;core,
+<pre class="methodSignature">public static&nbsp;Set&lt;Process&gt;&nbsp;getProcessesMappedToCore&#8203;(ProcessingUnit&nbsp;core,
                                                     Amalthea&nbsp;model)</pre>
 </li>
 </ul>
-<a name="getTasksMappedToCore-org.eclipse.app4mc.amalthea.model.ProcessingUnit-org.eclipse.app4mc.amalthea.model.Amalthea-">
+<a id="getTasksMappedToCore(org.eclipse.app4mc.amalthea.model.ProcessingUnit,org.eclipse.app4mc.amalthea.model.Amalthea)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getTasksMappedToCore</h4>
-<pre>public static&nbsp;Set&lt;Task&gt;&nbsp;getTasksMappedToCore(ProcessingUnit&nbsp;core,
+<pre class="methodSignature">public static&nbsp;Set&lt;Task&gt;&nbsp;getTasksMappedToCore&#8203;(ProcessingUnit&nbsp;core,
                                              Amalthea&nbsp;model)</pre>
 <div class="block">Returns a set of tasks mapped to a core. Depends on responsibilities of
  schedulers and the task allocated to them Assumption: Scheduler
@@ -198,13 +180,13 @@
 </dl>
 </li>
 </ul>
-<a name="getISRsMappedToCore-org.eclipse.app4mc.amalthea.model.ProcessingUnit-org.eclipse.app4mc.amalthea.model.Amalthea-">
+<a id="getISRsMappedToCore(org.eclipse.app4mc.amalthea.model.ProcessingUnit,org.eclipse.app4mc.amalthea.model.Amalthea)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getISRsMappedToCore</h4>
-<pre>public static&nbsp;Set&lt;ISR&gt;&nbsp;getISRsMappedToCore(ProcessingUnit&nbsp;core,
+<pre class="methodSignature">public static&nbsp;Set&lt;ISR&gt;&nbsp;getISRsMappedToCore&#8203;(ProcessingUnit&nbsp;core,
                                            Amalthea&nbsp;model)</pre>
 <div class="block">Returns a set of all ISR mapped to that core</div>
 <dl>
@@ -213,13 +195,13 @@
 </dl>
 </li>
 </ul>
-<a name="getTaskAllocations-org.eclipse.app4mc.amalthea.model.Task-org.eclipse.app4mc.amalthea.model.Amalthea-">
+<a id="getTaskAllocations(org.eclipse.app4mc.amalthea.model.Task,org.eclipse.app4mc.amalthea.model.Amalthea)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getTaskAllocations</h4>
-<pre>public static&nbsp;List&lt;TaskAllocation&gt;&nbsp;getTaskAllocations(Task&nbsp;task,
+<pre class="methodSignature">public static&nbsp;List&lt;TaskAllocation&gt;&nbsp;getTaskAllocations&#8203;(Task&nbsp;task,
                                                       Amalthea&nbsp;model)</pre>
 <div class="block">Returns a list of all allocations of a task</div>
 <dl>
@@ -228,23 +210,23 @@
 </dl>
 </li>
 </ul>
-<a name="isMapped-org.eclipse.app4mc.amalthea.model.Label-">
+<a id="isMapped(org.eclipse.app4mc.amalthea.model.Label)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>isMapped</h4>
-<pre>public static&nbsp;boolean&nbsp;isMapped(Label&nbsp;label)</pre>
+<pre class="methodSignature">public static&nbsp;boolean&nbsp;isMapped&#8203;(Label&nbsp;label)</pre>
 <div class="block">Returns true if at least a label mapping exists</div>
 </li>
 </ul>
-<a name="getLabelMapping-org.eclipse.app4mc.amalthea.model.Label-">
+<a id="getLabelMapping(org.eclipse.app4mc.amalthea.model.Label)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getLabelMapping</h4>
-<pre>public static&nbsp;Set&lt;Memory&gt;&nbsp;getLabelMapping(Label&nbsp;label)</pre>
+<pre class="methodSignature">public static&nbsp;Set&lt;Memory&gt;&nbsp;getLabelMapping&#8203;(Label&nbsp;label)</pre>
 <div class="block">Set of memories the label is mapped to (should be only one!)</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -252,13 +234,13 @@
 </dl>
 </li>
 </ul>
-<a name="setLabelMapping-org.eclipse.app4mc.amalthea.model.Label-org.eclipse.app4mc.amalthea.model.Memory-org.eclipse.app4mc.amalthea.model.Amalthea-">
+<a id="setLabelMapping(org.eclipse.app4mc.amalthea.model.Label,org.eclipse.app4mc.amalthea.model.Memory,org.eclipse.app4mc.amalthea.model.Amalthea)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>setLabelMapping</h4>
-<pre>public static&nbsp;MemoryMapping&nbsp;setLabelMapping(Label&nbsp;label,
+<pre class="methodSignature">public static&nbsp;MemoryMapping&nbsp;setLabelMapping&#8203;(Label&nbsp;label,
                                             Memory&nbsp;mem,
                                             Amalthea&nbsp;model)</pre>
 <div class="block">Returns a created LabelMapping element which was already added to the model</div>
@@ -268,13 +250,13 @@
 </dl>
 </li>
 </ul>
-<a name="getAssignedCoreForProcess-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.app4mc.amalthea.model.Amalthea-">
+<a id="getAssignedCoreForProcess(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.app4mc.amalthea.model.Amalthea)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getAssignedCoreForProcess</h4>
-<pre>public static&nbsp;Set&lt;ProcessingUnit&gt;&nbsp;getAssignedCoreForProcess(Process&nbsp;process,
+<pre class="methodSignature">public static&nbsp;Set&lt;ProcessingUnit&gt;&nbsp;getAssignedCoreForProcess&#8203;(Process&nbsp;process,
                                                             Amalthea&nbsp;model)</pre>
 <div class="block">Returns the cores the process is assigned to. Empty core affinities are
  ignored, otherwise the intersection of core affinity and scheduler
@@ -288,27 +270,27 @@
 </dl>
 </li>
 </ul>
-<a name="getFeatureCategories-org.eclipse.app4mc.amalthea.model.ProcessingUnitDefinition-">
+<a id="getFeatureCategories(org.eclipse.app4mc.amalthea.model.ProcessingUnitDefinition)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getFeatureCategories</h4>
-<pre>public&nbsp;List&lt;HwFeatureCategory&gt;&nbsp;getFeatureCategories(ProcessingUnitDefinition&nbsp;procUnitDef)</pre>
+<pre class="methodSignature">public static&nbsp;List&lt;HwFeatureCategory&gt;&nbsp;getFeatureCategories&#8203;(ProcessingUnitDefinition&nbsp;procUnitDef)</pre>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>procUnitDef</code> - processing unit definition</dd>
 </dl>
 </li>
 </ul>
-<a name="getProcessingUnitDefinitionsForHwCategories-org.eclipse.app4mc.amalthea.model.HwFeatureCategory-java.util.List-">
+<a id="getProcessingUnitDefinitionsForHwCategories(org.eclipse.app4mc.amalthea.model.HwFeatureCategory,java.util.List)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getProcessingUnitDefinitionsForHwCategories</h4>
-<pre>public&nbsp;List&lt;ProcessingUnitDefinition&gt;&nbsp;getProcessingUnitDefinitionsForHwCategories(HwFeatureCategory&nbsp;hwFeatureCat,
-                                                                                  List&lt;ProcessingUnitDefinition&gt;&nbsp;procUnitDefinitons)</pre>
+<pre class="methodSignature">public static&nbsp;List&lt;ProcessingUnitDefinition&gt;&nbsp;getProcessingUnitDefinitionsForHwCategories&#8203;(HwFeatureCategory&nbsp;hwFeatureCat,
+                                                                                         List&lt;ProcessingUnitDefinition&gt;&nbsp;procUnitDefinitons)</pre>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>hwFeatureCat</code> - selection criteria</dd>
@@ -316,14 +298,14 @@
 </dl>
 </li>
 </ul>
-<a name="getProcessingUnitDefinitionsForHwFeature-org.eclipse.app4mc.amalthea.model.HwFeature-java.util.List-">
+<a id="getProcessingUnitDefinitionsForHwFeature(org.eclipse.app4mc.amalthea.model.HwFeature,java.util.List)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getProcessingUnitDefinitionsForHwFeature</h4>
-<pre>public&nbsp;List&lt;ProcessingUnitDefinition&gt;&nbsp;getProcessingUnitDefinitionsForHwFeature(HwFeature&nbsp;feature,
-                                                                               List&lt;ProcessingUnitDefinition&gt;&nbsp;procUnitDefinitons)</pre>
+<pre class="methodSignature">public static&nbsp;List&lt;ProcessingUnitDefinition&gt;&nbsp;getProcessingUnitDefinitionsForHwFeature&#8203;(HwFeature&nbsp;feature,
+                                                                                      List&lt;ProcessingUnitDefinition&gt;&nbsp;procUnitDefinitons)</pre>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>feature</code> - selection criteria</dd>
@@ -333,10 +315,12 @@
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
 </div>
+</main>
 <!-- ========= END OF CLASS DATA ========= -->
 </body>
 </html>
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 d34cbfa..1cd97ad 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
@@ -1,16 +1,18 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML>
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
+<!-- Generated by javadoc (11.0.8) on Mon Nov 30 13:15:36 CET 2020 -->
 <title>FactoryUtil</title>
-<meta name="date" content="2019-07-31">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-11-30">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
 <!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
 <div class="header">
-<div class="subTitle">org.eclipse.app4mc.amalthea.model.util</div>
+<div class="subTitle"><span class="packageLabelInType">Package</span>&nbsp;<a href="package-summary.html">org.eclipse.app4mc.amalthea.model.util</a></div>
 <h2 title="Class FactoryUtil" class="title">Class FactoryUtil</h2>
 </div>
 <div class="contentContainer">
@@ -26,7 +28,6 @@
 <ul class="blockList">
 <li class="blockList">
 <hr>
-<br>
 <pre>public class <span class="typeNameLabel">FactoryUtil</span>
 extends Object</pre>
 </li>
@@ -35,250 +36,269 @@
 <div class="summary">
 <ul class="blockList">
 <li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="#FactoryUtil--">FactoryUtil</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
 <!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a id="method.summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<table class="memberSummary">
 <caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">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,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#createClockStep(double,org.eclipse.app4mc.amalthea.model.FrequencyUnit,long,java.lang.String)">createClockStep</a></span>&#8203;(double&nbsp;freqValue,
                FrequencyUnit&nbsp;freqUnit,
                long&nbsp;timeValue,
-               String&nbsp;timeUnit)</code>&nbsp;</td>
+               String&nbsp;timeUnit)</code></th>
+<td class="colLast">&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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#createCounter(long)">createCounter</a></span>&#8203;(long&nbsp;prescaler)</code></th>
+<td class="colLast">
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#createCounter(long,long)">createCounter</a></span>&#8203;(long&nbsp;prescaler,
+             long&nbsp;offset)</code></th>
+<td class="colLast">
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#createDataRate()">createDataRate</a></span>()</code></th>
+<td class="colLast">
 <div class="block">Creates a data rate (initialized with zero value and base unit)</div>
 </td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#createDataRate(long,org.eclipse.app4mc.amalthea.model.DataRateUnit)">createDataRate</a></span>&#8203;(long&nbsp;value,
+              DataRateUnit&nbsp;unit)</code></th>
+<td class="colLast">
 <div class="block">Creates a data rate out of a value and a unit</div>
 </td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#createDataSize()">createDataSize</a></span>()</code></th>
+<td class="colLast">
 <div class="block">Creates a data size (initialized with zero value and base unit)</div>
 </td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#createDataSize(long,org.eclipse.app4mc.amalthea.model.DataSizeUnit)">createDataSize</a></span>&#8203;(long&nbsp;value,
+              DataSizeUnit&nbsp;unit)</code></th>
+<td class="colLast">
 <div class="block">Creates a data size out of a value and a unit</div>
 </td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#createDiscreteValueBoundaries(long,long)">createDiscreteValueBoundaries</a></span>&#8203;(long&nbsp;min,
+                             long&nbsp;max)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#createDiscreteValueConstant(long)">createDiscreteValueConstant</a></span>&#8203;(long&nbsp;value)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#createDiscreteValueGaussDistribution(double,double)">createDiscreteValueGaussDistribution</a></span>&#8203;(double&nbsp;mean,
+                                    double&nbsp;sd)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <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,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#createDiscreteValueGaussDistribution(double,double,java.lang.Long,java.lang.Long)">createDiscreteValueGaussDistribution</a></span>&#8203;(double&nbsp;mean,
                                     double&nbsp;sd,
                                     Long&nbsp;min,
-                                    Long&nbsp;max)</code>&nbsp;</td>
+                                    Long&nbsp;max)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#createExecutionNeed(java.lang.String,org.eclipse.app4mc.amalthea.model.IDiscreteValueDeviation)">createExecutionNeed</a></span>&#8203;(String&nbsp;featureCategory,
+                   IDiscreteValueDeviation&nbsp;usages)</code></th>
+<td class="colLast">
+<div class="block">Creates ExecutionNeed for a featureCategoryName, need set.</div>
 </td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#createExecutionNeed(org.eclipse.app4mc.amalthea.model.HwFeature,org.eclipse.app4mc.amalthea.model.IDiscreteValueDeviation)">createExecutionNeed</a></span>&#8203;(HwFeature&nbsp;feature,
+                   IDiscreteValueDeviation&nbsp;usages)</code></th>
+<td class="colLast">
+<div class="block">Creates ExecutionNeed for a feature, need set.</div>
 </td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#createFrequency()">createFrequency</a></span>()</code></th>
+<td class="colLast">
 <div class="block">Creates a frequency (initialized with zero value and base unit)</div>
 </td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#createFrequency(double,org.eclipse.app4mc.amalthea.model.FrequencyUnit)">createFrequency</a></span>&#8203;(double&nbsp;value,
+               FrequencyUnit&nbsp;unit)</code></th>
+<td class="colLast">
 <div class="block">Creates a frequency out of a value and a unit</div>
 </td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#createLatency(long)">createLatency</a></span>&#8203;(long&nbsp;value)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#createTime()">createTime</a></span>()</code></th>
+<td class="colLast">
 <div class="block">Creates a time (initialized with zero value and base unit)</div>
 </td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#createTime(double,java.lang.String)">createTime</a></span>&#8203;(double&nbsp;value,
+          String&nbsp;unit)</code></th>
+<td class="colLast">
 <div class="block">Creates a time out of a value and a unit given as String.</div>
 </td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#createTime(double,org.eclipse.app4mc.amalthea.model.TimeUnit)">createTime</a></span>&#8203;(double&nbsp;value,
+          TimeUnit&nbsp;unit)</code></th>
+<td class="colLast">
+<div class="block">Creates a time out of a value and a unit (converted to pico seconds)</div>
 </td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#createTime(long,java.lang.String)">createTime</a></span>&#8203;(long&nbsp;value,
+          String&nbsp;unit)</code></th>
+<td class="colLast">
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#createTime(long,org.eclipse.app4mc.amalthea.model.TimeUnit)">createTime</a></span>&#8203;(long&nbsp;value,
+          TimeUnit&nbsp;unit)</code></th>
+<td class="colLast">
+<div class="block">Creates a time out of a value and a unit</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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#createTime(java.lang.String)">createTime</a></span>&#8203;(String&nbsp;timeString)</code></th>
+<td class="colLast">
+<div class="block">Creates a Time object parsed from a text representation.</div>
 </td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#createTime(java.math.BigInteger,java.lang.String)">createTime</a></span>&#8203;(BigInteger&nbsp;value,
+          String&nbsp;unit)</code></th>
+<td class="colLast">
+<div class="block">Creates a time out of a value and a unit given as String.</div>
 </td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#createTime(java.math.BigInteger,org.eclipse.app4mc.amalthea.model.TimeUnit)">createTime</a></span>&#8203;(BigInteger&nbsp;value,
+          TimeUnit&nbsp;unit)</code></th>
+<td class="colLast">
+<div class="block">Creates a time out of a value and a unit</div>
 </td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#createTime(org.eclipse.app4mc.amalthea.model.Time)">createTime</a></span>&#8203;(Time&nbsp;inputTime)</code></th>
+<td class="colLast">
 <div class="block">Creates a new time based on a time</div>
 </td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#createTimeBoundaries(org.eclipse.app4mc.amalthea.model.Time,org.eclipse.app4mc.amalthea.model.Time)">createTimeBoundaries</a></span>&#8203;(Time&nbsp;min,
+                    Time&nbsp;max)</code></th>
+<td class="colLast">&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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#createTimeConstant(org.eclipse.app4mc.amalthea.model.Time)">createTimeConstant</a></span>&#8203;(Time&nbsp;value)</code></th>
+<td class="colLast">&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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#createTimeGaussDistribution(org.eclipse.app4mc.amalthea.model.Time,org.eclipse.app4mc.amalthea.model.Time)">createTimeGaussDistribution</a></span>&#8203;(Time&nbsp;mean,
+                           Time&nbsp;sd)</code></th>
+<td class="colLast">&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,
+<th class="colSecond" scope="row"><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>&#8203;(Time&nbsp;mean,
                            Time&nbsp;sd,
                            Time&nbsp;min,
-                           Time&nbsp;max)</code>&nbsp;</td>
+                           Time&nbsp;max)</code></th>
+<td class="colLast">&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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#createTypeRef(org.eclipse.app4mc.amalthea.model.TypeDefinition)">createTypeRef</a></span>&#8203;(TypeDefinition&nbsp;typeDefinition)</code></th>
+<td class="colLast">
 <div class="block">Creates a TypeRef object that refers to a type definition</div>
 </td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#createVoltage()">createVoltage</a></span>()</code></th>
+<td class="colLast">
 <div class="block">Creates a voltage (initialized with zero value and base unit)</div>
 </td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#createVoltage(double,org.eclipse.app4mc.amalthea.model.VoltageUnit)">createVoltage</a></span>&#8203;(double&nbsp;value,
+             VoltageUnit&nbsp;unit)</code></th>
+<td class="colLast">
 <div class="block">Creates a voltage out of a value and a unit</div>
 </td>
 </tr>
 <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,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#createWeibullDistribution(long,double,long,double)">createWeibullDistribution</a></span>&#8203;(long&nbsp;min,
                          double&nbsp;avg,
                          long&nbsp;max,
-                         double&nbsp;promille)</code>&nbsp;</td>
+                         double&nbsp;promille)</code></th>
+<td class="colLast">&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,
+<th class="colSecond" scope="row"><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>&#8203;(Time&nbsp;min,
                          Time&nbsp;avg,
                          Time&nbsp;max,
-                         double&nbsp;promille)</code>&nbsp;</td>
+                         double&nbsp;promille)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.Object">
+<li class="blockList"><a id="methods.inherited.from.class.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;Object</h3>
@@ -286,157 +306,142 @@
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
 <div class="details">
 <ul class="blockList">
 <li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="FactoryUtil--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>FactoryUtil</h4>
-<pre>public&nbsp;FactoryUtil()</pre>
-</li>
-</ul>
-</li>
-</ul>
 <!-- ============ METHOD DETAIL ========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a id="method.detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="createCounter-long-">
+<a id="createCounter(long)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>createCounter</h4>
-<pre>public static&nbsp;Counter&nbsp;createCounter(long&nbsp;prescaler)</pre>
+<pre class="methodSignature">public static&nbsp;Counter&nbsp;createCounter&#8203;(long&nbsp;prescaler)</pre>
 <div class="block">Creates a counter (with offset = 0)</div>
 </li>
 </ul>
-<a name="createCounter-long-long-">
+<a id="createCounter(long,long)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>createCounter</h4>
-<pre>public static&nbsp;Counter&nbsp;createCounter(long&nbsp;prescaler,
+<pre class="methodSignature">public static&nbsp;Counter&nbsp;createCounter&#8203;(long&nbsp;prescaler,
                                     long&nbsp;offset)</pre>
 <div class="block">Creates a counter</div>
 </li>
 </ul>
-<a name="createDataSize--">
+<a id="createDataSize()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>createDataSize</h4>
-<pre>public static&nbsp;DataSize&nbsp;createDataSize()</pre>
+<pre class="methodSignature">public static&nbsp;DataSize&nbsp;createDataSize()</pre>
 <div class="block">Creates a data size (initialized with zero value and base unit)</div>
 </li>
 </ul>
-<a name="createDataSize-long-org.eclipse.app4mc.amalthea.model.DataSizeUnit-">
+<a id="createDataSize(long,org.eclipse.app4mc.amalthea.model.DataSizeUnit)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>createDataSize</h4>
-<pre>public static&nbsp;DataSize&nbsp;createDataSize(long&nbsp;value,
+<pre class="methodSignature">public static&nbsp;DataSize&nbsp;createDataSize&#8203;(long&nbsp;value,
                                       DataSizeUnit&nbsp;unit)</pre>
 <div class="block">Creates a data size out of a value and a unit</div>
 </li>
 </ul>
-<a name="createDataRate--">
+<a id="createDataRate()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>createDataRate</h4>
-<pre>public static&nbsp;DataRate&nbsp;createDataRate()</pre>
+<pre class="methodSignature">public static&nbsp;DataRate&nbsp;createDataRate()</pre>
 <div class="block">Creates a data rate (initialized with zero value and base unit)</div>
 </li>
 </ul>
-<a name="createDataRate-long-org.eclipse.app4mc.amalthea.model.DataRateUnit-">
+<a id="createDataRate(long,org.eclipse.app4mc.amalthea.model.DataRateUnit)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>createDataRate</h4>
-<pre>public static&nbsp;DataRate&nbsp;createDataRate(long&nbsp;value,
+<pre class="methodSignature">public static&nbsp;DataRate&nbsp;createDataRate&#8203;(long&nbsp;value,
                                       DataRateUnit&nbsp;unit)</pre>
 <div class="block">Creates a data rate out of a value and a unit</div>
 </li>
 </ul>
-<a name="createFrequency--">
+<a id="createFrequency()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>createFrequency</h4>
-<pre>public static&nbsp;Frequency&nbsp;createFrequency()</pre>
+<pre class="methodSignature">public static&nbsp;Frequency&nbsp;createFrequency()</pre>
 <div class="block">Creates a frequency (initialized with zero value and base unit)</div>
 </li>
 </ul>
-<a name="createFrequency-double-org.eclipse.app4mc.amalthea.model.FrequencyUnit-">
+<a id="createFrequency(double,org.eclipse.app4mc.amalthea.model.FrequencyUnit)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>createFrequency</h4>
-<pre>public static&nbsp;Frequency&nbsp;createFrequency(double&nbsp;value,
+<pre class="methodSignature">public static&nbsp;Frequency&nbsp;createFrequency&#8203;(double&nbsp;value,
                                         FrequencyUnit&nbsp;unit)</pre>
 <div class="block">Creates a frequency out of a value and a unit</div>
 </li>
 </ul>
-<a name="createVoltage--">
+<a id="createVoltage()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>createVoltage</h4>
-<pre>public static&nbsp;Voltage&nbsp;createVoltage()</pre>
+<pre class="methodSignature">public static&nbsp;Voltage&nbsp;createVoltage()</pre>
 <div class="block">Creates a voltage (initialized with zero value and base unit)</div>
 </li>
 </ul>
-<a name="createVoltage-double-org.eclipse.app4mc.amalthea.model.VoltageUnit-">
+<a id="createVoltage(double,org.eclipse.app4mc.amalthea.model.VoltageUnit)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>createVoltage</h4>
-<pre>public static&nbsp;Voltage&nbsp;createVoltage(double&nbsp;value,
+<pre class="methodSignature">public static&nbsp;Voltage&nbsp;createVoltage&#8203;(double&nbsp;value,
                                     VoltageUnit&nbsp;unit)</pre>
 <div class="block">Creates a voltage out of a value and a unit</div>
 </li>
 </ul>
-<a name="createTime--">
+<a id="createTime()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>createTime</h4>
-<pre>public static&nbsp;Time&nbsp;createTime()</pre>
+<pre class="methodSignature">public static&nbsp;Time&nbsp;createTime()</pre>
 <div class="block">Creates a time (initialized with zero value and base unit)</div>
 </li>
 </ul>
-<a name="createTime-org.eclipse.app4mc.amalthea.model.Time-">
+<a id="createTime(org.eclipse.app4mc.amalthea.model.Time)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>createTime</h4>
-<pre>public static&nbsp;Time&nbsp;createTime(Time&nbsp;inputTime)</pre>
+<pre class="methodSignature">public static&nbsp;Time&nbsp;createTime&#8203;(Time&nbsp;inputTime)</pre>
 <div class="block">Creates a new time based on a time</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -446,79 +451,79 @@
 </dl>
 </li>
 </ul>
-<a name="createTime-long-org.eclipse.app4mc.amalthea.model.TimeUnit-">
+<a id="createTime(long,org.eclipse.app4mc.amalthea.model.TimeUnit)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>createTime</h4>
-<pre>public static&nbsp;Time&nbsp;createTime(long&nbsp;value,
+<pre class="methodSignature">public static&nbsp;Time&nbsp;createTime&#8203;(long&nbsp;value,
                               TimeUnit&nbsp;unit)</pre>
 <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 id="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,
+<pre class="methodSignature">public static&nbsp;Time&nbsp;createTime&#8203;(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 id="createTime(java.math.BigInteger,org.eclipse.app4mc.amalthea.model.TimeUnit)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>createTime</h4>
-<pre>public static&nbsp;Time&nbsp;createTime(BigInteger&nbsp;value,
+<pre class="methodSignature">public static&nbsp;Time&nbsp;createTime&#8203;(BigInteger&nbsp;value,
                               TimeUnit&nbsp;unit)</pre>
 <div class="block">Creates a time out of a value and a unit</div>
 </li>
 </ul>
-<a name="createTime-long-java.lang.String-">
+<a id="createTime(long,java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>createTime</h4>
-<pre>public static&nbsp;Time&nbsp;createTime(long&nbsp;value,
+<pre class="methodSignature">public static&nbsp;Time&nbsp;createTime&#8203;(long&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-double-java.lang.String-">
+<a id="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,
+<pre class="methodSignature">public static&nbsp;Time&nbsp;createTime&#8203;(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 id="createTime(java.math.BigInteger,java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>createTime</h4>
-<pre>public static&nbsp;Time&nbsp;createTime(BigInteger&nbsp;value,
+<pre class="methodSignature">public static&nbsp;Time&nbsp;createTime&#8203;(BigInteger&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.lang.String-">
+<a id="createTime(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>createTime</h4>
-<pre>public static&nbsp;Time&nbsp;createTime(String&nbsp;timeString)</pre>
+<pre class="methodSignature">public static&nbsp;Time&nbsp;createTime&#8203;(String&nbsp;timeString)</pre>
 <div class="block">Creates a Time object parsed from a text representation.</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -528,171 +533,173 @@
 </dl>
 </li>
 </ul>
-<a name="createClockStep-double-org.eclipse.app4mc.amalthea.model.FrequencyUnit-long-java.lang.String-">
+<a id="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,
+<pre class="methodSignature">public static&nbsp;ClockStep&nbsp;createClockStep&#8203;(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 id="createTypeRef(org.eclipse.app4mc.amalthea.model.TypeDefinition)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>createTypeRef</h4>
-<pre>public static&nbsp;TypeRef&nbsp;createTypeRef(TypeDefinition&nbsp;typeDefinition)</pre>
+<pre class="methodSignature">public static&nbsp;TypeRef&nbsp;createTypeRef&#8203;(TypeDefinition&nbsp;typeDefinition)</pre>
 <div class="block">Creates a TypeRef object that refers to a type definition</div>
 </li>
 </ul>
-<a name="createDiscreteValueConstant-long-">
+<a id="createDiscreteValueConstant(long)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>createDiscreteValueConstant</h4>
-<pre>public static&nbsp;DiscreteValueConstant&nbsp;createDiscreteValueConstant(long&nbsp;value)</pre>
+<pre class="methodSignature">public static&nbsp;DiscreteValueConstant&nbsp;createDiscreteValueConstant&#8203;(long&nbsp;value)</pre>
 </li>
 </ul>
-<a name="createDiscreteValueBoundaries-long-long-">
+<a id="createDiscreteValueBoundaries(long,long)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>createDiscreteValueBoundaries</h4>
-<pre>public static&nbsp;DiscreteValueBoundaries&nbsp;createDiscreteValueBoundaries(long&nbsp;min,
+<pre class="methodSignature">public static&nbsp;DiscreteValueBoundaries&nbsp;createDiscreteValueBoundaries&#8203;(long&nbsp;min,
                                                                     long&nbsp;max)</pre>
 </li>
 </ul>
-<a name="createDiscreteValueGaussDistribution-double-double-">
+<a id="createDiscreteValueGaussDistribution(double,double)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>createDiscreteValueGaussDistribution</h4>
-<pre>public static&nbsp;DiscreteValueGaussDistribution&nbsp;createDiscreteValueGaussDistribution(double&nbsp;mean,
+<pre class="methodSignature">public static&nbsp;DiscreteValueGaussDistribution&nbsp;createDiscreteValueGaussDistribution&#8203;(double&nbsp;mean,
                                                                                   double&nbsp;sd)</pre>
 </li>
 </ul>
-<a name="createDiscreteValueGaussDistribution-double-double-java.lang.Long-java.lang.Long-">
+<a id="createDiscreteValueGaussDistribution(double,double,java.lang.Long,java.lang.Long)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>createDiscreteValueGaussDistribution</h4>
-<pre>public static&nbsp;DiscreteValueGaussDistribution&nbsp;createDiscreteValueGaussDistribution(double&nbsp;mean,
+<pre class="methodSignature">public static&nbsp;DiscreteValueGaussDistribution&nbsp;createDiscreteValueGaussDistribution&#8203;(double&nbsp;mean,
                                                                                   double&nbsp;sd,
                                                                                   Long&nbsp;min,
                                                                                   Long&nbsp;max)</pre>
 </li>
 </ul>
-<a name="createWeibullDistribution-long-double-long-double-">
+<a id="createWeibullDistribution(long,double,long,double)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>createWeibullDistribution</h4>
-<pre>public static&nbsp;DiscreteValueWeibullEstimatorsDistribution&nbsp;createWeibullDistribution(long&nbsp;min,
+<pre class="methodSignature">public static&nbsp;DiscreteValueWeibullEstimatorsDistribution&nbsp;createWeibullDistribution&#8203;(long&nbsp;min,
                                                                                    double&nbsp;avg,
                                                                                    long&nbsp;max,
                                                                                    double&nbsp;promille)</pre>
 </li>
 </ul>
-<a name="createTimeConstant-org.eclipse.app4mc.amalthea.model.Time-">
+<a id="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>
+<pre class="methodSignature">public static&nbsp;TimeConstant&nbsp;createTimeConstant&#8203;(Time&nbsp;value)</pre>
 </li>
 </ul>
-<a name="createTimeBoundaries-org.eclipse.app4mc.amalthea.model.Time-org.eclipse.app4mc.amalthea.model.Time-">
+<a id="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,
+<pre class="methodSignature">public static&nbsp;TimeBoundaries&nbsp;createTimeBoundaries&#8203;(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 id="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,
+<pre class="methodSignature">public static&nbsp;TimeGaussDistribution&nbsp;createTimeGaussDistribution&#8203;(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 id="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,
+<pre class="methodSignature">public static&nbsp;TimeGaussDistribution&nbsp;createTimeGaussDistribution&#8203;(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 id="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,
+<pre class="methodSignature">public static&nbsp;TimeWeibullEstimatorsDistribution&nbsp;createWeibullDistribution&#8203;(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 id="createExecutionNeed(java.lang.String,org.eclipse.app4mc.amalthea.model.IDiscreteValueDeviation)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>createExecutionNeed</h4>
-<pre>public static&nbsp;ExecutionNeed&nbsp;createExecutionNeed(String&nbsp;featureCategory,
+<pre class="methodSignature">public static&nbsp;ExecutionNeed&nbsp;createExecutionNeed&#8203;(String&nbsp;featureCategory,
                                                 IDiscreteValueDeviation&nbsp;usages)</pre>
 <div class="block">Creates ExecutionNeed for a featureCategoryName, need set.</div>
 </li>
 </ul>
-<a name="createExecutionNeed-org.eclipse.app4mc.amalthea.model.HwFeature-org.eclipse.app4mc.amalthea.model.IDiscreteValueDeviation-">
+<a id="createExecutionNeed(org.eclipse.app4mc.amalthea.model.HwFeature,org.eclipse.app4mc.amalthea.model.IDiscreteValueDeviation)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>createExecutionNeed</h4>
-<pre>public static&nbsp;ExecutionNeed&nbsp;createExecutionNeed(HwFeature&nbsp;feature,
+<pre class="methodSignature">public static&nbsp;ExecutionNeed&nbsp;createExecutionNeed&#8203;(HwFeature&nbsp;feature,
                                                 IDiscreteValueDeviation&nbsp;usages)</pre>
 <div class="block">Creates ExecutionNeed for a feature, need set.</div>
 </li>
 </ul>
-<a name="createLatency-long-">
+<a id="createLatency(long)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>createLatency</h4>
-<pre>public static&nbsp;DiscreteValueConstant&nbsp;createLatency(long&nbsp;value)</pre>
+<pre class="methodSignature">public static&nbsp;DiscreteValueConstant&nbsp;createLatency&#8203;(long&nbsp;value)</pre>
 </li>
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
 </div>
+</main>
 <!-- ========= END OF CLASS DATA ========= -->
 </body>
 </html>
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 7fffd85..9a19ade 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
@@ -1,16 +1,18 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML>
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
+<!-- Generated by javadoc (11.0.8) on Mon Nov 30 13:15:36 CET 2020 -->
 <title>HardwareUtil</title>
-<meta name="date" content="2019-07-31">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-11-30">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
 <!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
 <div class="header">
-<div class="subTitle">org.eclipse.app4mc.amalthea.model.util</div>
+<div class="subTitle"><span class="packageLabelInType">Package</span>&nbsp;<a href="package-summary.html">org.eclipse.app4mc.amalthea.model.util</a></div>
 <h2 title="Class HardwareUtil" class="title">Class HardwareUtil</h2>
 </div>
 <div class="contentContainer">
@@ -26,7 +28,6 @@
 <ul class="blockList">
 <li class="blockList">
 <hr>
-<br>
 <pre>public class <span class="typeNameLabel">HardwareUtil</span>
 extends Object</pre>
 </li>
@@ -35,109 +36,107 @@
 <div class="summary">
 <ul class="blockList">
 <li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="#HardwareUtil--">HardwareUtil</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
 <!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a id="method.summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<table class="memberSummary">
 <caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>static Time</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#calculateHwAccessPathTime-org.eclipse.app4mc.amalthea.model.HwAccessElement-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.AccessDirection-">calculateHwAccessPathTime</a></span>(HwAccessElement&nbsp;accessElement,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#calculateHwAccessPathTime(org.eclipse.app4mc.amalthea.model.HwAccessElement,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.AccessDirection)">calculateHwAccessPathTime</a></span>&#8203;(HwAccessElement&nbsp;accessElement,
                          <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;timeType,
-                         <a href="RuntimeUtil.AccessDirection.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.AccessDirection</a>&nbsp;direction)</code>&nbsp;</td>
+                         <a href="RuntimeUtil.AccessDirection.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.AccessDirection</a>&nbsp;direction)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>static Long</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#calculateLatency-org.eclipse.app4mc.amalthea.model.IDiscreteValueDeviation-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType-">calculateLatency</a></span>(IDiscreteValueDeviation&nbsp;latency,
-                <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;timeType)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#calculateLatency(org.eclipse.app4mc.amalthea.model.IDiscreteValueDeviation,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType)">calculateLatency</a></span>&#8203;(IDiscreteValueDeviation&nbsp;latency,
+                <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;timeType)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i2" class="altColor">
 <td class="colFirst"><code>static Time</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#calculateLatencyPathTime-org.eclipse.app4mc.amalthea.model.HwAccessElement-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.AccessDirection-">calculateLatencyPathTime</a></span>(HwAccessElement&nbsp;accessElement,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#calculateLatencyPathTime(org.eclipse.app4mc.amalthea.model.HwAccessElement,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.AccessDirection)">calculateLatencyPathTime</a></span>&#8203;(HwAccessElement&nbsp;accessElement,
                         <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;timeType,
-                        <a href="RuntimeUtil.AccessDirection.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.AccessDirection</a>&nbsp;direction)</code>&nbsp;</td>
+                        <a href="RuntimeUtil.AccessDirection.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.AccessDirection</a>&nbsp;direction)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i3" class="rowColor">
 <td class="colFirst"><code>static List&lt;HwAccessElement&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getAccessElementsToDestination-org.eclipse.app4mc.amalthea.model.HwDestination-org.eclipse.app4mc.amalthea.model.Amalthea-">getAccessElementsToDestination</a></span>(HwDestination&nbsp;dest,
-                              Amalthea&nbsp;model)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getAccessElementsToDestination(org.eclipse.app4mc.amalthea.model.HwDestination,org.eclipse.app4mc.amalthea.model.Amalthea)">getAccessElementsToDestination</a></span>&#8203;(HwDestination&nbsp;dest,
+                              Amalthea&nbsp;model)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i4" class="altColor">
-<td class="colFirst"><code>static Map&lt;ProcessingUnit,HashMap&lt;HwDestination,Time&gt;&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getAccessTimes-org.eclipse.app4mc.amalthea.model.Amalthea-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.AccessDirection-">getAccessTimes</a></span>(Amalthea&nbsp;model,
+<td class="colFirst"><code>static Map&lt;ProcessingUnit,&#8203;HashMap&lt;HwDestination,&#8203;Time&gt;&gt;</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getAccessTimes(org.eclipse.app4mc.amalthea.model.Amalthea,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.AccessDirection)">getAccessTimes</a></span>&#8203;(Amalthea&nbsp;model,
               <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;timeType,
-              <a href="RuntimeUtil.AccessDirection.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.AccessDirection</a>&nbsp;direction)</code>&nbsp;</td>
+              <a href="RuntimeUtil.AccessDirection.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.AccessDirection</a>&nbsp;direction)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i5" class="rowColor">
 <td class="colFirst"><code>static List&lt;ProcessingUnit&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getAllProcessingUnitsForProcessingUnitDefinition-org.eclipse.app4mc.amalthea.model.Amalthea-org.eclipse.app4mc.amalthea.model.ProcessingUnitDefinition-">getAllProcessingUnitsForProcessingUnitDefinition</a></span>(Amalthea&nbsp;model,
-                                                ProcessingUnitDefinition&nbsp;puDef)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getAllProcessingUnitsForProcessingUnitDefinition(org.eclipse.app4mc.amalthea.model.Amalthea,org.eclipse.app4mc.amalthea.model.ProcessingUnitDefinition)">getAllProcessingUnitsForProcessingUnitDefinition</a></span>&#8203;(Amalthea&nbsp;model,
+                                                ProcessingUnitDefinition&nbsp;puDef)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i6" class="altColor">
 <td class="colFirst"><code>static Frequency</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getFrequencyOfModule-org.eclipse.app4mc.amalthea.model.HwModule-">getFrequencyOfModule</a></span>(HwModule&nbsp;module)</code>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getFrequencyOfModule(org.eclipse.app4mc.amalthea.model.HwModule)">getFrequencyOfModule</a></span>&#8203;(HwModule&nbsp;module)</code></th>
+<td class="colLast">
 <div class="block">Returns the frequency of a specific module</div>
 </td>
 </tr>
 <tr id="i7" class="rowColor">
 <td class="colFirst"><code>static long</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getFrequencyOfModuleInHz-org.eclipse.app4mc.amalthea.model.HwModule-">getFrequencyOfModuleInHz</a></span>(HwModule&nbsp;module)</code>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getFrequencyOfModuleInHz(org.eclipse.app4mc.amalthea.model.HwModule)">getFrequencyOfModuleInHz</a></span>&#8203;(HwModule&nbsp;module)</code></th>
+<td class="colLast">
 <div class="block">Returns the frequency of a specific module in Hertz</div>
 </td>
 </tr>
 <tr id="i8" class="altColor">
-<td class="colFirst"><code>static Map&lt;Memory,Long&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getMemoryAccessLatenciesCycles-org.eclipse.app4mc.amalthea.model.Amalthea-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType-">getMemoryAccessLatenciesCycles</a></span>(Amalthea&nbsp;model,
-                              <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;timeType)</code>&nbsp;</td>
+<td class="colFirst"><code>static Map&lt;Memory,&#8203;Long&gt;</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getMemoryAccessLatenciesCycles(org.eclipse.app4mc.amalthea.model.Amalthea,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType)">getMemoryAccessLatenciesCycles</a></span>&#8203;(Amalthea&nbsp;model,
+                              <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;timeType)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i9" class="rowColor">
-<td class="colFirst"><code>static Map&lt;Memory,Time&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getMemoryAccessLatencyTime-org.eclipse.app4mc.amalthea.model.Amalthea-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType-">getMemoryAccessLatencyTime</a></span>(Amalthea&nbsp;model,
-                          <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;timeType)</code>&nbsp;</td>
+<td class="colFirst"><code>static Map&lt;Memory,&#8203;Time&gt;</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getMemoryAccessLatencyTime(org.eclipse.app4mc.amalthea.model.Amalthea,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType)">getMemoryAccessLatencyTime</a></span>&#8203;(Amalthea&nbsp;model,
+                          <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;timeType)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i10" class="altColor">
 <td class="colFirst"><code>static DataRate</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getMinDataRateOfHwAccessPath-org.eclipse.app4mc.amalthea.model.HwAccessPath-">getMinDataRateOfHwAccessPath</a></span>(HwAccessPath&nbsp;path)</code>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getMinDataRateOfHwAccessPath(org.eclipse.app4mc.amalthea.model.HwAccessPath)">getMinDataRateOfHwAccessPath</a></span>&#8203;(HwAccessPath&nbsp;path)</code></th>
+<td class="colLast">
 <div class="block">Computes the minimum data rate of an access path</div>
 </td>
 </tr>
 <tr id="i11" class="rowColor">
 <td class="colFirst"><code>static &lt;T extends HwModule&gt;<br>List&lt;T&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getModulesFromHwModel-java.lang.Class-org.eclipse.app4mc.amalthea.model.Amalthea-">getModulesFromHwModel</a></span>(Class&lt;T&gt;&nbsp;targetClass,
-                     Amalthea&nbsp;model)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getModulesFromHwModel(java.lang.Class,org.eclipse.app4mc.amalthea.model.Amalthea)">getModulesFromHwModel</a></span>&#8203;(Class&lt;T&gt;&nbsp;targetClass,
+                     Amalthea&nbsp;model)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i12" class="altColor">
 <td class="colFirst"><code>static &lt;T extends HwModule&gt;<br>List&lt;T&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getModulesFromHWStructure-java.lang.Class-org.eclipse.app4mc.amalthea.model.HwStructure-">getModulesFromHWStructure</a></span>(Class&lt;T&gt;&nbsp;targetClass,
-                         HwStructure&nbsp;structure)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getModulesFromHWStructure(java.lang.Class,org.eclipse.app4mc.amalthea.model.HwStructure)">getModulesFromHWStructure</a></span>&#8203;(Class&lt;T&gt;&nbsp;targetClass,
+                         HwStructure&nbsp;structure)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.Object">
+<li class="blockList"><a id="methods.inherited.from.class.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;Object</h3>
@@ -145,174 +144,161 @@
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
 <div class="details">
 <ul class="blockList">
 <li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="HardwareUtil--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>HardwareUtil</h4>
-<pre>public&nbsp;HardwareUtil()</pre>
-</li>
-</ul>
-</li>
-</ul>
 <!-- ============ METHOD DETAIL ========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a id="method.detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="getModulesFromHwModel-java.lang.Class-org.eclipse.app4mc.amalthea.model.Amalthea-">
+<a id="getModulesFromHwModel(java.lang.Class,org.eclipse.app4mc.amalthea.model.Amalthea)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getModulesFromHwModel</h4>
-<pre>public static&nbsp;&lt;T extends HwModule&gt;&nbsp;List&lt;T&gt;&nbsp;getModulesFromHwModel(Class&lt;T&gt;&nbsp;targetClass,
+<pre class="methodSignature">public static&nbsp;&lt;T extends HwModule&gt;&nbsp;List&lt;T&gt;&nbsp;getModulesFromHwModel&#8203;(Class&lt;T&gt;&nbsp;targetClass,
                                                                  Amalthea&nbsp;model)</pre>
 </li>
 </ul>
-<a name="getModulesFromHWStructure-java.lang.Class-org.eclipse.app4mc.amalthea.model.HwStructure-">
+<a id="getModulesFromHWStructure(java.lang.Class,org.eclipse.app4mc.amalthea.model.HwStructure)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getModulesFromHWStructure</h4>
-<pre>public static&nbsp;&lt;T extends HwModule&gt;&nbsp;List&lt;T&gt;&nbsp;getModulesFromHWStructure(Class&lt;T&gt;&nbsp;targetClass,
+<pre class="methodSignature">public static&nbsp;&lt;T extends HwModule&gt;&nbsp;List&lt;T&gt;&nbsp;getModulesFromHWStructure&#8203;(Class&lt;T&gt;&nbsp;targetClass,
                                                                      HwStructure&nbsp;structure)</pre>
 </li>
 </ul>
-<a name="getAllProcessingUnitsForProcessingUnitDefinition-org.eclipse.app4mc.amalthea.model.Amalthea-org.eclipse.app4mc.amalthea.model.ProcessingUnitDefinition-">
+<a id="getAllProcessingUnitsForProcessingUnitDefinition(org.eclipse.app4mc.amalthea.model.Amalthea,org.eclipse.app4mc.amalthea.model.ProcessingUnitDefinition)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getAllProcessingUnitsForProcessingUnitDefinition</h4>
-<pre>public static&nbsp;List&lt;ProcessingUnit&gt;&nbsp;getAllProcessingUnitsForProcessingUnitDefinition(Amalthea&nbsp;model,
+<pre class="methodSignature">public static&nbsp;List&lt;ProcessingUnit&gt;&nbsp;getAllProcessingUnitsForProcessingUnitDefinition&#8203;(Amalthea&nbsp;model,
                                                                                     ProcessingUnitDefinition&nbsp;puDef)</pre>
 </li>
 </ul>
-<a name="getMemoryAccessLatenciesCycles-org.eclipse.app4mc.amalthea.model.Amalthea-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType-">
+<a id="getMemoryAccessLatenciesCycles(org.eclipse.app4mc.amalthea.model.Amalthea,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getMemoryAccessLatenciesCycles</h4>
-<pre>public static&nbsp;Map&lt;Memory,Long&gt;&nbsp;getMemoryAccessLatenciesCycles(Amalthea&nbsp;model,
-                                                              <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;timeType)</pre>
+<pre class="methodSignature">public static&nbsp;Map&lt;Memory,&#8203;Long&gt;&nbsp;getMemoryAccessLatenciesCycles&#8203;(Amalthea&nbsp;model,
+                                                                    <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;timeType)</pre>
 </li>
 </ul>
-<a name="getMemoryAccessLatencyTime-org.eclipse.app4mc.amalthea.model.Amalthea-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType-">
+<a id="getMemoryAccessLatencyTime(org.eclipse.app4mc.amalthea.model.Amalthea,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getMemoryAccessLatencyTime</h4>
-<pre>public static&nbsp;Map&lt;Memory,Time&gt;&nbsp;getMemoryAccessLatencyTime(Amalthea&nbsp;model,
-                                                          <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;timeType)</pre>
+<pre class="methodSignature">public static&nbsp;Map&lt;Memory,&#8203;Time&gt;&nbsp;getMemoryAccessLatencyTime&#8203;(Amalthea&nbsp;model,
+                                                                <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;timeType)</pre>
 </li>
 </ul>
-<a name="getAccessElementsToDestination-org.eclipse.app4mc.amalthea.model.HwDestination-org.eclipse.app4mc.amalthea.model.Amalthea-">
+<a id="getAccessElementsToDestination(org.eclipse.app4mc.amalthea.model.HwDestination,org.eclipse.app4mc.amalthea.model.Amalthea)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getAccessElementsToDestination</h4>
-<pre>public static&nbsp;List&lt;HwAccessElement&gt;&nbsp;getAccessElementsToDestination(HwDestination&nbsp;dest,
+<pre class="methodSignature">public static&nbsp;List&lt;HwAccessElement&gt;&nbsp;getAccessElementsToDestination&#8203;(HwDestination&nbsp;dest,
                                                                    Amalthea&nbsp;model)</pre>
 </li>
 </ul>
-<a name="getAccessTimes-org.eclipse.app4mc.amalthea.model.Amalthea-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.AccessDirection-">
+<a id="getAccessTimes(org.eclipse.app4mc.amalthea.model.Amalthea,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.AccessDirection)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getAccessTimes</h4>
-<pre>public static&nbsp;Map&lt;ProcessingUnit,HashMap&lt;HwDestination,Time&gt;&gt;&nbsp;getAccessTimes(Amalthea&nbsp;model,
-                                                                             <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;timeType,
-                                                                             <a href="RuntimeUtil.AccessDirection.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.AccessDirection</a>&nbsp;direction)</pre>
+<pre class="methodSignature">public static&nbsp;Map&lt;ProcessingUnit,&#8203;HashMap&lt;HwDestination,&#8203;Time&gt;&gt;&nbsp;getAccessTimes&#8203;(Amalthea&nbsp;model,
+                                                                                         <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;timeType,
+                                                                                         <a href="RuntimeUtil.AccessDirection.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.AccessDirection</a>&nbsp;direction)</pre>
 </li>
 </ul>
-<a name="calculateLatencyPathTime-org.eclipse.app4mc.amalthea.model.HwAccessElement-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.AccessDirection-">
+<a id="calculateLatencyPathTime(org.eclipse.app4mc.amalthea.model.HwAccessElement,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.AccessDirection)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>calculateLatencyPathTime</h4>
-<pre>public static&nbsp;Time&nbsp;calculateLatencyPathTime(HwAccessElement&nbsp;accessElement,
+<pre class="methodSignature">public static&nbsp;Time&nbsp;calculateLatencyPathTime&#8203;(HwAccessElement&nbsp;accessElement,
                                             <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;timeType,
                                             <a href="RuntimeUtil.AccessDirection.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.AccessDirection</a>&nbsp;direction)</pre>
 </li>
 </ul>
-<a name="calculateHwAccessPathTime-org.eclipse.app4mc.amalthea.model.HwAccessElement-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.AccessDirection-">
+<a id="calculateHwAccessPathTime(org.eclipse.app4mc.amalthea.model.HwAccessElement,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.AccessDirection)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>calculateHwAccessPathTime</h4>
-<pre>public static&nbsp;Time&nbsp;calculateHwAccessPathTime(HwAccessElement&nbsp;accessElement,
+<pre class="methodSignature">public static&nbsp;Time&nbsp;calculateHwAccessPathTime&#8203;(HwAccessElement&nbsp;accessElement,
                                              <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;timeType,
                                              <a href="RuntimeUtil.AccessDirection.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.AccessDirection</a>&nbsp;direction)</pre>
 </li>
 </ul>
-<a name="calculateLatency-org.eclipse.app4mc.amalthea.model.IDiscreteValueDeviation-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType-">
+<a id="calculateLatency(org.eclipse.app4mc.amalthea.model.IDiscreteValueDeviation,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>calculateLatency</h4>
-<pre>public static&nbsp;Long&nbsp;calculateLatency(IDiscreteValueDeviation&nbsp;latency,
+<pre class="methodSignature">public static&nbsp;Long&nbsp;calculateLatency&#8203;(IDiscreteValueDeviation&nbsp;latency,
                                     <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;timeType)</pre>
 </li>
 </ul>
-<a name="getMinDataRateOfHwAccessPath-org.eclipse.app4mc.amalthea.model.HwAccessPath-">
+<a id="getMinDataRateOfHwAccessPath(org.eclipse.app4mc.amalthea.model.HwAccessPath)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getMinDataRateOfHwAccessPath</h4>
-<pre>public static&nbsp;DataRate&nbsp;getMinDataRateOfHwAccessPath(HwAccessPath&nbsp;path)</pre>
+<pre class="methodSignature">public static&nbsp;DataRate&nbsp;getMinDataRateOfHwAccessPath&#8203;(HwAccessPath&nbsp;path)</pre>
 <div class="block">Computes the minimum data rate of an access path</div>
 </li>
 </ul>
-<a name="getFrequencyOfModule-org.eclipse.app4mc.amalthea.model.HwModule-">
+<a id="getFrequencyOfModule(org.eclipse.app4mc.amalthea.model.HwModule)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getFrequencyOfModule</h4>
-<pre>public static&nbsp;Frequency&nbsp;getFrequencyOfModule(HwModule&nbsp;module)</pre>
+<pre class="methodSignature">public static&nbsp;Frequency&nbsp;getFrequencyOfModule&#8203;(HwModule&nbsp;module)</pre>
 <div class="block">Returns the frequency of a specific module</div>
 </li>
 </ul>
-<a name="getFrequencyOfModuleInHz-org.eclipse.app4mc.amalthea.model.HwModule-">
+<a id="getFrequencyOfModuleInHz(org.eclipse.app4mc.amalthea.model.HwModule)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getFrequencyOfModuleInHz</h4>
-<pre>public static&nbsp;long&nbsp;getFrequencyOfModuleInHz(HwModule&nbsp;module)</pre>
+<pre class="methodSignature">public static&nbsp;long&nbsp;getFrequencyOfModuleInHz&#8203;(HwModule&nbsp;module)</pre>
 <div class="block">Returns the frequency of a specific module in Hertz</div>
 </li>
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
 </div>
+</main>
 <!-- ========= END OF CLASS DATA ========= -->
 </body>
 </html>
diff --git a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/InstructionsUtil.html b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/InstructionsUtil.html
new file mode 100644
index 0000000..c99e2da
--- /dev/null
+++ b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/InstructionsUtil.html
@@ -0,0 +1,282 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="de">
+<head>
+<!-- Generated by javadoc (11.0.8) on Mon Nov 30 13:15:36 CET 2020 -->
+<title>InstructionsUtil</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-11-30">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+
+<!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
+<div class="header">
+<div class="subTitle"><span class="packageLabelInType">Package</span>&nbsp;<a href="package-summary.html">org.eclipse.app4mc.amalthea.model.util</a></div>
+<h2 title="Class InstructionsUtil" class="title">Class InstructionsUtil</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>Object</li>
+<li>
+<ul class="inheritance">
+<li>InstructionsUtil</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<pre>@Deprecated
+public class <span class="typeNameLabel">InstructionsUtil</span>
+extends Object</pre>
+<div class="deprecationBlock"><span class="deprecatedLabel">Deprecated.</span>
+<div class="deprecationComment">(0.9.3) use <code>Ticks</code> instead.</div>
+</div>
+<div class="block">Creates Need entries for Instructions</div>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Field</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static String</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#INSTRUCTIONS_CATEGORY_NAME">INSTRUCTIONS_CATEGORY_NAME</a></span></code></th>
+<td class="colLast">
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>static ExecutionNeed</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#createExecutionNeedConstant(long)">createExecutionNeedConstant</a></span>&#8203;(long&nbsp;instructions)</code></th>
+<td class="colLast">
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>static List&lt;HwFeature&gt;</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getFeaturesOfCategory(org.eclipse.app4mc.amalthea.model.ProcessingUnitDefinition,org.eclipse.app4mc.amalthea.model.HwFeatureCategory)">getFeaturesOfCategory</a></span>&#8203;(ProcessingUnitDefinition&nbsp;puDefinition,
+                     HwFeatureCategory&nbsp;category)</code></th>
+<td class="colLast">
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>static List&lt;Double&gt;</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getFeatureValuesOfCategory(org.eclipse.app4mc.amalthea.model.ProcessingUnitDefinition,org.eclipse.app4mc.amalthea.model.HwFeatureCategory)">getFeatureValuesOfCategory</a></span>&#8203;(ProcessingUnitDefinition&nbsp;puDefinition,
+                          HwFeatureCategory&nbsp;category)</code></th>
+<td class="colLast">
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>static double</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getIPC(org.eclipse.app4mc.amalthea.model.Amalthea,org.eclipse.app4mc.amalthea.model.ProcessingUnit)">getIPC</a></span>&#8203;(Amalthea&nbsp;model,
+      ProcessingUnit&nbsp;pu)</code></th>
+<td class="colLast">
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>static IDiscreteValueDeviation</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getNeed(org.eclipse.app4mc.amalthea.model.ExecutionNeed)">getNeed</a></span>&#8203;(ExecutionNeed&nbsp;execNeed)</code></th>
+<td class="colLast">
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>static long</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getNeedConstant(org.eclipse.app4mc.amalthea.model.ExecutionNeed)">getNeedConstant</a></span>&#8203;(ExecutionNeed&nbsp;execNeed)</code></th>
+<td class="colLast">
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>static IDiscreteValueDeviation</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getNeedDeviation(org.eclipse.app4mc.amalthea.model.ExecutionNeed)">getNeedDeviation</a></span>&#8203;(ExecutionNeed&nbsp;execNeed)</code></th>
+<td class="colLast">
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code>static HwFeatureCategory</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getOrCreateInstructionsCategory(org.eclipse.app4mc.amalthea.model.Amalthea)">getOrCreateInstructionsCategory</a></span>&#8203;(Amalthea&nbsp;model)</code></th>
+<td class="colLast">
+<div class="block"><span class="deprecatedLabel">Deprecated.</span></div>
+&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a id="methods.inherited.from.class.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a id="INSTRUCTIONS_CATEGORY_NAME">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>INSTRUCTIONS_CATEGORY_NAME</h4>
+<pre>public static final&nbsp;String INSTRUCTIONS_CATEGORY_NAME</pre>
+<div class="deprecationBlock"><span class="deprecatedLabel">Deprecated.</span></div>
+<dl>
+<dt><span class="seeLabel">See Also:</span></dt>
+<dd><a href="../../../../../../constant-values.html#org.eclipse.app4mc.amalthea.model.util.InstructionsUtil.INSTRUCTIONS_CATEGORY_NAME">Constant Field Values</a></dd>
+</dl>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ============ METHOD DETAIL ========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a id="getOrCreateInstructionsCategory(org.eclipse.app4mc.amalthea.model.Amalthea)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getOrCreateInstructionsCategory</h4>
+<pre class="methodSignature">public static&nbsp;HwFeatureCategory&nbsp;getOrCreateInstructionsCategory&#8203;(Amalthea&nbsp;model)</pre>
+<div class="deprecationBlock"><span class="deprecatedLabel">Deprecated.</span></div>
+</li>
+</ul>
+<a id="createExecutionNeedConstant(long)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>createExecutionNeedConstant</h4>
+<pre class="methodSignature">public static&nbsp;ExecutionNeed&nbsp;createExecutionNeedConstant&#8203;(long&nbsp;instructions)</pre>
+<div class="deprecationBlock"><span class="deprecatedLabel">Deprecated.</span></div>
+</li>
+</ul>
+<a id="getNeed(org.eclipse.app4mc.amalthea.model.ExecutionNeed)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getNeed</h4>
+<pre class="methodSignature">public static&nbsp;IDiscreteValueDeviation&nbsp;getNeed&#8203;(ExecutionNeed&nbsp;execNeed)</pre>
+<div class="deprecationBlock"><span class="deprecatedLabel">Deprecated.</span></div>
+</li>
+</ul>
+<a id="getNeedConstant(org.eclipse.app4mc.amalthea.model.ExecutionNeed)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getNeedConstant</h4>
+<pre class="methodSignature">public static&nbsp;long&nbsp;getNeedConstant&#8203;(ExecutionNeed&nbsp;execNeed)</pre>
+<div class="deprecationBlock"><span class="deprecatedLabel">Deprecated.</span></div>
+</li>
+</ul>
+<a id="getNeedDeviation(org.eclipse.app4mc.amalthea.model.ExecutionNeed)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getNeedDeviation</h4>
+<pre class="methodSignature">public static&nbsp;IDiscreteValueDeviation&nbsp;getNeedDeviation&#8203;(ExecutionNeed&nbsp;execNeed)</pre>
+<div class="deprecationBlock"><span class="deprecatedLabel">Deprecated.</span></div>
+</li>
+</ul>
+<a id="getIPC(org.eclipse.app4mc.amalthea.model.Amalthea,org.eclipse.app4mc.amalthea.model.ProcessingUnit)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getIPC</h4>
+<pre class="methodSignature">public static&nbsp;double&nbsp;getIPC&#8203;(Amalthea&nbsp;model,
+                            ProcessingUnit&nbsp;pu)</pre>
+<div class="deprecationBlock"><span class="deprecatedLabel">Deprecated.</span></div>
+</li>
+</ul>
+<a id="getFeaturesOfCategory(org.eclipse.app4mc.amalthea.model.ProcessingUnitDefinition,org.eclipse.app4mc.amalthea.model.HwFeatureCategory)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getFeaturesOfCategory</h4>
+<pre class="methodSignature">public static&nbsp;List&lt;HwFeature&gt;&nbsp;getFeaturesOfCategory&#8203;(ProcessingUnitDefinition&nbsp;puDefinition,
+                                                    HwFeatureCategory&nbsp;category)</pre>
+<div class="deprecationBlock"><span class="deprecatedLabel">Deprecated.</span></div>
+</li>
+</ul>
+<a id="getFeatureValuesOfCategory(org.eclipse.app4mc.amalthea.model.ProcessingUnitDefinition,org.eclipse.app4mc.amalthea.model.HwFeatureCategory)">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>getFeatureValuesOfCategory</h4>
+<pre class="methodSignature">public static&nbsp;List&lt;Double&gt;&nbsp;getFeatureValuesOfCategory&#8203;(ProcessingUnitDefinition&nbsp;puDefinition,
+                                                      HwFeatureCategory&nbsp;category)</pre>
+<div class="deprecationBlock"><span class="deprecatedLabel">Deprecated.</span></div>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+</div>
+</main>
+<!-- ========= END OF CLASS DATA ========= -->
+</body>
+</html>
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 79af8a1..e56a842 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
@@ -1,16 +1,18 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML>
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
+<!-- Generated by javadoc (11.0.8) on Mon Nov 30 13:15:36 CET 2020 -->
 <title>ModelUtil</title>
-<meta name="date" content="2019-07-31">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-11-30">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
 <!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
 <div class="header">
-<div class="subTitle">org.eclipse.app4mc.amalthea.model.util</div>
+<div class="subTitle"><span class="packageLabelInType">Package</span>&nbsp;<a href="package-summary.html">org.eclipse.app4mc.amalthea.model.util</a></div>
 <h2 title="Class ModelUtil" class="title">Class ModelUtil</h2>
 </div>
 <div class="contentContainer">
@@ -26,7 +28,6 @@
 <ul class="blockList">
 <li class="blockList">
 <hr>
-<br>
 <pre>public class <span class="typeNameLabel">ModelUtil</span>
 extends Object</pre>
 </li>
@@ -35,86 +36,88 @@
 <div class="summary">
 <ul class="blockList">
 <li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="#ModelUtil--">ModelUtil</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
 <!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a id="method.summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<table class="memberSummary">
 <caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<td class="colFirst"><code>static CommonElements</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getOrCreateCommonElements-org.eclipse.app4mc.amalthea.model.Amalthea-">getOrCreateCommonElements</a></span>(Amalthea&nbsp;model)</code>&nbsp;</td>
+<td class="colFirst"><code>static ActivityGraph</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getOrCreateActivityGraph(org.eclipse.app4mc.amalthea.model.Process)">getOrCreateActivityGraph</a></span>&#8203;(@NonNull Process&nbsp;process)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i1" class="rowColor">
-<td class="colFirst"><code>static ComponentsModel</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getOrCreateComponentsModel-org.eclipse.app4mc.amalthea.model.Amalthea-">getOrCreateComponentsModel</a></span>(Amalthea&nbsp;model)</code>&nbsp;</td>
+<td class="colFirst"><code>static ActivityGraph</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getOrCreateActivityGraph(org.eclipse.app4mc.amalthea.model.Runnable)">getOrCreateActivityGraph</a></span>&#8203;(@NonNull Runnable&nbsp;runnable)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i2" class="altColor">
-<td class="colFirst"><code>static ConfigModel</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getOrCreateConfigModel-org.eclipse.app4mc.amalthea.model.Amalthea-">getOrCreateConfigModel</a></span>(Amalthea&nbsp;model)</code>&nbsp;</td>
+<td class="colFirst"><code>static CommonElements</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getOrCreateCommonElements(org.eclipse.app4mc.amalthea.model.Amalthea)">getOrCreateCommonElements</a></span>&#8203;(@NonNull Amalthea&nbsp;model)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i3" class="rowColor">
-<td class="colFirst"><code>static ConstraintsModel</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getOrCreateConstraintsModel-org.eclipse.app4mc.amalthea.model.Amalthea-">getOrCreateConstraintsModel</a></span>(Amalthea&nbsp;model)</code>&nbsp;</td>
+<td class="colFirst"><code>static ComponentsModel</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getOrCreateComponentsModel(org.eclipse.app4mc.amalthea.model.Amalthea)">getOrCreateComponentsModel</a></span>&#8203;(@NonNull Amalthea&nbsp;model)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i4" class="altColor">
-<td class="colFirst"><code>static EventModel</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getOrCreateEventModel-org.eclipse.app4mc.amalthea.model.Amalthea-">getOrCreateEventModel</a></span>(Amalthea&nbsp;model)</code>&nbsp;</td>
+<td class="colFirst"><code>static ConfigModel</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getOrCreateConfigModel(org.eclipse.app4mc.amalthea.model.Amalthea)">getOrCreateConfigModel</a></span>&#8203;(@NonNull Amalthea&nbsp;model)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i5" class="rowColor">
-<td class="colFirst"><code>static HWModel</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getOrCreateHwModel-org.eclipse.app4mc.amalthea.model.Amalthea-">getOrCreateHwModel</a></span>(Amalthea&nbsp;model)</code>&nbsp;</td>
+<td class="colFirst"><code>static ConstraintsModel</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getOrCreateConstraintsModel(org.eclipse.app4mc.amalthea.model.Amalthea)">getOrCreateConstraintsModel</a></span>&#8203;(@NonNull Amalthea&nbsp;model)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i6" class="altColor">
-<td class="colFirst"><code>static MappingModel</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getOrCreateMappingModel-org.eclipse.app4mc.amalthea.model.Amalthea-">getOrCreateMappingModel</a></span>(Amalthea&nbsp;model)</code>&nbsp;</td>
+<td class="colFirst"><code>static EventModel</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getOrCreateEventModel(org.eclipse.app4mc.amalthea.model.Amalthea)">getOrCreateEventModel</a></span>&#8203;(@NonNull Amalthea&nbsp;model)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i7" class="rowColor">
-<td class="colFirst"><code>static MeasurementModel</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getOrCreateMeasurementModel-org.eclipse.app4mc.amalthea.model.Amalthea-">getOrCreateMeasurementModel</a></span>(Amalthea&nbsp;model)</code>&nbsp;</td>
+<td class="colFirst"><code>static HWModel</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getOrCreateHwModel(org.eclipse.app4mc.amalthea.model.Amalthea)">getOrCreateHwModel</a></span>&#8203;(@NonNull Amalthea&nbsp;model)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i8" class="altColor">
-<td class="colFirst"><code>static OSModel</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getOrCreateOsModel-org.eclipse.app4mc.amalthea.model.Amalthea-">getOrCreateOsModel</a></span>(Amalthea&nbsp;model)</code>&nbsp;</td>
+<td class="colFirst"><code>static MappingModel</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getOrCreateMappingModel(org.eclipse.app4mc.amalthea.model.Amalthea)">getOrCreateMappingModel</a></span>&#8203;(@NonNull Amalthea&nbsp;model)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i9" class="rowColor">
-<td class="colFirst"><code>static PropertyConstraintsModel</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getOrCreatePropertyConstraintsModel-org.eclipse.app4mc.amalthea.model.Amalthea-">getOrCreatePropertyConstraintsModel</a></span>(Amalthea&nbsp;model)</code>&nbsp;</td>
+<td class="colFirst"><code>static OSModel</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getOrCreateOsModel(org.eclipse.app4mc.amalthea.model.Amalthea)">getOrCreateOsModel</a></span>&#8203;(@NonNull Amalthea&nbsp;model)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i10" class="altColor">
-<td class="colFirst"><code>static StimuliModel</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getOrCreateStimuliModel-org.eclipse.app4mc.amalthea.model.Amalthea-">getOrCreateStimuliModel</a></span>(Amalthea&nbsp;model)</code>&nbsp;</td>
+<td class="colFirst"><code>static PropertyConstraintsModel</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getOrCreatePropertyConstraintsModel(org.eclipse.app4mc.amalthea.model.Amalthea)">getOrCreatePropertyConstraintsModel</a></span>&#8203;(@NonNull Amalthea&nbsp;model)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr id="i11" class="rowColor">
+<td class="colFirst"><code>static StimuliModel</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getOrCreateStimuliModel(org.eclipse.app4mc.amalthea.model.Amalthea)">getOrCreateStimuliModel</a></span>&#8203;(@NonNull Amalthea&nbsp;model)</code></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr id="i12" class="altColor">
 <td class="colFirst"><code>static SWModel</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getOrCreateSwModel-org.eclipse.app4mc.amalthea.model.Amalthea-">getOrCreateSwModel</a></span>(Amalthea&nbsp;model)</code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getOrCreateSwModel(org.eclipse.app4mc.amalthea.model.Amalthea)">getOrCreateSwModel</a></span>&#8203;(@NonNull Amalthea&nbsp;model)</code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.Object">
+<li class="blockList"><a id="methods.inherited.from.class.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;Object</h3>
@@ -122,149 +125,145 @@
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
 <div class="details">
 <ul class="blockList">
 <li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="ModelUtil--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>ModelUtil</h4>
-<pre>public&nbsp;ModelUtil()</pre>
-</li>
-</ul>
-</li>
-</ul>
 <!-- ============ METHOD DETAIL ========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a id="method.detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="getOrCreateCommonElements-org.eclipse.app4mc.amalthea.model.Amalthea-">
+<a id="getOrCreateCommonElements(org.eclipse.app4mc.amalthea.model.Amalthea)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getOrCreateCommonElements</h4>
-<pre>public static&nbsp;CommonElements&nbsp;getOrCreateCommonElements(Amalthea&nbsp;model)</pre>
+<pre class="methodSignature">public static&nbsp;CommonElements&nbsp;getOrCreateCommonElements&#8203;(@NonNull Amalthea&nbsp;model)</pre>
 </li>
 </ul>
-<a name="getOrCreateSwModel-org.eclipse.app4mc.amalthea.model.Amalthea-">
+<a id="getOrCreateSwModel(org.eclipse.app4mc.amalthea.model.Amalthea)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getOrCreateSwModel</h4>
-<pre>public static&nbsp;SWModel&nbsp;getOrCreateSwModel(Amalthea&nbsp;model)</pre>
+<pre class="methodSignature">public static&nbsp;SWModel&nbsp;getOrCreateSwModel&#8203;(@NonNull Amalthea&nbsp;model)</pre>
 </li>
 </ul>
-<a name="getOrCreateHwModel-org.eclipse.app4mc.amalthea.model.Amalthea-">
+<a id="getOrCreateHwModel(org.eclipse.app4mc.amalthea.model.Amalthea)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getOrCreateHwModel</h4>
-<pre>public static&nbsp;HWModel&nbsp;getOrCreateHwModel(Amalthea&nbsp;model)</pre>
+<pre class="methodSignature">public static&nbsp;HWModel&nbsp;getOrCreateHwModel&#8203;(@NonNull Amalthea&nbsp;model)</pre>
 </li>
 </ul>
-<a name="getOrCreateOsModel-org.eclipse.app4mc.amalthea.model.Amalthea-">
+<a id="getOrCreateOsModel(org.eclipse.app4mc.amalthea.model.Amalthea)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getOrCreateOsModel</h4>
-<pre>public static&nbsp;OSModel&nbsp;getOrCreateOsModel(Amalthea&nbsp;model)</pre>
+<pre class="methodSignature">public static&nbsp;OSModel&nbsp;getOrCreateOsModel&#8203;(@NonNull Amalthea&nbsp;model)</pre>
 </li>
 </ul>
-<a name="getOrCreateStimuliModel-org.eclipse.app4mc.amalthea.model.Amalthea-">
+<a id="getOrCreateStimuliModel(org.eclipse.app4mc.amalthea.model.Amalthea)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getOrCreateStimuliModel</h4>
-<pre>public static&nbsp;StimuliModel&nbsp;getOrCreateStimuliModel(Amalthea&nbsp;model)</pre>
+<pre class="methodSignature">public static&nbsp;StimuliModel&nbsp;getOrCreateStimuliModel&#8203;(@NonNull Amalthea&nbsp;model)</pre>
 </li>
 </ul>
-<a name="getOrCreateEventModel-org.eclipse.app4mc.amalthea.model.Amalthea-">
+<a id="getOrCreateEventModel(org.eclipse.app4mc.amalthea.model.Amalthea)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getOrCreateEventModel</h4>
-<pre>public static&nbsp;EventModel&nbsp;getOrCreateEventModel(Amalthea&nbsp;model)</pre>
+<pre class="methodSignature">public static&nbsp;EventModel&nbsp;getOrCreateEventModel&#8203;(@NonNull Amalthea&nbsp;model)</pre>
 </li>
 </ul>
-<a name="getOrCreateConstraintsModel-org.eclipse.app4mc.amalthea.model.Amalthea-">
+<a id="getOrCreateConstraintsModel(org.eclipse.app4mc.amalthea.model.Amalthea)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getOrCreateConstraintsModel</h4>
-<pre>public static&nbsp;ConstraintsModel&nbsp;getOrCreateConstraintsModel(Amalthea&nbsp;model)</pre>
+<pre class="methodSignature">public static&nbsp;ConstraintsModel&nbsp;getOrCreateConstraintsModel&#8203;(@NonNull Amalthea&nbsp;model)</pre>
 </li>
 </ul>
-<a name="getOrCreatePropertyConstraintsModel-org.eclipse.app4mc.amalthea.model.Amalthea-">
+<a id="getOrCreatePropertyConstraintsModel(org.eclipse.app4mc.amalthea.model.Amalthea)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getOrCreatePropertyConstraintsModel</h4>
-<pre>public static&nbsp;PropertyConstraintsModel&nbsp;getOrCreatePropertyConstraintsModel(Amalthea&nbsp;model)</pre>
+<pre class="methodSignature">public static&nbsp;PropertyConstraintsModel&nbsp;getOrCreatePropertyConstraintsModel&#8203;(@NonNull Amalthea&nbsp;model)</pre>
 </li>
 </ul>
-<a name="getOrCreateMappingModel-org.eclipse.app4mc.amalthea.model.Amalthea-">
+<a id="getOrCreateMappingModel(org.eclipse.app4mc.amalthea.model.Amalthea)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getOrCreateMappingModel</h4>
-<pre>public static&nbsp;MappingModel&nbsp;getOrCreateMappingModel(Amalthea&nbsp;model)</pre>
+<pre class="methodSignature">public static&nbsp;MappingModel&nbsp;getOrCreateMappingModel&#8203;(@NonNull Amalthea&nbsp;model)</pre>
 </li>
 </ul>
-<a name="getOrCreateComponentsModel-org.eclipse.app4mc.amalthea.model.Amalthea-">
+<a id="getOrCreateComponentsModel(org.eclipse.app4mc.amalthea.model.Amalthea)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getOrCreateComponentsModel</h4>
-<pre>public static&nbsp;ComponentsModel&nbsp;getOrCreateComponentsModel(Amalthea&nbsp;model)</pre>
+<pre class="methodSignature">public static&nbsp;ComponentsModel&nbsp;getOrCreateComponentsModel&#8203;(@NonNull Amalthea&nbsp;model)</pre>
 </li>
 </ul>
-<a name="getOrCreateConfigModel-org.eclipse.app4mc.amalthea.model.Amalthea-">
+<a id="getOrCreateConfigModel(org.eclipse.app4mc.amalthea.model.Amalthea)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getOrCreateConfigModel</h4>
-<pre>public static&nbsp;ConfigModel&nbsp;getOrCreateConfigModel(Amalthea&nbsp;model)</pre>
+<pre class="methodSignature">public static&nbsp;ConfigModel&nbsp;getOrCreateConfigModel&#8203;(@NonNull Amalthea&nbsp;model)</pre>
 </li>
 </ul>
-<a name="getOrCreateMeasurementModel-org.eclipse.app4mc.amalthea.model.Amalthea-">
+<a id="getOrCreateActivityGraph(org.eclipse.app4mc.amalthea.model.Process)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getOrCreateActivityGraph</h4>
+<pre class="methodSignature">public static&nbsp;ActivityGraph&nbsp;getOrCreateActivityGraph&#8203;(@NonNull Process&nbsp;process)</pre>
+</li>
+</ul>
+<a id="getOrCreateActivityGraph(org.eclipse.app4mc.amalthea.model.Runnable)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
-<h4>getOrCreateMeasurementModel</h4>
-<pre>public static&nbsp;MeasurementModel&nbsp;getOrCreateMeasurementModel(Amalthea&nbsp;model)</pre>
+<h4>getOrCreateActivityGraph</h4>
+<pre class="methodSignature">public static&nbsp;ActivityGraph&nbsp;getOrCreateActivityGraph&#8203;(@NonNull Runnable&nbsp;runnable)</pre>
 </li>
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
 </div>
+</main>
 <!-- ========= END OF CLASS DATA ========= -->
 </body>
 </html>
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 c80bc6d..ea56dcc 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
@@ -1,16 +1,18 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML>
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
+<!-- Generated by javadoc (11.0.8) on Mon Nov 30 13:15:36 CET 2020 -->
 <title>RuntimeUtil.AccessDirection</title>
-<meta name="date" content="2019-07-31">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-11-30">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
 <!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
 <div class="header">
-<div class="subTitle">org.eclipse.app4mc.amalthea.model.util</div>
+<div class="subTitle"><span class="packageLabelInType">Package</span>&nbsp;<a href="package-summary.html">org.eclipse.app4mc.amalthea.model.util</a></div>
 <h2 title="Enum RuntimeUtil.AccessDirection" class="title">Enum RuntimeUtil.AccessDirection</h2>
 </div>
 <div class="contentContainer">
@@ -21,7 +23,7 @@
 <li>Enum&lt;<a href="RuntimeUtil.AccessDirection.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.AccessDirection</a>&gt;</li>
 <li>
 <ul class="inheritance">
-<li>RuntimeUtil.AccessDirection</li>
+<li>AccessDirection</li>
 </ul>
 </li>
 </ul>
@@ -32,14 +34,13 @@
 <li class="blockList">
 <dl>
 <dt>All Implemented Interfaces:</dt>
-<dd>Serializable, Comparable&lt;<a href="RuntimeUtil.AccessDirection.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.AccessDirection</a>&gt;</dd>
+<dd><code>Serializable</code>, <code>Comparable&lt;<a href="RuntimeUtil.AccessDirection.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.AccessDirection</a>&gt;</code></dd>
 </dl>
 <dl>
 <dt>Enclosing class:</dt>
 <dd><a href="RuntimeUtil.html" title="class in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil</a></dd>
 </dl>
 <hr>
-<br>
 <pre>public static enum <span class="typeNameLabel">RuntimeUtil.AccessDirection</span>
 extends Enum&lt;<a href="RuntimeUtil.AccessDirection.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.AccessDirection</a>&gt;</pre>
 </li>
@@ -49,60 +50,69 @@
 <ul class="blockList">
 <li class="blockList">
 <!-- =========== ENUM CONSTANT SUMMARY =========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="enum.constant.summary">
+<li class="blockList"><a id="enum.constant.summary">
 <!--   -->
 </a>
 <h3>Enum Constant Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Enum Constant Summary table, listing enum constants, and an explanation">
+<table class="memberSummary">
 <caption><span>Enum Constants</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
-<th class="colOne" scope="col">Enum Constant and Description</th>
+<th class="colFirst" scope="col">Enum Constant</th>
+<th class="colLast" scope="col">Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="#READ">READ</a></span></code>&nbsp;</td>
+<th class="colFirst" scope="row"><code><span class="memberNameLink"><a href="#READ">READ</a></span></code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="#WRITE">WRITE</a></span></code>&nbsp;</td>
+<th class="colFirst" scope="row"><code><span class="memberNameLink"><a href="#WRITE">WRITE</a></span></code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 </table>
 </li>
 </ul>
+</section>
 <!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a id="method.summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<table class="memberSummary">
 <caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>static <a href="RuntimeUtil.AccessDirection.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.AccessDirection</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="RuntimeUtil.AccessDirection.html#valueOf-java.lang.String-">valueOf</a></span>(String&nbsp;name)</code>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#valueOf(java.lang.String)">valueOf</a></span>&#8203;(String&nbsp;name)</code></th>
+<td class="colLast">
 <div class="block">Returns the enum constant of this type with the specified name.</div>
 </td>
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>static <a href="RuntimeUtil.AccessDirection.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.AccessDirection</a>[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="RuntimeUtil.AccessDirection.html#values--">values</a></span>()</code>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#values()">values</a></span>()</code></th>
+<td class="colLast">
 <div class="block">Returns an array containing the constants of this enum type, in
 the order they are declared.</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.Enum">
+<li class="blockList"><a id="methods.inherited.from.class.Enum">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;Enum</h3>
 <code>compareTo, equals, getDeclaringClass, hashCode, name, ordinal, toString, valueOf</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.Object">
+<li class="blockList"><a id="methods.inherited.from.class.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;Object</h3>
@@ -110,6 +120,7 @@
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
@@ -117,12 +128,13 @@
 <ul class="blockList">
 <li class="blockList">
 <!-- ============ ENUM CONSTANT DETAIL =========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="enum.constant.detail">
+<li class="blockList"><a id="enum.constant.detail">
 <!--   -->
 </a>
 <h3>Enum Constant Detail</h3>
-<a name="READ">
+<a id="READ">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -131,7 +143,7 @@
 <pre>public static final&nbsp;<a href="RuntimeUtil.AccessDirection.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.AccessDirection</a> READ</pre>
 </li>
 </ul>
-<a name="WRITE">
+<a id="WRITE">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -142,21 +154,23 @@
 </ul>
 </li>
 </ul>
+</section>
 <!-- ============ METHOD DETAIL ========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a id="method.detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="values--">
+<a id="values()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>values</h4>
-<pre>public static&nbsp;<a href="RuntimeUtil.AccessDirection.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.AccessDirection</a>[]&nbsp;values()</pre>
+<pre class="methodSignature">public static&nbsp;<a href="RuntimeUtil.AccessDirection.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.AccessDirection</a>[]&nbsp;values()</pre>
 <div class="block">Returns an array containing the constants of this enum type, in
-the order they are declared.  This method may be used to iterate
+the order they are declared. This method may be used to iterate
 over the constants as follows:
 <pre>
 for (RuntimeUtil.AccessDirection c : RuntimeUtil.AccessDirection.values())
@@ -168,13 +182,13 @@
 </dl>
 </li>
 </ul>
-<a name="valueOf-java.lang.String-">
+<a id="valueOf(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>valueOf</h4>
-<pre>public static&nbsp;<a href="RuntimeUtil.AccessDirection.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.AccessDirection</a>&nbsp;valueOf(String&nbsp;name)</pre>
+<pre class="methodSignature">public static&nbsp;<a href="RuntimeUtil.AccessDirection.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.AccessDirection</a>&nbsp;valueOf&#8203;(String&nbsp;name)</pre>
 <div class="block">Returns the enum constant of this type with the specified name.
 The string must match <i>exactly</i> an identifier used to declare an
 enum constant in this type.  (Extraneous whitespace characters are 
@@ -192,10 +206,12 @@
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
 </div>
+</main>
 <!-- ========= END OF CLASS DATA ========= -->
 </body>
 </html>
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 7dcc939..f007f87 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
@@ -1,16 +1,18 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML>
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
+<!-- Generated by javadoc (11.0.8) on Mon Nov 30 13:15:36 CET 2020 -->
 <title>RuntimeUtil.PositionType</title>
-<meta name="date" content="2019-07-31">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-11-30">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
 <!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
 <div class="header">
-<div class="subTitle">org.eclipse.app4mc.amalthea.model.util</div>
+<div class="subTitle"><span class="packageLabelInType">Package</span>&nbsp;<a href="package-summary.html">org.eclipse.app4mc.amalthea.model.util</a></div>
 <h2 title="Enum RuntimeUtil.PositionType" class="title">Enum RuntimeUtil.PositionType</h2>
 </div>
 <div class="contentContainer">
@@ -21,7 +23,7 @@
 <li>Enum&lt;<a href="RuntimeUtil.PositionType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.PositionType</a>&gt;</li>
 <li>
 <ul class="inheritance">
-<li>RuntimeUtil.PositionType</li>
+<li>PositionType</li>
 </ul>
 </li>
 </ul>
@@ -32,14 +34,13 @@
 <li class="blockList">
 <dl>
 <dt>All Implemented Interfaces:</dt>
-<dd>Serializable, Comparable&lt;<a href="RuntimeUtil.PositionType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.PositionType</a>&gt;</dd>
+<dd><code>Serializable</code>, <code>Comparable&lt;<a href="RuntimeUtil.PositionType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.PositionType</a>&gt;</code></dd>
 </dl>
 <dl>
 <dt>Enclosing class:</dt>
 <dd><a href="RuntimeUtil.html" title="class in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil</a></dd>
 </dl>
 <hr>
-<br>
 <pre>public static enum <span class="typeNameLabel">RuntimeUtil.PositionType</span>
 extends Enum&lt;<a href="RuntimeUtil.PositionType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.PositionType</a>&gt;</pre>
 </li>
@@ -49,60 +50,69 @@
 <ul class="blockList">
 <li class="blockList">
 <!-- =========== ENUM CONSTANT SUMMARY =========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="enum.constant.summary">
+<li class="blockList"><a id="enum.constant.summary">
 <!--   -->
 </a>
 <h3>Enum Constant Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Enum Constant Summary table, listing enum constants, and an explanation">
+<table class="memberSummary">
 <caption><span>Enum Constants</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
-<th class="colOne" scope="col">Enum Constant and Description</th>
+<th class="colFirst" scope="col">Enum Constant</th>
+<th class="colLast" scope="col">Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="#FIRST">FIRST</a></span></code>&nbsp;</td>
+<th class="colFirst" scope="row"><code><span class="memberNameLink"><a href="#FIRST">FIRST</a></span></code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="#LAST">LAST</a></span></code>&nbsp;</td>
+<th class="colFirst" scope="row"><code><span class="memberNameLink"><a href="#LAST">LAST</a></span></code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 </table>
 </li>
 </ul>
+</section>
 <!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a id="method.summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<table class="memberSummary">
 <caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>static <a href="RuntimeUtil.PositionType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.PositionType</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#valueOf-java.lang.String-">valueOf</a></span>(String&nbsp;name)</code>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#valueOf(java.lang.String)">valueOf</a></span>&#8203;(String&nbsp;name)</code></th>
+<td class="colLast">
 <div class="block">Returns the enum constant of this type with the specified name.</div>
 </td>
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>static <a href="RuntimeUtil.PositionType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.PositionType</a>[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#values--">values</a></span>()</code>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#values()">values</a></span>()</code></th>
+<td class="colLast">
 <div class="block">Returns an array containing the constants of this enum type, in
 the order they are declared.</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.Enum">
+<li class="blockList"><a id="methods.inherited.from.class.Enum">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;Enum</h3>
 <code>compareTo, equals, getDeclaringClass, hashCode, name, ordinal, toString, valueOf</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.Object">
+<li class="blockList"><a id="methods.inherited.from.class.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;Object</h3>
@@ -110,6 +120,7 @@
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
@@ -117,12 +128,13 @@
 <ul class="blockList">
 <li class="blockList">
 <!-- ============ ENUM CONSTANT DETAIL =========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="enum.constant.detail">
+<li class="blockList"><a id="enum.constant.detail">
 <!--   -->
 </a>
 <h3>Enum Constant Detail</h3>
-<a name="FIRST">
+<a id="FIRST">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -131,7 +143,7 @@
 <pre>public static final&nbsp;<a href="RuntimeUtil.PositionType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.PositionType</a> FIRST</pre>
 </li>
 </ul>
-<a name="LAST">
+<a id="LAST">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -142,21 +154,23 @@
 </ul>
 </li>
 </ul>
+</section>
 <!-- ============ METHOD DETAIL ========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a id="method.detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="values--">
+<a id="values()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>values</h4>
-<pre>public static&nbsp;<a href="RuntimeUtil.PositionType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.PositionType</a>[]&nbsp;values()</pre>
+<pre class="methodSignature">public static&nbsp;<a href="RuntimeUtil.PositionType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.PositionType</a>[]&nbsp;values()</pre>
 <div class="block">Returns an array containing the constants of this enum type, in
-the order they are declared.  This method may be used to iterate
+the order they are declared. This method may be used to iterate
 over the constants as follows:
 <pre>
 for (RuntimeUtil.PositionType c : RuntimeUtil.PositionType.values())
@@ -168,13 +182,13 @@
 </dl>
 </li>
 </ul>
-<a name="valueOf-java.lang.String-">
+<a id="valueOf(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>valueOf</h4>
-<pre>public static&nbsp;<a href="RuntimeUtil.PositionType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.PositionType</a>&nbsp;valueOf(String&nbsp;name)</pre>
+<pre class="methodSignature">public static&nbsp;<a href="RuntimeUtil.PositionType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.PositionType</a>&nbsp;valueOf&#8203;(String&nbsp;name)</pre>
 <div class="block">Returns the enum constant of this type with the specified name.
 The string must match <i>exactly</i> an identifier used to declare an
 enum constant in this type.  (Extraneous whitespace characters are 
@@ -192,10 +206,12 @@
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
 </div>
+</main>
 <!-- ========= END OF CLASS DATA ========= -->
 </body>
 </html>
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 80bbf3b..4f6b8b2 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
@@ -1,16 +1,18 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML>
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
+<!-- Generated by javadoc (11.0.8) on Mon Nov 30 13:15:36 CET 2020 -->
 <title>RuntimeUtil.TimeType</title>
-<meta name="date" content="2019-07-31">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-11-30">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
 <!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
 <div class="header">
-<div class="subTitle">org.eclipse.app4mc.amalthea.model.util</div>
+<div class="subTitle"><span class="packageLabelInType">Package</span>&nbsp;<a href="package-summary.html">org.eclipse.app4mc.amalthea.model.util</a></div>
 <h2 title="Enum RuntimeUtil.TimeType" class="title">Enum RuntimeUtil.TimeType</h2>
 </div>
 <div class="contentContainer">
@@ -21,7 +23,7 @@
 <li>Enum&lt;<a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&gt;</li>
 <li>
 <ul class="inheritance">
-<li>RuntimeUtil.TimeType</li>
+<li>TimeType</li>
 </ul>
 </li>
 </ul>
@@ -32,14 +34,13 @@
 <li class="blockList">
 <dl>
 <dt>All Implemented Interfaces:</dt>
-<dd>Serializable, Comparable&lt;<a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&gt;</dd>
+<dd><code>Serializable</code>, <code>Comparable&lt;<a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&gt;</code></dd>
 </dl>
 <dl>
 <dt>Enclosing class:</dt>
 <dd><a href="RuntimeUtil.html" title="class in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil</a></dd>
 </dl>
 <hr>
-<br>
 <pre>public static enum <span class="typeNameLabel">RuntimeUtil.TimeType</span>
 extends Enum&lt;<a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&gt;</pre>
 </li>
@@ -49,63 +50,73 @@
 <ul class="blockList">
 <li class="blockList">
 <!-- =========== ENUM CONSTANT SUMMARY =========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="enum.constant.summary">
+<li class="blockList"><a id="enum.constant.summary">
 <!--   -->
 </a>
 <h3>Enum Constant Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Enum Constant Summary table, listing enum constants, and an explanation">
+<table class="memberSummary">
 <caption><span>Enum Constants</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
-<th class="colOne" scope="col">Enum Constant and Description</th>
+<th class="colFirst" scope="col">Enum Constant</th>
+<th class="colLast" scope="col">Description</th>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="#ACET">ACET</a></span></code>&nbsp;</td>
+<th class="colFirst" scope="row"><code><span class="memberNameLink"><a href="#ACET">ACET</a></span></code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="#BCET">BCET</a></span></code>&nbsp;</td>
+<th class="colFirst" scope="row"><code><span class="memberNameLink"><a href="#BCET">BCET</a></span></code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="#WCET">WCET</a></span></code>&nbsp;</td>
+<th class="colFirst" scope="row"><code><span class="memberNameLink"><a href="#WCET">WCET</a></span></code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 </table>
 </li>
 </ul>
+</section>
 <!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a id="method.summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<table class="memberSummary">
 <caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>static <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a></code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#valueOf-java.lang.String-">valueOf</a></span>(String&nbsp;name)</code>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#valueOf(java.lang.String)">valueOf</a></span>&#8203;(String&nbsp;name)</code></th>
+<td class="colLast">
 <div class="block">Returns the enum constant of this type with the specified name.</div>
 </td>
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>static <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>[]</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#values--">values</a></span>()</code>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#values()">values</a></span>()</code></th>
+<td class="colLast">
 <div class="block">Returns an array containing the constants of this enum type, in
 the order they are declared.</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.Enum">
+<li class="blockList"><a id="methods.inherited.from.class.Enum">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;Enum</h3>
 <code>compareTo, equals, getDeclaringClass, hashCode, name, ordinal, toString, valueOf</code></li>
 </ul>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.Object">
+<li class="blockList"><a id="methods.inherited.from.class.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;Object</h3>
@@ -113,6 +124,7 @@
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
@@ -120,12 +132,13 @@
 <ul class="blockList">
 <li class="blockList">
 <!-- ============ ENUM CONSTANT DETAIL =========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="enum.constant.detail">
+<li class="blockList"><a id="enum.constant.detail">
 <!--   -->
 </a>
 <h3>Enum Constant Detail</h3>
-<a name="BCET">
+<a id="BCET">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -134,7 +147,7 @@
 <pre>public static final&nbsp;<a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a> BCET</pre>
 </li>
 </ul>
-<a name="ACET">
+<a id="ACET">
 <!--   -->
 </a>
 <ul class="blockList">
@@ -143,7 +156,7 @@
 <pre>public static final&nbsp;<a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a> ACET</pre>
 </li>
 </ul>
-<a name="WCET">
+<a id="WCET">
 <!--   -->
 </a>
 <ul class="blockListLast">
@@ -154,21 +167,23 @@
 </ul>
 </li>
 </ul>
+</section>
 <!-- ============ METHOD DETAIL ========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a id="method.detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="values--">
+<a id="values()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>values</h4>
-<pre>public static&nbsp;<a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>[]&nbsp;values()</pre>
+<pre class="methodSignature">public static&nbsp;<a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>[]&nbsp;values()</pre>
 <div class="block">Returns an array containing the constants of this enum type, in
-the order they are declared.  This method may be used to iterate
+the order they are declared. This method may be used to iterate
 over the constants as follows:
 <pre>
 for (RuntimeUtil.TimeType c : RuntimeUtil.TimeType.values())
@@ -180,13 +195,13 @@
 </dl>
 </li>
 </ul>
-<a name="valueOf-java.lang.String-">
+<a id="valueOf(java.lang.String)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>valueOf</h4>
-<pre>public static&nbsp;<a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;valueOf(String&nbsp;name)</pre>
+<pre class="methodSignature">public static&nbsp;<a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;valueOf&#8203;(String&nbsp;name)</pre>
 <div class="block">Returns the enum constant of this type with the specified name.
 The string must match <i>exactly</i> an identifier used to declare an
 enum constant in this type.  (Extraneous whitespace characters are 
@@ -204,10 +219,12 @@
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
 </div>
+</main>
 <!-- ========= END OF CLASS DATA ========= -->
 </body>
 </html>
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 9e85068..08029fd 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
@@ -1,16 +1,18 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML>
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
+<!-- Generated by javadoc (11.0.8) on Mon Nov 30 13:15:36 CET 2020 -->
 <title>RuntimeUtil</title>
-<meta name="date" content="2019-07-31">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-11-30">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
 <!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
 <div class="header">
-<div class="subTitle">org.eclipse.app4mc.amalthea.model.util</div>
+<div class="subTitle"><span class="packageLabelInType">Package</span>&nbsp;<a href="package-summary.html">org.eclipse.app4mc.amalthea.model.util</a></div>
 <h2 title="Class RuntimeUtil" class="title">Class RuntimeUtil</h2>
 </div>
 <div class="contentContainer">
@@ -26,7 +28,6 @@
 <ul class="blockList">
 <li class="blockList">
 <hr>
-<br>
 <pre>public class <span class="typeNameLabel">RuntimeUtil</span>
 extends Object</pre>
 </li>
@@ -36,311 +37,346 @@
 <ul class="blockList">
 <li class="blockList">
 <!-- ======== NESTED CLASS SUMMARY ======== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="nested.class.summary">
+<li class="blockList"><a id="nested.class.summary">
 <!--   -->
 </a>
 <h3>Nested Class Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Nested Class Summary table, listing nested classes, and an explanation">
+<table class="memberSummary">
 <caption><span>Nested Classes</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Class and Description</th>
+<th class="colSecond" scope="col">Class</th>
+<th class="colLast" scope="col">Description</th>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="RuntimeUtil.AccessDirection.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.AccessDirection</a></span></code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="RuntimeUtil.AccessDirection.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.AccessDirection</a></span></code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="RuntimeUtil.PositionType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.PositionType</a></span></code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="RuntimeUtil.PositionType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.PositionType</a></span></code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">
 <td class="colFirst"><code>static class&nbsp;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a></span></code>&nbsp;</td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a></span></code></th>
+<td class="colLast">&nbsp;</td>
 </tr>
 </table>
 </li>
 </ul>
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="#RuntimeUtil--">RuntimeUtil</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
+</section>
 <!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a id="method.summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<table class="memberSummary">
 <caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>static Runnable</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#addRuntimeToProcessAsNewRunnable-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.app4mc.amalthea.model.ExecutionNeed-java.lang.String-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.PositionType-">addRuntimeToProcessAsNewRunnable</a></span>(Process&nbsp;process,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#addRuntimeToProcessAsNewRunnable(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.app4mc.amalthea.model.ExecutionNeed,java.lang.String,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.PositionType)">addRuntimeToProcessAsNewRunnable</a></span>&#8203;(Process&nbsp;process,
                                 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>
+                                <a href="RuntimeUtil.PositionType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.PositionType</a>&nbsp;positon)</code></th>
+<td class="colLast">
 <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">
 <td class="colFirst"><code>static Runnable</code></td>
-<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,
+<th class="colSecond" scope="row"><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>&#8203;(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>
+                                <a href="RuntimeUtil.PositionType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.PositionType</a>&nbsp;positon)</code></th>
+<td class="colLast">
 <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>
-<td class="colLast"><code><span class="memberNameLink"><a href="#addRuntimeToRunnable-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.app4mc.amalthea.model.ExecutionNeed-">addRuntimeToRunnable</a></span>(Runnable&nbsp;runnable,
-                    ExecutionNeed&nbsp;need)</code>
-<div class="block">Adds Runtime (given as ExecutionNeed) to an existing Runnable currently
- without consideration of modes</div>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#addRuntimeToRunnable(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.app4mc.amalthea.model.ExecutionNeed)">addRuntimeToRunnable</a></span>&#8203;(Runnable&nbsp;runnable,
+                    ExecutionNeed&nbsp;need)</code></th>
+<td class="colLast">
+<div class="block">Adds Runtime (given as ExecutionNeed) to an existing Runnable
+ currently without consideration of modes</div>
 </td>
 </tr>
 <tr id="i3" class="rowColor">
 <td class="colFirst"><code>static void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#addRuntimeToRunnable-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.app4mc.amalthea.model.Ticks-">addRuntimeToRunnable</a></span>(Runnable&nbsp;runnable,
-                    Ticks&nbsp;ticks)</code>
-<div class="block">Adds Runtime (given as Ticks) to an existing Runnable currently
- without consideration of modes</div>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#addRuntimeToRunnable(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.app4mc.amalthea.model.Ticks)">addRuntimeToRunnable</a></span>&#8203;(Runnable&nbsp;runnable,
+                    Ticks&nbsp;ticks)</code></th>
+<td class="colLast">
+<div class="block">Adds Runtime (given as Ticks) to an existing Runnable
+ currently without consideration of modes</div>
 </td>
 </tr>
 <tr id="i4" class="altColor">
 <td class="colFirst"><code>static void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#clearRuntimeOfModel-org.eclipse.app4mc.amalthea.model.Amalthea-org.eclipse.emf.common.util.EMap-">clearRuntimeOfModel</a></span>(Amalthea&nbsp;model,
-                   EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#clearRuntimeOfModel(org.eclipse.app4mc.amalthea.model.Amalthea,org.eclipse.emf.common.util.EMap)">clearRuntimeOfModel</a></span>&#8203;(Amalthea&nbsp;model,
+                   EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
 <div class="block">Clears all runtime information (execution needs and ticks)</div>
 </td>
 </tr>
 <tr id="i5" class="rowColor">
 <td class="colFirst"><code>static void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#clearRuntimeOfProcess-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-">clearRuntimeOfProcess</a></span>(Process&nbsp;process,
-                     EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#clearRuntimeOfProcess(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.emf.common.util.EMap)">clearRuntimeOfProcess</a></span>&#8203;(Process&nbsp;process,
+                     EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
 <div class="block">Clears all runtime information (execution needs and ticks)</div>
 </td>
 </tr>
 <tr id="i6" class="altColor">
 <td class="colFirst"><code>static void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#clearRuntimeOfRunnable-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.emf.common.util.EMap-">clearRuntimeOfRunnable</a></span>(Runnable&nbsp;runnable,
-                      EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#clearRuntimeOfRunnable(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.emf.common.util.EMap)">clearRuntimeOfRunnable</a></span>&#8203;(Runnable&nbsp;runnable,
+                      EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
 <div class="block">Clears all runtime information (execution needs and ticks)</div>
 </td>
 </tr>
 <tr id="i7" class="rowColor">
-<td class="colFirst"><code>static Map&lt;Process,Double&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getCumulativeProcessUtilizations-org.eclipse.app4mc.amalthea.model.Amalthea-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType-java.util.List-org.eclipse.emf.common.util.EMap-">getCumulativeProcessUtilizations</a></span>(Amalthea&nbsp;model,
+<td class="colFirst"><code>static Map&lt;Process,&#8203;Double&gt;</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getCumulativeProcessUtilizations(org.eclipse.app4mc.amalthea.model.Amalthea,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType,java.util.List,org.eclipse.emf.common.util.EMap)">getCumulativeProcessUtilizations</a></span>&#8203;(Amalthea&nbsp;model,
                                 <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;tt,
                                 List&lt;HwFeature&gt;&nbsp;hwFeatures,
-                                EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
+                                EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
 <div class="block">Returns the cumulative process utilization, i.e. runtime on every procUnit summed up</div>
 </td>
 </tr>
 <tr id="i8" class="altColor">
 <td class="colFirst"><code>static Time</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getExecutionTimeForCycles-double-org.eclipse.app4mc.amalthea.model.Frequency-">getExecutionTimeForCycles</a></span>(double&nbsp;ticks,
-                         Frequency&nbsp;frequency)</code>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getExecutionTimeForCycles(double,org.eclipse.app4mc.amalthea.model.Frequency)">getExecutionTimeForCycles</a></span>&#8203;(double&nbsp;ticks,
+                         Frequency&nbsp;frequency)</code></th>
+<td class="colLast">
 <div class="block">Computes time for a number of ticks with a given frequency</div>
 </td>
 </tr>
 <tr id="i9" class="rowColor">
 <td class="colFirst"><code>static Time</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getExecutionTimeForExecutionNeedEntry-org.eclipse.app4mc.amalthea.model.IDiscreteValueDeviation-org.eclipse.app4mc.amalthea.model.HwFeatureCategory-org.eclipse.app4mc.amalthea.model.ProcessingUnit-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType-">getExecutionTimeForExecutionNeedEntry</a></span>(IDiscreteValueDeviation&nbsp;deviation,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getExecutionTimeForExecutionNeedEntry(org.eclipse.app4mc.amalthea.model.IDiscreteValueDeviation,org.eclipse.app4mc.amalthea.model.HwFeatureCategory,org.eclipse.app4mc.amalthea.model.ProcessingUnit,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType)">getExecutionTimeForExecutionNeedEntry</a></span>&#8203;(IDiscreteValueDeviation&nbsp;deviation,
                                      HwFeatureCategory&nbsp;hwFeatureCategory,
                                      ProcessingUnit&nbsp;processingUnit,
-                                     <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;executionCase)</code>
+                                     <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;executionCase)</code></th>
+<td class="colLast">
 <div class="block">Computes time for specific execution need entry on a given processing unit</div>
 </td>
 </tr>
 <tr id="i10" class="altColor">
 <td class="colFirst"><code>static Time</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getExecutionTimeForExecutionNeeds-org.eclipse.app4mc.amalthea.model.ExecutionNeed-org.eclipse.app4mc.amalthea.model.ProcessingUnit-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType-">getExecutionTimeForExecutionNeeds</a></span>(ExecutionNeed&nbsp;need,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getExecutionTimeForExecutionNeeds(org.eclipse.app4mc.amalthea.model.ExecutionNeed,org.eclipse.app4mc.amalthea.model.ProcessingUnit,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType)">getExecutionTimeForExecutionNeeds</a></span>&#8203;(ExecutionNeed&nbsp;need,
                                  ProcessingUnit&nbsp;processingUnit,
-                                 <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;executionCase)</code>
+                                 <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;executionCase)</code></th>
+<td class="colLast">
 <div class="block">Computes time for execution needs on a given processing unit</div>
 </td>
 </tr>
 <tr id="i11" class="rowColor">
 <td class="colFirst"><code>static Time</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getExecutionTimeForProcess-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType-">getExecutionTimeForProcess</a></span>(Process&nbsp;process,
-                          EMap&lt;ModeLabel,String&gt;&nbsp;modes,
-                          <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;executionCase)</code>
-<div class="block">Computes the execution time of a Process (Task or ISR) - unique mapping is required</div>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getExecutionTimeForProcess(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.app4mc.amalthea.model.ProcessingUnit,org.eclipse.emf.common.util.EMap,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType)">getExecutionTimeForProcess</a></span>&#8203;(Process&nbsp;process,
+                          ProcessingUnit&nbsp;processingUnit,
+                          EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes,
+                          <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;executionCase)</code></th>
+<td class="colLast">
+<div class="block">Computes the execution time of a Process (Task or ISR) on a given processing unit</div>
 </td>
 </tr>
 <tr id="i12" class="altColor">
 <td class="colFirst"><code>static Time</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getExecutionTimeForProcess-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.app4mc.amalthea.model.ProcessingUnit-org.eclipse.emf.common.util.EMap-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType-">getExecutionTimeForProcess</a></span>(Process&nbsp;process,
-                          ProcessingUnit&nbsp;processingUnit,
-                          EMap&lt;ModeLabel,String&gt;&nbsp;modes,
-                          <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;executionCase)</code>
-<div class="block">Computes the execution time of a Process (Task or ISR) on a given processing unit</div>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getExecutionTimeForProcess(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.emf.common.util.EMap,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType)">getExecutionTimeForProcess</a></span>&#8203;(Process&nbsp;process,
+                          EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes,
+                          <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;executionCase)</code></th>
+<td class="colLast">
+<div class="block">Computes the execution time of a Process (Task or ISR) - unique mapping is required</div>
 </td>
 </tr>
 <tr id="i13" class="rowColor">
 <td class="colFirst"><code>static Time</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getExecutionTimeForRunnable-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.app4mc.amalthea.model.ProcessingUnit-org.eclipse.emf.common.util.EMap-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType-">getExecutionTimeForRunnable</a></span>(Runnable&nbsp;runnable,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getExecutionTimeForRunnable(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.app4mc.amalthea.model.ProcessingUnit,org.eclipse.emf.common.util.EMap,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType)">getExecutionTimeForRunnable</a></span>&#8203;(Runnable&nbsp;runnable,
                            ProcessingUnit&nbsp;processingUnit,
-                           EMap&lt;ModeLabel,String&gt;&nbsp;modes,
-                           <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;executionCase)</code>
+                           EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes,
+                           <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;executionCase)</code></th>
+<td class="colLast">
 <div class="block">Computes the execution time of a Runnable on a given processing unit</div>
 </td>
 </tr>
 <tr id="i14" class="altColor">
 <td class="colFirst"><code>static Time</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getExecutionTimeForTicks-org.eclipse.app4mc.amalthea.model.Ticks-org.eclipse.app4mc.amalthea.model.ProcessingUnit-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType-">getExecutionTimeForTicks</a></span>(Ticks&nbsp;ticks,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getExecutionTimeForTicks(org.eclipse.app4mc.amalthea.model.Ticks,org.eclipse.app4mc.amalthea.model.ProcessingUnit,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType)">getExecutionTimeForTicks</a></span>&#8203;(Ticks&nbsp;ticks,
                         ProcessingUnit&nbsp;processingUnit,
-                        <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;executionCase)</code>
+                        <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;executionCase)</code></th>
+<td class="colLast">
 <div class="block">Computes time for ticks on a given processing unit</div>
 </td>
 </tr>
 <tr id="i15" class="rowColor">
 <td class="colFirst"><code>static Time</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getExecutionTimeForTicksDeviation-org.eclipse.app4mc.amalthea.model.IDiscreteValueDeviation-org.eclipse.app4mc.amalthea.model.ProcessingUnit-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType-">getExecutionTimeForTicksDeviation</a></span>(IDiscreteValueDeviation&nbsp;deviation,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getExecutionTimeForTicksDeviation(org.eclipse.app4mc.amalthea.model.IDiscreteValueDeviation,org.eclipse.app4mc.amalthea.model.ProcessingUnit,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType)">getExecutionTimeForTicksDeviation</a></span>&#8203;(IDiscreteValueDeviation&nbsp;deviation,
                                  ProcessingUnit&nbsp;processingUnit,
-                                 <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;executionCase)</code>
+                                 <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;executionCase)</code></th>
+<td class="colLast">
 <div class="block">Computes time for ticks on a given processing unit</div>
 </td>
 </tr>
 <tr id="i16" class="altColor">
-<td class="colFirst"><code>static Map&lt;Process,List&lt;Time&gt;&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getPeriodsOfAllProcesses-org.eclipse.app4mc.amalthea.model.Amalthea-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType-org.eclipse.emf.common.util.EMap-">getPeriodsOfAllProcesses</a></span>(Amalthea&nbsp;model,
+<td class="colFirst"><code>static Map&lt;Process,&#8203;List&lt;Time&gt;&gt;</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getPeriodsOfAllProcesses(org.eclipse.app4mc.amalthea.model.Amalthea,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType,org.eclipse.emf.common.util.EMap)">getPeriodsOfAllProcesses</a></span>&#8203;(Amalthea&nbsp;model,
                         <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;tt,
-                        EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
+                        EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
 <div class="block">Gets all Period ranges from the model</div>
 </td>
 </tr>
 <tr id="i17" class="rowColor">
 <td class="colFirst"><code>static List&lt;Time&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getPeriodsOfProcess-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType-org.eclipse.emf.common.util.EMap-">getPeriodsOfProcess</a></span>(Process&nbsp;process,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getPeriodsOfProcess(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType,org.eclipse.emf.common.util.EMap)">getPeriodsOfProcess</a></span>&#8203;(Process&nbsp;process,
                    <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;tt,
-                   EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
+                   EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
 <div class="block">Returns a list of all triggering periods.</div>
 </td>
 </tr>
 <tr id="i18" class="altColor">
-<td class="colFirst"><code>static &lt;T&gt;&nbsp;Map&lt;Stimulus,Long&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getPlainTriggerForProcess-org.eclipse.app4mc.amalthea.model.Process-long-java.util.function.Function-">getPlainTriggerForProcess</a></span>(Process&nbsp;process,
+<td class="colFirst"><code>static Map&lt;Stimulus,&#8203;Long&gt;</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getPlainTriggerForProcess(org.eclipse.app4mc.amalthea.model.Process,long,java.util.function.Function)">getPlainTriggerForProcess</a></span>&#8203;(Process&nbsp;process,
                          long&nbsp;depthCounter,
-                         Function&lt;Stimulus,Boolean&gt;&nbsp;filter)</code>
+                         Function&lt;Stimulus,&#8203;Boolean&gt;&nbsp;filter)</code></th>
+<td class="colLast">
 <div class="block">Returns all stimuli (matching filter) that trigger the given process</div>
 </td>
 </tr>
 <tr id="i19" class="rowColor">
-<td class="colFirst"><code>static &lt;T&gt;&nbsp;Map&lt;Process,Map&lt;Stimulus,Long&gt;&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getPlainTriggersForModel-org.eclipse.app4mc.amalthea.model.Amalthea-java.util.function.Function-">getPlainTriggersForModel</a></span>(Amalthea&nbsp;model,
-                        Function&lt;Stimulus,Boolean&gt;&nbsp;filter)</code>
+<td class="colFirst"><code>static Map&lt;Process,&#8203;Map&lt;Stimulus,&#8203;Long&gt;&gt;</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getPlainTriggersForModel(org.eclipse.app4mc.amalthea.model.Amalthea,java.util.function.Function)">getPlainTriggersForModel</a></span>&#8203;(Amalthea&nbsp;model,
+                        Function&lt;Stimulus,&#8203;Boolean&gt;&nbsp;filter)</code></th>
+<td class="colLast">
 <div class="block">Returns a map from process to all stimuli (matching filter) that
  lead to that process with the correct prescaler</div>
 </td>
 </tr>
 <tr id="i20" class="altColor">
-<td class="colFirst"><code>static Map&lt;Process,List&lt;ITimeDeviation&gt;&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getProcessesWithRelativePeriodicStimulus-org.eclipse.app4mc.amalthea.model.Amalthea-">getProcessesWithRelativePeriodicStimulus</a></span>(Amalthea&nbsp;model)</code>
+<td class="colFirst"><code>static Map&lt;Process,&#8203;List&lt;ITimeDeviation&gt;&gt;</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getProcessesWithRelativePeriodicStimulus(org.eclipse.app4mc.amalthea.model.Amalthea)">getProcessesWithRelativePeriodicStimulus</a></span>&#8203;(Amalthea&nbsp;model)</code></th>
+<td class="colLast">
 <div class="block">Returns a Map of all sporadically triggered processes with their prescaler</div>
 </td>
 </tr>
 <tr id="i21" class="rowColor">
-<td class="colFirst"><code>static Map&lt;Process,List&lt;Time&gt;&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getProcessesWithRelativePeriodicStimulus-org.eclipse.app4mc.amalthea.model.Amalthea-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType-">getProcessesWithRelativePeriodicStimulus</a></span>(Amalthea&nbsp;model,
-                                        <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;tt)</code>
+<td class="colFirst"><code>static Map&lt;Process,&#8203;List&lt;Time&gt;&gt;</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getProcessesWithRelativePeriodicStimulus(org.eclipse.app4mc.amalthea.model.Amalthea,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType)">getProcessesWithRelativePeriodicStimulus</a></span>&#8203;(Amalthea&nbsp;model,
+                                        <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;tt)</code></th>
+<td class="colLast">
 <div class="block">Returns a Map of all sporadically triggered processes with their prescaler</div>
 </td>
 </tr>
 <tr id="i22" class="altColor">
-<td class="colFirst"><code>static Map&lt;ProcessingUnit,Double&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getProcessUtilization-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.app4mc.amalthea.model.Amalthea-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType-java.util.List-org.eclipse.emf.common.util.EMap-">getProcessUtilization</a></span>(Process&nbsp;process,
+<td class="colFirst"><code>static Map&lt;ProcessingUnit,&#8203;Double&gt;</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getProcessUtilization(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.app4mc.amalthea.model.Amalthea,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType,java.util.List,org.eclipse.emf.common.util.EMap)">getProcessUtilization</a></span>&#8203;(Process&nbsp;process,
                      Amalthea&nbsp;model,
                      <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;tt,
                      List&lt;HwFeature&gt;&nbsp;hwFeatures,
-                     EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
+                     EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
 <div class="block">Calculates the utilization for a given process</div>
 </td>
 </tr>
 <tr id="i23" class="rowColor">
 <td class="colFirst"><code>static double</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getProcessUtilization-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.app4mc.amalthea.model.ProcessingUnit-org.eclipse.app4mc.amalthea.model.Amalthea-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType-java.util.List-org.eclipse.emf.common.util.EMap-">getProcessUtilization</a></span>(Process&nbsp;process,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getProcessUtilization(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.app4mc.amalthea.model.ProcessingUnit,org.eclipse.app4mc.amalthea.model.Amalthea,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType,java.util.List,org.eclipse.emf.common.util.EMap)">getProcessUtilization</a></span>&#8203;(Process&nbsp;process,
                      ProcessingUnit&nbsp;procUnit,
                      Amalthea&nbsp;model,
                      <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;tt,
                      List&lt;HwFeature&gt;&nbsp;hwFeatures,
-                     EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
-<div class="block">Calculates the utilization for a given process on a given procUnit
- 
- Assumption (wrong): All triggers activate the process on all procUnits together!</div>
+                     EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
+<div class="block">Calculates the utilization for a given process on a given procUnit</div>
 </td>
 </tr>
 <tr id="i24" class="altColor">
 <td class="colFirst"><code>static double</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getProcessUtilization-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.app4mc.amalthea.model.Time-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType-org.eclipse.emf.common.util.EMap-">getProcessUtilization</a></span>(Process&nbsp;process,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getProcessUtilization(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.app4mc.amalthea.model.Time,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType,org.eclipse.emf.common.util.EMap)">getProcessUtilization</a></span>&#8203;(Process&nbsp;process,
                      Time&nbsp;period,
                      <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;tt,
-                     EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
+                     EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
 <div class="block">Calculates the process utilization</div>
 </td>
 </tr>
 <tr id="i25" class="rowColor">
 <td class="colFirst"><code>static double</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getProcUnitUtilization-org.eclipse.app4mc.amalthea.model.ProcessingUnit-org.eclipse.app4mc.amalthea.model.Amalthea-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType-java.util.List-org.eclipse.emf.common.util.EMap-">getProcUnitUtilization</a></span>(ProcessingUnit&nbsp;procUnit,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getProcUnitUtilization(org.eclipse.app4mc.amalthea.model.ProcessingUnit,org.eclipse.app4mc.amalthea.model.Amalthea,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType,java.util.List,org.eclipse.emf.common.util.EMap)">getProcUnitUtilization</a></span>&#8203;(ProcessingUnit&nbsp;procUnit,
                       Amalthea&nbsp;model,
                       <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;tt,
                       List&lt;HwFeature&gt;&nbsp;hwFeatures,
-                      EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
+                      EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
 <div class="block">Calculates the utilization for a given procUnit</div>
 </td>
 </tr>
 <tr id="i26" class="altColor">
-<td class="colFirst"><code>static HashMap&lt;Stimulus,Long&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getTriggeredStimuli-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-">getTriggeredStimuli</a></span>(Process&nbsp;process,
-                   EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
-<div class="block">Returns a map of all stimuli, triggered by this process, associated with its prescaler.</div>
+<td class="colFirst"><code>static double</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getTicksForExecutionTime(org.eclipse.app4mc.amalthea.model.Time,org.eclipse.app4mc.amalthea.model.Frequency)">getTicksForExecutionTime</a></span>&#8203;(Time&nbsp;executionTime,
+                        Frequency&nbsp;frequency)</code></th>
+<td class="colLast">
+<div class="block">Computes ticks for a given time and frequency.</div>
 </td>
 </tr>
 <tr id="i27" class="rowColor">
-<td class="colFirst"><code>static Map&lt;Process,Long&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getTriggeringProcesses-org.eclipse.app4mc.amalthea.model.InterProcessStimulus-org.eclipse.emf.common.util.EMap-">getTriggeringProcesses</a></span>(InterProcessStimulus&nbsp;ip,
-                      EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
-<div class="block">Returns all Processes that trigger the given InterProcessStimulus</div>
+<td class="colFirst"><code>static double</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getTicksForExecutionTimeInSeconds(java.math.BigDecimal,org.eclipse.app4mc.amalthea.model.Frequency)">getTicksForExecutionTimeInSeconds</a></span>&#8203;(BigDecimal&nbsp;executionTime,
+                                 Frequency&nbsp;frequency)</code></th>
+<td class="colLast">
+<div class="block">Computes ticks for a given time (in seconds) and frequency.</div>
 </td>
 </tr>
 <tr id="i28" class="altColor">
-<td class="colFirst"><code>static void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#setRuntimeOfRunnable-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.app4mc.amalthea.model.ExecutionNeed-org.eclipse.emf.common.util.EMap-">setRuntimeOfRunnable</a></span>(Runnable&nbsp;runnable,
-                    ExecutionNeed&nbsp;need,
-                    EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
-<div class="block">Sets the runtime of the given runnable to the given ExecutionNeed</div>
+<td class="colFirst"><code>static Map&lt;Stimulus,&#8203;Long&gt;</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getTriggeredStimuli(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.emf.common.util.EMap)">getTriggeredStimuli</a></span>&#8203;(Process&nbsp;process,
+                   EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
+<div class="block">Returns a map of all stimuli, triggered by this process, associated with its prescaler.</div>
 </td>
 </tr>
 <tr id="i29" class="rowColor">
+<td class="colFirst"><code>static Map&lt;Process,&#8203;Long&gt;</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getTriggeringProcesses(org.eclipse.app4mc.amalthea.model.InterProcessStimulus,org.eclipse.emf.common.util.EMap)">getTriggeringProcesses</a></span>&#8203;(InterProcessStimulus&nbsp;ip,
+                      EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
+<div class="block">Returns all Processes that trigger the given InterProcessStimulus</div>
+</td>
+</tr>
+<tr id="i30" class="altColor">
 <td class="colFirst"><code>static void</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#setRuntimeOfRunnable-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.app4mc.amalthea.model.Ticks-org.eclipse.emf.common.util.EMap-">setRuntimeOfRunnable</a></span>(Runnable&nbsp;runnable,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setRuntimeOfRunnable(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.app4mc.amalthea.model.ExecutionNeed,org.eclipse.emf.common.util.EMap)">setRuntimeOfRunnable</a></span>&#8203;(Runnable&nbsp;runnable,
+                    ExecutionNeed&nbsp;need,
+                    EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
+<div class="block">Sets the runtime of the given runnable to the given ExecutionNeed</div>
+</td>
+</tr>
+<tr id="i31" class="rowColor">
+<td class="colFirst"><code>static void</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setRuntimeOfRunnable(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.app4mc.amalthea.model.Ticks,org.eclipse.emf.common.util.EMap)">setRuntimeOfRunnable</a></span>&#8203;(Runnable&nbsp;runnable,
                     Ticks&nbsp;ticks,
-                    EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
+                    EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
 <div class="block">Sets the runtime of the given runnable to the given Ticks</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.Object">
+<li class="blockList"><a id="methods.inherited.from.class.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;Object</h3>
@@ -348,43 +384,28 @@
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
 <div class="details">
 <ul class="blockList">
 <li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="RuntimeUtil--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>RuntimeUtil</h4>
-<pre>public&nbsp;RuntimeUtil()</pre>
-</li>
-</ul>
-</li>
-</ul>
 <!-- ============ METHOD DETAIL ========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a id="method.detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="getExecutionTimeForProcess-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType-">
+<a id="getExecutionTimeForProcess(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.emf.common.util.EMap,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getExecutionTimeForProcess</h4>
-<pre>public static&nbsp;Time&nbsp;getExecutionTimeForProcess(Process&nbsp;process,
-                                              EMap&lt;ModeLabel,String&gt;&nbsp;modes,
+<pre class="methodSignature">public static&nbsp;Time&nbsp;getExecutionTimeForProcess&#8203;(Process&nbsp;process,
+                                              EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes,
                                               <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;executionCase)</pre>
 <div class="block">Computes the execution time of a Process (Task or ISR) - unique mapping is required</div>
 <dl>
@@ -397,15 +418,15 @@
 </dl>
 </li>
 </ul>
-<a name="getExecutionTimeForProcess-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.app4mc.amalthea.model.ProcessingUnit-org.eclipse.emf.common.util.EMap-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType-">
+<a id="getExecutionTimeForProcess(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.app4mc.amalthea.model.ProcessingUnit,org.eclipse.emf.common.util.EMap,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getExecutionTimeForProcess</h4>
-<pre>public static&nbsp;Time&nbsp;getExecutionTimeForProcess(Process&nbsp;process,
+<pre class="methodSignature">public static&nbsp;Time&nbsp;getExecutionTimeForProcess&#8203;(Process&nbsp;process,
                                               ProcessingUnit&nbsp;processingUnit,
-                                              EMap&lt;ModeLabel,String&gt;&nbsp;modes,
+                                              EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes,
                                               <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;executionCase)</pre>
 <div class="block">Computes the execution time of a Process (Task or ISR) on a given processing unit</div>
 <dl>
@@ -419,15 +440,15 @@
 </dl>
 </li>
 </ul>
-<a name="getExecutionTimeForRunnable-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.app4mc.amalthea.model.ProcessingUnit-org.eclipse.emf.common.util.EMap-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType-">
+<a id="getExecutionTimeForRunnable(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.app4mc.amalthea.model.ProcessingUnit,org.eclipse.emf.common.util.EMap,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getExecutionTimeForRunnable</h4>
-<pre>public static&nbsp;Time&nbsp;getExecutionTimeForRunnable(Runnable&nbsp;runnable,
+<pre class="methodSignature">public static&nbsp;Time&nbsp;getExecutionTimeForRunnable&#8203;(Runnable&nbsp;runnable,
                                                ProcessingUnit&nbsp;processingUnit,
-                                               EMap&lt;ModeLabel,String&gt;&nbsp;modes,
+                                               EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes,
                                                <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;executionCase)</pre>
 <div class="block">Computes the execution time of a Runnable on a given processing unit</div>
 <dl>
@@ -441,25 +462,25 @@
 </dl>
 </li>
 </ul>
-<a name="getExecutionTimeForTicks-org.eclipse.app4mc.amalthea.model.Ticks-org.eclipse.app4mc.amalthea.model.ProcessingUnit-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType-">
+<a id="getExecutionTimeForTicks(org.eclipse.app4mc.amalthea.model.Ticks,org.eclipse.app4mc.amalthea.model.ProcessingUnit,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getExecutionTimeForTicks</h4>
-<pre>public static&nbsp;Time&nbsp;getExecutionTimeForTicks(Ticks&nbsp;ticks,
+<pre class="methodSignature">public static&nbsp;Time&nbsp;getExecutionTimeForTicks&#8203;(Ticks&nbsp;ticks,
                                             ProcessingUnit&nbsp;processingUnit,
                                             <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;executionCase)</pre>
 <div class="block">Computes time for ticks on a given processing unit</div>
 </li>
 </ul>
-<a name="getExecutionTimeForTicksDeviation-org.eclipse.app4mc.amalthea.model.IDiscreteValueDeviation-org.eclipse.app4mc.amalthea.model.ProcessingUnit-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType-">
+<a id="getExecutionTimeForTicksDeviation(org.eclipse.app4mc.amalthea.model.IDiscreteValueDeviation,org.eclipse.app4mc.amalthea.model.ProcessingUnit,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getExecutionTimeForTicksDeviation</h4>
-<pre>public static&nbsp;Time&nbsp;getExecutionTimeForTicksDeviation(IDiscreteValueDeviation&nbsp;deviation,
+<pre class="methodSignature">public static&nbsp;Time&nbsp;getExecutionTimeForTicksDeviation&#8203;(IDiscreteValueDeviation&nbsp;deviation,
                                                      ProcessingUnit&nbsp;processingUnit,
                                                      <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;executionCase)</pre>
 <div class="block">Computes time for ticks on a given processing unit</div>
@@ -473,13 +494,13 @@
 </dl>
 </li>
 </ul>
-<a name="getExecutionTimeForExecutionNeeds-org.eclipse.app4mc.amalthea.model.ExecutionNeed-org.eclipse.app4mc.amalthea.model.ProcessingUnit-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType-">
+<a id="getExecutionTimeForExecutionNeeds(org.eclipse.app4mc.amalthea.model.ExecutionNeed,org.eclipse.app4mc.amalthea.model.ProcessingUnit,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getExecutionTimeForExecutionNeeds</h4>
-<pre>public static&nbsp;Time&nbsp;getExecutionTimeForExecutionNeeds(ExecutionNeed&nbsp;need,
+<pre class="methodSignature">public static&nbsp;Time&nbsp;getExecutionTimeForExecutionNeeds&#8203;(ExecutionNeed&nbsp;need,
                                                      ProcessingUnit&nbsp;processingUnit,
                                                      <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;executionCase)</pre>
 <div class="block">Computes time for execution needs on a given processing unit</div>
@@ -493,13 +514,13 @@
 </dl>
 </li>
 </ul>
-<a name="getExecutionTimeForExecutionNeedEntry-org.eclipse.app4mc.amalthea.model.IDiscreteValueDeviation-org.eclipse.app4mc.amalthea.model.HwFeatureCategory-org.eclipse.app4mc.amalthea.model.ProcessingUnit-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType-">
+<a id="getExecutionTimeForExecutionNeedEntry(org.eclipse.app4mc.amalthea.model.IDiscreteValueDeviation,org.eclipse.app4mc.amalthea.model.HwFeatureCategory,org.eclipse.app4mc.amalthea.model.ProcessingUnit,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getExecutionTimeForExecutionNeedEntry</h4>
-<pre>public static&nbsp;Time&nbsp;getExecutionTimeForExecutionNeedEntry(IDiscreteValueDeviation&nbsp;deviation,
+<pre class="methodSignature">public static&nbsp;Time&nbsp;getExecutionTimeForExecutionNeedEntry&#8203;(IDiscreteValueDeviation&nbsp;deviation,
                                                          HwFeatureCategory&nbsp;hwFeatureCategory,
                                                          ProcessingUnit&nbsp;processingUnit,
                                                          <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;executionCase)</pre>
@@ -515,13 +536,13 @@
 </dl>
 </li>
 </ul>
-<a name="getExecutionTimeForCycles-double-org.eclipse.app4mc.amalthea.model.Frequency-">
+<a id="getExecutionTimeForCycles(double,org.eclipse.app4mc.amalthea.model.Frequency)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getExecutionTimeForCycles</h4>
-<pre>public static&nbsp;Time&nbsp;getExecutionTimeForCycles(double&nbsp;ticks,
+<pre class="methodSignature">public static&nbsp;Time&nbsp;getExecutionTimeForCycles&#8203;(double&nbsp;ticks,
                                              Frequency&nbsp;frequency)</pre>
 <div class="block">Computes time for a number of ticks with a given frequency</div>
 <dl>
@@ -533,62 +554,98 @@
 </dl>
 </li>
 </ul>
-<a name="setRuntimeOfRunnable-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.app4mc.amalthea.model.ExecutionNeed-org.eclipse.emf.common.util.EMap-">
+<a id="getTicksForExecutionTimeInSeconds(java.math.BigDecimal,org.eclipse.app4mc.amalthea.model.Frequency)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getTicksForExecutionTimeInSeconds</h4>
+<pre class="methodSignature">public static&nbsp;double&nbsp;getTicksForExecutionTimeInSeconds&#8203;(BigDecimal&nbsp;executionTime,
+                                                       Frequency&nbsp;frequency)</pre>
+<div class="block">Computes ticks for a given time (in seconds) and frequency.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>executionTime</code> - execution time in seconds</dd>
+<dd><code>frequency</code> - frequency (of an executing processing unit)</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>ticks / cycles</dd>
+</dl>
+</li>
+</ul>
+<a id="getTicksForExecutionTime(org.eclipse.app4mc.amalthea.model.Time,org.eclipse.app4mc.amalthea.model.Frequency)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>getTicksForExecutionTime</h4>
+<pre class="methodSignature">public static&nbsp;double&nbsp;getTicksForExecutionTime&#8203;(Time&nbsp;executionTime,
+                                              Frequency&nbsp;frequency)</pre>
+<div class="block">Computes ticks for a given time and frequency.</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>executionTime</code> - execution time</dd>
+<dd><code>frequency</code> - frequency (of an executing processing unit)</dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+<dd>ticks / cycles</dd>
+</dl>
+</li>
+</ul>
+<a id="setRuntimeOfRunnable(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.app4mc.amalthea.model.ExecutionNeed,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>setRuntimeOfRunnable</h4>
-<pre>public static&nbsp;void&nbsp;setRuntimeOfRunnable(Runnable&nbsp;runnable,
+<pre class="methodSignature">public static&nbsp;void&nbsp;setRuntimeOfRunnable&#8203;(Runnable&nbsp;runnable,
                                         ExecutionNeed&nbsp;need,
-                                        EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+                                        EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</pre>
 <div class="block">Sets the runtime of the given runnable to the given ExecutionNeed</div>
 </li>
 </ul>
-<a name="setRuntimeOfRunnable-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.app4mc.amalthea.model.Ticks-org.eclipse.emf.common.util.EMap-">
+<a id="setRuntimeOfRunnable(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.app4mc.amalthea.model.Ticks,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>setRuntimeOfRunnable</h4>
-<pre>public static&nbsp;void&nbsp;setRuntimeOfRunnable(Runnable&nbsp;runnable,
+<pre class="methodSignature">public static&nbsp;void&nbsp;setRuntimeOfRunnable&#8203;(Runnable&nbsp;runnable,
                                         Ticks&nbsp;ticks,
-                                        EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+                                        EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</pre>
 <div class="block">Sets the runtime of the given runnable to the given Ticks</div>
 </li>
 </ul>
-<a name="addRuntimeToRunnable-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.app4mc.amalthea.model.ExecutionNeed-">
+<a id="addRuntimeToRunnable(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.app4mc.amalthea.model.ExecutionNeed)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>addRuntimeToRunnable</h4>
-<pre>public static&nbsp;void&nbsp;addRuntimeToRunnable(Runnable&nbsp;runnable,
+<pre class="methodSignature">public static&nbsp;void&nbsp;addRuntimeToRunnable&#8203;(Runnable&nbsp;runnable,
                                         ExecutionNeed&nbsp;need)</pre>
-<div class="block">Adds Runtime (given as ExecutionNeed) to an existing Runnable currently
- without consideration of modes</div>
+<div class="block">Adds Runtime (given as ExecutionNeed) to an existing Runnable
+ currently without consideration of modes</div>
 </li>
 </ul>
-<a name="addRuntimeToRunnable-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.app4mc.amalthea.model.Ticks-">
+<a id="addRuntimeToRunnable(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.app4mc.amalthea.model.Ticks)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>addRuntimeToRunnable</h4>
-<pre>public static&nbsp;void&nbsp;addRuntimeToRunnable(Runnable&nbsp;runnable,
+<pre class="methodSignature">public static&nbsp;void&nbsp;addRuntimeToRunnable&#8203;(Runnable&nbsp;runnable,
                                         Ticks&nbsp;ticks)</pre>
-<div class="block">Adds Runtime (given as Ticks) to an existing Runnable currently
- without consideration of modes</div>
+<div class="block">Adds Runtime (given as Ticks) to an existing Runnable
+ currently without consideration of modes</div>
 </li>
 </ul>
-<a name="clearRuntimeOfModel-org.eclipse.app4mc.amalthea.model.Amalthea-org.eclipse.emf.common.util.EMap-">
+<a id="clearRuntimeOfModel(org.eclipse.app4mc.amalthea.model.Amalthea,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>clearRuntimeOfModel</h4>
-<pre>public static&nbsp;void&nbsp;clearRuntimeOfModel(Amalthea&nbsp;model,
-                                       EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<pre class="methodSignature">public static&nbsp;void&nbsp;clearRuntimeOfModel&#8203;(Amalthea&nbsp;model,
+                                       EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</pre>
 <div class="block">Clears all runtime information (execution needs and ticks)</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -597,14 +654,14 @@
 </dl>
 </li>
 </ul>
-<a name="clearRuntimeOfProcess-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-">
+<a id="clearRuntimeOfProcess(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>clearRuntimeOfProcess</h4>
-<pre>public static&nbsp;void&nbsp;clearRuntimeOfProcess(Process&nbsp;process,
-                                         EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<pre class="methodSignature">public static&nbsp;void&nbsp;clearRuntimeOfProcess&#8203;(Process&nbsp;process,
+                                         EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</pre>
 <div class="block">Clears all runtime information (execution needs and ticks)</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -613,14 +670,14 @@
 </dl>
 </li>
 </ul>
-<a name="clearRuntimeOfRunnable-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.emf.common.util.EMap-">
+<a id="clearRuntimeOfRunnable(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>clearRuntimeOfRunnable</h4>
-<pre>public static&nbsp;void&nbsp;clearRuntimeOfRunnable(Runnable&nbsp;runnable,
-                                          EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<pre class="methodSignature">public static&nbsp;void&nbsp;clearRuntimeOfRunnable&#8203;(Runnable&nbsp;runnable,
+                                          EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</pre>
 <div class="block">Clears all runtime information (execution needs and ticks)</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -629,18 +686,17 @@
 </dl>
 </li>
 </ul>
-<a name="addRuntimeToProcessAsNewRunnable-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.app4mc.amalthea.model.ExecutionNeed-java.lang.String-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.PositionType-">
+<a id="addRuntimeToProcessAsNewRunnable(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.app4mc.amalthea.model.ExecutionNeed,java.lang.String,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.PositionType)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>addRuntimeToProcessAsNewRunnable</h4>
-<pre>public static&nbsp;Runnable&nbsp;addRuntimeToProcessAsNewRunnable(Process&nbsp;process,
+<pre class="methodSignature">public static&nbsp;Runnable&nbsp;addRuntimeToProcessAsNewRunnable&#8203;(Process&nbsp;process,
                                                         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)</pre>
-<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>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>process</code> - containing process (task or isr)</dd>
@@ -652,16 +708,17 @@
 </dl>
 </li>
 </ul>
-<a name="addRuntimeToProcessAsNewRunnable-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.app4mc.amalthea.model.Ticks-java.lang.String-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.PositionType-">
+<a id="addRuntimeToProcessAsNewRunnable(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.app4mc.amalthea.model.Ticks,java.lang.String,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.PositionType)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>addRuntimeToProcessAsNewRunnable</h4>
-<pre>public static&nbsp;Runnable&nbsp;addRuntimeToProcessAsNewRunnable(Process&nbsp;process,
+<pre class="methodSignature">public static&nbsp;Runnable&nbsp;addRuntimeToProcessAsNewRunnable&#8203;(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)</pre>
+<div class="block">Creates a new Runnable with the given runtime at beginning / end of the given process</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
 <dd><code>process</code> - containing process (task or isr)</dd>
@@ -673,31 +730,31 @@
 </dl>
 </li>
 </ul>
-<a name="getProcUnitUtilization-org.eclipse.app4mc.amalthea.model.ProcessingUnit-org.eclipse.app4mc.amalthea.model.Amalthea-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType-java.util.List-org.eclipse.emf.common.util.EMap-">
+<a id="getProcUnitUtilization(org.eclipse.app4mc.amalthea.model.ProcessingUnit,org.eclipse.app4mc.amalthea.model.Amalthea,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType,java.util.List,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getProcUnitUtilization</h4>
-<pre>public static&nbsp;double&nbsp;getProcUnitUtilization(ProcessingUnit&nbsp;procUnit,
+<pre class="methodSignature">public static&nbsp;double&nbsp;getProcUnitUtilization&#8203;(ProcessingUnit&nbsp;procUnit,
                                             Amalthea&nbsp;model,
                                             <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;tt,
                                             List&lt;HwFeature&gt;&nbsp;hwFeatures,
-                                            EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+                                            EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</pre>
 <div class="block">Calculates the utilization for a given procUnit</div>
 </li>
 </ul>
-<a name="getProcessUtilization-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.app4mc.amalthea.model.Amalthea-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType-java.util.List-org.eclipse.emf.common.util.EMap-">
+<a id="getProcessUtilization(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.app4mc.amalthea.model.Amalthea,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType,java.util.List,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getProcessUtilization</h4>
-<pre>public static&nbsp;Map&lt;ProcessingUnit,Double&gt;&nbsp;getProcessUtilization(Process&nbsp;process,
-                                                               Amalthea&nbsp;model,
-                                                               <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;tt,
-                                                               List&lt;HwFeature&gt;&nbsp;hwFeatures,
-                                                               EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<pre class="methodSignature">public static&nbsp;Map&lt;ProcessingUnit,&#8203;Double&gt;&nbsp;getProcessUtilization&#8203;(Process&nbsp;process,
+                                                                     Amalthea&nbsp;model,
+                                                                     <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;tt,
+                                                                     List&lt;HwFeature&gt;&nbsp;hwFeatures,
+                                                                     EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</pre>
 <div class="block">Calculates the utilization for a given process</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -705,18 +762,18 @@
 </dl>
 </li>
 </ul>
-<a name="getProcessUtilization-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.app4mc.amalthea.model.ProcessingUnit-org.eclipse.app4mc.amalthea.model.Amalthea-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType-java.util.List-org.eclipse.emf.common.util.EMap-">
+<a id="getProcessUtilization(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.app4mc.amalthea.model.ProcessingUnit,org.eclipse.app4mc.amalthea.model.Amalthea,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType,java.util.List,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getProcessUtilization</h4>
-<pre>public static&nbsp;double&nbsp;getProcessUtilization(Process&nbsp;process,
+<pre class="methodSignature">public static&nbsp;double&nbsp;getProcessUtilization&#8203;(Process&nbsp;process,
                                            ProcessingUnit&nbsp;procUnit,
                                            Amalthea&nbsp;model,
                                            <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;tt,
                                            List&lt;HwFeature&gt;&nbsp;hwFeatures,
-                                           EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+                                           EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</pre>
 <div class="block">Calculates the utilization for a given process on a given procUnit
  <p>
  Assumption (wrong): All triggers activate the process on all procUnits together! (at the same time)</div>
@@ -726,29 +783,29 @@
 </dl>
 </li>
 </ul>
-<a name="getProcessUtilization-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.app4mc.amalthea.model.Time-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType-org.eclipse.emf.common.util.EMap-">
+<a id="getProcessUtilization(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.app4mc.amalthea.model.Time,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getProcessUtilization</h4>
-<pre>public static&nbsp;double&nbsp;getProcessUtilization(Process&nbsp;process,
+<pre class="methodSignature">public static&nbsp;double&nbsp;getProcessUtilization&#8203;(Process&nbsp;process,
                                            Time&nbsp;period,
                                            <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;tt,
-                                           EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+                                           EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</pre>
 <div class="block">Calculates the process utilization</div>
 </li>
 </ul>
-<a name="getCumulativeProcessUtilizations-org.eclipse.app4mc.amalthea.model.Amalthea-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType-java.util.List-org.eclipse.emf.common.util.EMap-">
+<a id="getCumulativeProcessUtilizations(org.eclipse.app4mc.amalthea.model.Amalthea,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType,java.util.List,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getCumulativeProcessUtilizations</h4>
-<pre>public static&nbsp;Map&lt;Process,Double&gt;&nbsp;getCumulativeProcessUtilizations(Amalthea&nbsp;model,
-                                                                   <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;tt,
-                                                                   List&lt;HwFeature&gt;&nbsp;hwFeatures,
-                                                                   EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<pre class="methodSignature">public static&nbsp;Map&lt;Process,&#8203;Double&gt;&nbsp;getCumulativeProcessUtilizations&#8203;(Amalthea&nbsp;model,
+                                                                         <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;tt,
+                                                                         List&lt;HwFeature&gt;&nbsp;hwFeatures,
+                                                                         EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</pre>
 <div class="block">Returns the cumulative process utilization, i.e. runtime on every procUnit summed up</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -756,38 +813,38 @@
 </dl>
 </li>
 </ul>
-<a name="getPeriodsOfAllProcesses-org.eclipse.app4mc.amalthea.model.Amalthea-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType-org.eclipse.emf.common.util.EMap-">
+<a id="getPeriodsOfAllProcesses(org.eclipse.app4mc.amalthea.model.Amalthea,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getPeriodsOfAllProcesses</h4>
-<pre>public static&nbsp;Map&lt;Process,List&lt;Time&gt;&gt;&nbsp;getPeriodsOfAllProcesses(Amalthea&nbsp;model,
-                                                               <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;tt,
-                                                               EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<pre class="methodSignature">public static&nbsp;Map&lt;Process,&#8203;List&lt;Time&gt;&gt;&nbsp;getPeriodsOfAllProcesses&#8203;(Amalthea&nbsp;model,
+                                                                     <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;tt,
+                                                                     EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</pre>
 <div class="block">Gets all Period ranges from the model</div>
 </li>
 </ul>
-<a name="getPeriodsOfProcess-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType-org.eclipse.emf.common.util.EMap-">
+<a id="getPeriodsOfProcess(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getPeriodsOfProcess</h4>
-<pre>public static&nbsp;List&lt;Time&gt;&nbsp;getPeriodsOfProcess(Process&nbsp;process,
+<pre class="methodSignature">public static&nbsp;List&lt;Time&gt;&nbsp;getPeriodsOfProcess&#8203;(Process&nbsp;process,
                                              <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;tt,
-                                             EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+                                             EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</pre>
 <div class="block">Returns a list of all triggering periods. Sorted by shortest period first!</div>
 </li>
 </ul>
-<a name="getTriggeringProcesses-org.eclipse.app4mc.amalthea.model.InterProcessStimulus-org.eclipse.emf.common.util.EMap-">
+<a id="getTriggeringProcesses(org.eclipse.app4mc.amalthea.model.InterProcessStimulus,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getTriggeringProcesses</h4>
-<pre>public static&nbsp;Map&lt;Process,Long&gt;&nbsp;getTriggeringProcesses(InterProcessStimulus&nbsp;ip,
-                                                       EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<pre class="methodSignature">public static&nbsp;Map&lt;Process,&#8203;Long&gt;&nbsp;getTriggeringProcesses&#8203;(InterProcessStimulus&nbsp;ip,
+                                                             EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</pre>
 <div class="block">Returns all Processes that trigger the given InterProcessStimulus</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -795,25 +852,25 @@
 </dl>
 </li>
 </ul>
-<a name="getTriggeredStimuli-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-">
+<a id="getTriggeredStimuli(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getTriggeredStimuli</h4>
-<pre>public static&nbsp;HashMap&lt;Stimulus,Long&gt;&nbsp;getTriggeredStimuli(Process&nbsp;process,
-                                                         EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<pre class="methodSignature">public static&nbsp;Map&lt;Stimulus,&#8203;Long&gt;&nbsp;getTriggeredStimuli&#8203;(Process&nbsp;process,
+                                                           EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</pre>
 <div class="block">Returns a map of all stimuli, triggered by this process, associated with its prescaler.</div>
 </li>
 </ul>
-<a name="getProcessesWithRelativePeriodicStimulus-org.eclipse.app4mc.amalthea.model.Amalthea-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType-">
+<a id="getProcessesWithRelativePeriodicStimulus(org.eclipse.app4mc.amalthea.model.Amalthea,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getProcessesWithRelativePeriodicStimulus</h4>
-<pre>public static&nbsp;Map&lt;Process,List&lt;Time&gt;&gt;&nbsp;getProcessesWithRelativePeriodicStimulus(Amalthea&nbsp;model,
-                                                                               <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;tt)</pre>
+<pre class="methodSignature">public static&nbsp;Map&lt;Process,&#8203;List&lt;Time&gt;&gt;&nbsp;getProcessesWithRelativePeriodicStimulus&#8203;(Amalthea&nbsp;model,
+                                                                                     <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;tt)</pre>
 <div class="block">Returns a Map of all sporadically triggered processes with their prescaler</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -822,13 +879,13 @@
 </dl>
 </li>
 </ul>
-<a name="getProcessesWithRelativePeriodicStimulus-org.eclipse.app4mc.amalthea.model.Amalthea-">
+<a id="getProcessesWithRelativePeriodicStimulus(org.eclipse.app4mc.amalthea.model.Amalthea)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getProcessesWithRelativePeriodicStimulus</h4>
-<pre>public static&nbsp;Map&lt;Process,List&lt;ITimeDeviation&gt;&gt;&nbsp;getProcessesWithRelativePeriodicStimulus(Amalthea&nbsp;model)</pre>
+<pre class="methodSignature">public static&nbsp;Map&lt;Process,&#8203;List&lt;ITimeDeviation&gt;&gt;&nbsp;getProcessesWithRelativePeriodicStimulus&#8203;(Amalthea&nbsp;model)</pre>
 <div class="block">Returns a Map of all sporadically triggered processes with their prescaler</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -837,36 +894,38 @@
 </dl>
 </li>
 </ul>
-<a name="getPlainTriggersForModel-org.eclipse.app4mc.amalthea.model.Amalthea-java.util.function.Function-">
+<a id="getPlainTriggersForModel(org.eclipse.app4mc.amalthea.model.Amalthea,java.util.function.Function)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getPlainTriggersForModel</h4>
-<pre>public static&nbsp;&lt;T&gt;&nbsp;Map&lt;Process,Map&lt;Stimulus,Long&gt;&gt;&nbsp;getPlainTriggersForModel(Amalthea&nbsp;model,
-                                                                           Function&lt;Stimulus,Boolean&gt;&nbsp;filter)</pre>
+<pre class="methodSignature">public static&nbsp;Map&lt;Process,&#8203;Map&lt;Stimulus,&#8203;Long&gt;&gt;&nbsp;getPlainTriggersForModel&#8203;(Amalthea&nbsp;model,
+                                                                                   Function&lt;Stimulus,&#8203;Boolean&gt;&nbsp;filter)</pre>
 <div class="block">Returns a map from process to all stimuli (matching filter) that
  lead to that process with the correct prescaler</div>
 </li>
 </ul>
-<a name="getPlainTriggerForProcess-org.eclipse.app4mc.amalthea.model.Process-long-java.util.function.Function-">
+<a id="getPlainTriggerForProcess(org.eclipse.app4mc.amalthea.model.Process,long,java.util.function.Function)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getPlainTriggerForProcess</h4>
-<pre>public static&nbsp;&lt;T&gt;&nbsp;Map&lt;Stimulus,Long&gt;&nbsp;getPlainTriggerForProcess(Process&nbsp;process,
-                                                               long&nbsp;depthCounter,
-                                                               Function&lt;Stimulus,Boolean&gt;&nbsp;filter)</pre>
+<pre class="methodSignature">public static&nbsp;Map&lt;Stimulus,&#8203;Long&gt;&nbsp;getPlainTriggerForProcess&#8203;(Process&nbsp;process,
+                                                                 long&nbsp;depthCounter,
+                                                                 Function&lt;Stimulus,&#8203;Boolean&gt;&nbsp;filter)</pre>
 <div class="block">Returns all stimuli (matching filter) that trigger the given process</div>
 </li>
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
 </div>
+</main>
 <!-- ========= END OF CLASS DATA ========= -->
 </body>
 </html>
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 2b73a19..9c77f33 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
@@ -1,16 +1,18 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML>
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
+<!-- Generated by javadoc (11.0.8) on Mon Nov 30 13:15:36 CET 2020 -->
 <title>SoftwareUtil</title>
-<meta name="date" content="2019-07-31">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-11-30">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
 <!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
 <div class="header">
-<div class="subTitle">org.eclipse.app4mc.amalthea.model.util</div>
+<div class="subTitle"><span class="packageLabelInType">Package</span>&nbsp;<a href="package-summary.html">org.eclipse.app4mc.amalthea.model.util</a></div>
 <h2 title="Class SoftwareUtil" class="title">Class SoftwareUtil</h2>
 </div>
 <div class="contentContainer">
@@ -26,7 +28,6 @@
 <ul class="blockList">
 <li class="blockList">
 <hr>
-<br>
 <pre>public class <span class="typeNameLabel">SoftwareUtil</span>
 extends Object</pre>
 </li>
@@ -35,368 +36,399 @@
 <div class="summary">
 <ul class="blockList">
 <li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="#SoftwareUtil--">SoftwareUtil</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
 <!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a id="method.summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<table class="memberSummary">
 <caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
 </tr>
 <tr id="i0" class="altColor">
-<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>
+<td class="colFirst"><code>static EList&lt;ActivityGraphItem&gt;</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#collectActivityGraphItems(org.eclipse.app4mc.amalthea.model.IActivityGraphItemContainer)">collectActivityGraphItems</a></span>&#8203;(IActivityGraphItemContainer&nbsp;container)</code></th>
+<td class="colLast">
 <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;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>
+<td class="colFirst"><code>static EList&lt;ActivityGraphItem&gt;</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#collectActivityGraphItems(org.eclipse.app4mc.amalthea.model.IActivityGraphItemContainer,org.eclipse.emf.common.util.EMap)">collectActivityGraphItems</a></span>&#8203;(IActivityGraphItemContainer&nbsp;container,
+                         EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
 <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 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>
+<td class="colFirst"><code>static &lt;T extends ActivityGraphItem&gt;<br>EList&lt;T&gt;</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#collectActivityGraphItems(org.eclipse.app4mc.amalthea.model.IActivityGraphItemContainer,org.eclipse.emf.common.util.EMap,java.lang.Class)">collectActivityGraphItems</a></span>&#8203;(IActivityGraphItemContainer&nbsp;container,
+                         EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes,
+                         Class&lt;T&gt;&nbsp;targetClass)</code></th>
+<td class="colLast">
 <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 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>
+<td class="colFirst"><code>static &lt;T extends ActivityGraphItem&gt;<br>EList&lt;T&gt;</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#collectActivityGraphItems(org.eclipse.app4mc.amalthea.model.IActivityGraphItemContainer,org.eclipse.emf.common.util.EMap,java.lang.Class,java.util.function.Function)">collectActivityGraphItems</a></span>&#8203;(IActivityGraphItemContainer&nbsp;container,
+                         EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes,
+                         Class&lt;T&gt;&nbsp;targetClass,
+                         Function&lt;T,&#8203;Boolean&gt;&nbsp;filter)</code></th>
+<td class="colLast">
 <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;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>
+<td class="colFirst"><code>static EList&lt;ActivityGraphItem&gt;</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#collectActivityGraphItems(org.eclipse.app4mc.amalthea.model.IActivityGraphItemContainer,org.eclipse.emf.common.util.EMap,java.util.function.Function)">collectActivityGraphItems</a></span>&#8203;(IActivityGraphItemContainer&nbsp;container,
+                         EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes,
+                         Function&lt;ActivityGraphItem,&#8203;Boolean&gt;&nbsp;filter)</code></th>
+<td class="colLast">
 <div class="block">Traverse the contained call graph items and collect all items.</div>
 </td>
 </tr>
 <tr id="i5" class="rowColor">
 <td class="colFirst"><code>static List&lt;ClearEvent&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#collectClearEvents-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-">collectClearEvents</a></span>(Process&nbsp;process,
-                  EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#collectClearEvents(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.emf.common.util.EMap)">collectClearEvents</a></span>&#8203;(Process&nbsp;process,
+                  EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
 <div class="block">Collects a list of clear event calls for a process</div>
 </td>
 </tr>
 <tr id="i6" class="altColor">
-<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>
+<td class="colFirst"><code>static List&lt;ActivityGraphItem&gt;</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#collectEventsOfProcess(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.emf.common.util.EMap)">collectEventsOfProcess</a></span>&#8203;(Process&nbsp;process,
+                      EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
 <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 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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#collectSetEvents(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.emf.common.util.EMap)">collectSetEvents</a></span>&#8203;(Process&nbsp;process,
+                EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
 <div class="block">Collects a list of set events calls for a process</div>
 </td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#collectWaitEvents(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.emf.common.util.EMap)">collectWaitEvents</a></span>&#8203;(Process&nbsp;process,
+                 EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
 <div class="block">Collects a list of wait event calls for a process</div>
 </td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getAccessedLabelSet(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.emf.common.util.EMap)">getAccessedLabelSet</a></span>&#8203;(Process&nbsp;process,
+                   EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
 <div class="block">Returns a set of labels accessed by the process</div>
 </td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getAccessedLabelSet(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.emf.common.util.EMap)">getAccessedLabelSet</a></span>&#8203;(Runnable&nbsp;runnable,
+                   EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
 <div class="block">Returns a set of labels accessed from the runnable</div>
 </td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getCalledRunnables(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.emf.common.util.EMap)">getCalledRunnables</a></span>&#8203;(Runnable&nbsp;runnable,
+                  EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
 <div class="block">Returns a list of runnables directly called by the runnable</div>
 </td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getCallingProcesses(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.emf.common.util.EMap)">getCallingProcesses</a></span>&#8203;(Runnable&nbsp;runnable,
+                   EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getCallingRunnables(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.emf.common.util.EMap)">getCallingRunnables</a></span>&#8203;(Runnable&nbsp;runnable,
+                   EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getExecutionNeeds(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.emf.common.util.EMap)">getExecutionNeeds</a></span>&#8203;(Process&nbsp;process,
+                 EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
 <div class="block">Returns a list of all execution needs for a given process</div>
 </td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getExecutionNeeds(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.emf.common.util.EMap)">getExecutionNeeds</a></span>&#8203;(Runnable&nbsp;runnable,
+                 EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
 <div class="block">Returns a list of all execution needs for a given runnable</div>
 </td>
 </tr>
 <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,
+<th class="colSecond" scope="row"><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>&#8203;(Process&nbsp;sender,
                          Process&nbsp;receiver,
-                         EMap&lt;ModeLabel,String&gt;&nbsp;modes)</code>
+                         EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
 <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="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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getLabelAccessCountFromStatistics(org.eclipse.app4mc.amalthea.model.LabelAccess,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType)">getLabelAccessCountFromStatistics</a></span>&#8203;(LabelAccess&nbsp;labelAcc,
+                                 <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;accType)</code></th>
+<td class="colLast">
 <div class="block">Returns the number of label accesses from a statistic.</div>
 </td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getLabelAccessList(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.emf.common.util.EMap)">getLabelAccessList</a></span>&#8203;(Process&nbsp;process,
+                  EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
 <div class="block">Returns a list of all label accesses of the process</div>
 </td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getLabelAccessList(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.emf.common.util.EMap)">getLabelAccessList</a></span>&#8203;(Runnable&nbsp;runnable,
+                  EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
 <div class="block">Returns a list of all label accesses of the runnable</div>
 </td>
 </tr>
 <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>
+<td class="colFirst"><code>static Map&lt;Label,&#8203;List&lt;LabelAccessStatistic&gt;&gt;</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getLabelAccessStatisticsMap(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.emf.common.util.EMap)">getLabelAccessStatisticsMap</a></span>&#8203;(Process&nbsp;process,
+                           EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
 <div class="block">Returns a map: labels accessed by the process -&gt; the corresponding label access statistics</div>
 </td>
 </tr>
 <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>
+<td class="colFirst"><code>static Map&lt;Label,&#8203;List&lt;LabelAccessStatistic&gt;&gt;</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getLabelAccessStatisticsMap(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.emf.common.util.EMap)">getLabelAccessStatisticsMap</a></span>&#8203;(Runnable&nbsp;runnable,
+                           EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
 <div class="block">Returns a map: labels accessed by the runnable -&gt; the corresponding LabelAccessStatistics</div>
 </td>
 </tr>
 <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,
+<th class="colSecond" scope="row"><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>&#8203;(Label&nbsp;label,
                  Process&nbsp;process,
-                 EMap&lt;ModeLabel,String&gt;&nbsp;modes,
-                 <a href="../../../../../../org/eclipse/app4mc/amalthea/model/util/RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;timeType)</code>
+                 EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes,
+                 <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;timeType)</code></th>
+<td class="colLast">
 <div class="block">Returns the reads from a process to a certain label.</div>
 </td>
 </tr>
 <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>
+<td class="colFirst"><code>static Map&lt;Label,&#8203;List&lt;LabelAccess&gt;&gt;</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getLabelToLabelAccessMap(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.emf.common.util.EMap)">getLabelToLabelAccessMap</a></span>&#8203;(Process&nbsp;process,
+                        EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
 <div class="block">Returns a map: accessed labels of the process -&gt; the corresponding label accesses</div>
 </td>
 </tr>
 <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>
+<td class="colFirst"><code>static Map&lt;Label,&#8203;List&lt;LabelAccess&gt;&gt;</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getLabelToLabelAccessMap(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.emf.common.util.EMap)">getLabelToLabelAccessMap</a></span>&#8203;(Runnable&nbsp;runnable,
+                        EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
 <div class="block">Returns a map: labels accessed from runnable -&gt; the corresponding label accesses</div>
 </td>
 </tr>
 <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,
+<th class="colSecond" scope="row"><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>&#8203;(Label&nbsp;label,
                   Process&nbsp;process,
-                  EMap&lt;ModeLabel,String&gt;&nbsp;modes,
-                  <a href="../../../../../../org/eclipse/app4mc/amalthea/model/util/RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;timeType)</code>
+                  EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes,
+                  <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;timeType)</code></th>
+<td class="colLast">
 <div class="block">Returns the writes from a process to a certain label.</div>
 </td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getReaderListOfLabel(org.eclipse.app4mc.amalthea.model.Label,org.eclipse.emf.common.util.EMap)">getReaderListOfLabel</a></span>&#8203;(Label&nbsp;label,
+                    EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
 <div class="block">Returns a list of runnables reading the label</div>
 </td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getReadersSetOfLabel(org.eclipse.app4mc.amalthea.model.Label,org.eclipse.emf.common.util.EMap)">getReadersSetOfLabel</a></span>&#8203;(Label&nbsp;label,
+                    EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
 <div class="block">Returns a set of runnables reading the label</div>
 </td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getReadLabelAccessList(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.emf.common.util.EMap)">getReadLabelAccessList</a></span>&#8203;(Runnable&nbsp;runnable,
+                      EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
 <div class="block">Returns a list of read label accesses of the runnable</div>
 </td>
 </tr>
 <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>
+<td class="colFirst"><code>static Map&lt;Label,&#8203;List&lt;LabelAccessStatistic&gt;&gt;</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getReadLabelAccessStatisticsMap(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.emf.common.util.EMap)">getReadLabelAccessStatisticsMap</a></span>&#8203;(Process&nbsp;process,
+                               EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
 <div class="block">Returns a map: labels read the process -&gt; the corresponding label access statistics</div>
 </td>
 </tr>
 <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>
+<td class="colFirst"><code>static Map&lt;Label,&#8203;List&lt;LabelAccessStatistic&gt;&gt;</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getReadLabelAccessStatisticsMap(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.emf.common.util.EMap)">getReadLabelAccessStatisticsMap</a></span>&#8203;(Runnable&nbsp;runnable,
+                               EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
 <div class="block">Returns a map: labels read by the runnable -&gt; the corresponding LabelAccessStatistics</div>
 </td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getReadLabelSet(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.emf.common.util.EMap)">getReadLabelSet</a></span>&#8203;(Process&nbsp;process,
+               EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
 <div class="block">Returns a set of labels read by the process</div>
 </td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getReadLabelSet(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.emf.common.util.EMap)">getReadLabelSet</a></span>&#8203;(Runnable&nbsp;runnable,
+               EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
 <div class="block">Returns a set of labels read by the runnable</div>
 </td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getRunnableList(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.emf.common.util.EMap)">getRunnableList</a></span>&#8203;(Process&nbsp;process,
+               EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
 <div class="block">Returns a list of runnables called by the process</div>
 </td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getRunnableSet(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.emf.common.util.EMap)">getRunnableSet</a></span>&#8203;(Process&nbsp;process,
+              EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
 <div class="block">Returns a set of runnables called by the process - no duplicates</div>
 </td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getServerCallSet(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.emf.common.util.EMap)">getServerCallSet</a></span>&#8203;(Process&nbsp;process,
+                EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
 <div class="block">Returns a set of server calls for a process</div>
 </td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getServerCallSet(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.emf.common.util.EMap)">getServerCallSet</a></span>&#8203;(Runnable&nbsp;runnable,
+                EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
 <div class="block">Returns a set of server calls for a runnable</div>
 </td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getTicks(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.emf.common.util.EMap)">getTicks</a></span>&#8203;(Process&nbsp;process,
+        EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
 <div class="block">Returns a list of all ticks for a given process</div>
 </td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getTicks(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.emf.common.util.EMap)">getTicks</a></span>&#8203;(Runnable&nbsp;runnable,
+        EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
 <div class="block">Returns a list of all ticks for a given runnable</div>
 </td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getWriteLabelAccessList(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.emf.common.util.EMap)">getWriteLabelAccessList</a></span>&#8203;(Runnable&nbsp;runnable,
+                       EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
 <div class="block">Returns a list of write label accesses of the runnable</div>
 </td>
 </tr>
 <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>
+<td class="colFirst"><code>static Map&lt;Label,&#8203;List&lt;LabelAccessStatistic&gt;&gt;</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getWriteLabelAccessStatisticsMap(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.emf.common.util.EMap)">getWriteLabelAccessStatisticsMap</a></span>&#8203;(Process&nbsp;process,
+                                EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
 <div class="block">Returns a map: labels written by the process -&gt; the corresponding label access statistics</div>
 </td>
 </tr>
 <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>
+<td class="colFirst"><code>static Map&lt;Label,&#8203;List&lt;LabelAccessStatistic&gt;&gt;</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getWriteLabelAccessStatisticsMap(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.emf.common.util.EMap)">getWriteLabelAccessStatisticsMap</a></span>&#8203;(Runnable&nbsp;runnable,
+                                EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
 <div class="block">Returns a map: labels written by the runnable -&gt; the corresponding LabelAccessStatistics</div>
 </td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getWriteLabelSet(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.emf.common.util.EMap)">getWriteLabelSet</a></span>&#8203;(Process&nbsp;process,
+                EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
 <div class="block">Returns a set of labels written by the process</div>
 </td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getWriteLabelSet(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.emf.common.util.EMap)">getWriteLabelSet</a></span>&#8203;(Runnable&nbsp;runnable,
+                EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
 <div class="block">Returns a set of labels written by the runnable</div>
 </td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getWriterListOfLabel(org.eclipse.app4mc.amalthea.model.Label,org.eclipse.emf.common.util.EMap)">getWriterListOfLabel</a></span>&#8203;(Label&nbsp;label,
+                    EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
 <div class="block">Returns a list of runnables writing the label</div>
 </td>
 </tr>
 <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>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getWriterSetOfLabel(org.eclipse.app4mc.amalthea.model.Label,org.eclipse.emf.common.util.EMap)">getWriterSetOfLabel</a></span>&#8203;(Label&nbsp;label,
+                   EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</code></th>
+<td class="colLast">
 <div class="block">Returns a set of runnables writing the label</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.Object">
+<li class="blockList"><a id="methods.inherited.from.class.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;Object</h3>
@@ -404,59 +436,44 @@
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
 <div class="details">
 <ul class="blockList">
 <li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="SoftwareUtil--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>SoftwareUtil</h4>
-<pre>public&nbsp;SoftwareUtil()</pre>
-</li>
-</ul>
-</li>
-</ul>
 <!-- ============ METHOD DETAIL ========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a id="method.detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="collectCallGraphItems-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-">
+<a id="collectActivityGraphItems(org.eclipse.app4mc.amalthea.model.IActivityGraphItemContainer)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>collectCallGraphItems</h4>
-<pre>public static&nbsp;EList&lt;CallGraphItem&gt;&nbsp;collectCallGraphItems(ICallGraphItemContainer&nbsp;container)</pre>
+<h4>collectActivityGraphItems</h4>
+<pre class="methodSignature">public static&nbsp;EList&lt;ActivityGraphItem&gt;&nbsp;collectActivityGraphItems&#8203;(IActivityGraphItemContainer&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>container</code> - call graph, group, ...</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
-<dd>List of CallGraphItems</dd>
+<dd>List of ActivityGraphItems</dd>
 </dl>
 </li>
 </ul>
-<a name="collectCallGraphItems-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.emf.common.util.EMap-">
+<a id="collectActivityGraphItems(org.eclipse.app4mc.amalthea.model.IActivityGraphItemContainer,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<h4>collectCallGraphItems</h4>
-<pre>public static&nbsp;EList&lt;CallGraphItem&gt;&nbsp;collectCallGraphItems(ICallGraphItemContainer&nbsp;container,
-                                                         EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<h4>collectActivityGraphItems</h4>
+<pre class="methodSignature">public static&nbsp;EList&lt;ActivityGraphItem&gt;&nbsp;collectActivityGraphItems&#8203;(IActivityGraphItemContainer&nbsp;container,
+                                                                 EMap&lt;ModeLabel,&#8203;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>
@@ -464,19 +481,19 @@
 <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 CallGraphItems</dd>
+<dd>List of ActivityGraphItems</dd>
 </dl>
 </li>
 </ul>
-<a name="collectCallGraphItems-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.emf.common.util.EMap-java.util.function.Function-">
+<a id="collectActivityGraphItems(org.eclipse.app4mc.amalthea.model.IActivityGraphItemContainer,org.eclipse.emf.common.util.EMap,java.util.function.Function)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<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>
+<h4>collectActivityGraphItems</h4>
+<pre class="methodSignature">public static&nbsp;EList&lt;ActivityGraphItem&gt;&nbsp;collectActivityGraphItems&#8203;(IActivityGraphItemContainer&nbsp;container,
+                                                                 EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes,
+                                                                 Function&lt;ActivityGraphItem,&#8203;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>
@@ -485,62 +502,62 @@
 <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 CallGraphItems</dd>
+<dd>List of ActivityGraphItems</dd>
 </dl>
 </li>
 </ul>
-<a name="collectCallGraphItems-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.emf.common.util.EMap-java.lang.Class-">
+<a id="collectActivityGraphItems(org.eclipse.app4mc.amalthea.model.IActivityGraphItemContainer,org.eclipse.emf.common.util.EMap,java.lang.Class)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<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>
+<h4>collectActivityGraphItems</h4>
+<pre class="methodSignature">public static&nbsp;&lt;T extends ActivityGraphItem&gt;&nbsp;EList&lt;T&gt;&nbsp;collectActivityGraphItems&#8203;(IActivityGraphItemContainer&nbsp;container,
+                                                                               EMap&lt;ModeLabel,&#8203;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>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>targetClass</code> - subclass of ActivityGraphItem that restricts the result</dd>
 <dt><span class="returnLabel">Returns:</span></dt>
-<dd>List of T extends CallGraphItems</dd>
+<dd>List of T extends ActivityGraphItems</dd>
 </dl>
 </li>
 </ul>
-<a name="collectCallGraphItems-org.eclipse.app4mc.amalthea.model.ICallGraphItemContainer-org.eclipse.emf.common.util.EMap-java.lang.Class-java.util.function.Function-">
+<a id="collectActivityGraphItems(org.eclipse.app4mc.amalthea.model.IActivityGraphItemContainer,org.eclipse.emf.common.util.EMap,java.lang.Class,java.util.function.Function)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
-<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>
+<h4>collectActivityGraphItems</h4>
+<pre class="methodSignature">public static&nbsp;&lt;T extends ActivityGraphItem&gt;&nbsp;EList&lt;T&gt;&nbsp;collectActivityGraphItems&#8203;(IActivityGraphItemContainer&nbsp;container,
+                                                                               EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes,
+                                                                               Class&lt;T&gt;&nbsp;targetClass,
+                                                                               Function&lt;T,&#8203;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>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>targetClass</code> - subclass of ActivityGraphItem 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 CallGraphItems</dd>
+<dd>List of T extends ActivityGraphItems</dd>
 </dl>
 </li>
 </ul>
-<a name="getAccessedLabelSet-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.emf.common.util.EMap-">
+<a id="getAccessedLabelSet(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getAccessedLabelSet</h4>
-<pre>public static&nbsp;Set&lt;Label&gt;&nbsp;getAccessedLabelSet(Runnable&nbsp;runnable,
-                                             EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<pre class="methodSignature">public static&nbsp;Set&lt;Label&gt;&nbsp;getAccessedLabelSet&#8203;(Runnable&nbsp;runnable,
+                                             EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</pre>
 <div class="block">Returns a set of labels accessed from the runnable</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -551,14 +568,14 @@
 </dl>
 </li>
 </ul>
-<a name="getReadLabelSet-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.emf.common.util.EMap-">
+<a id="getReadLabelSet(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getReadLabelSet</h4>
-<pre>public static&nbsp;Set&lt;Label&gt;&nbsp;getReadLabelSet(Runnable&nbsp;runnable,
-                                         EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<pre class="methodSignature">public static&nbsp;Set&lt;Label&gt;&nbsp;getReadLabelSet&#8203;(Runnable&nbsp;runnable,
+                                         EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</pre>
 <div class="block">Returns a set of labels read by the runnable</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -569,14 +586,14 @@
 </dl>
 </li>
 </ul>
-<a name="getWriteLabelSet-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.emf.common.util.EMap-">
+<a id="getWriteLabelSet(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getWriteLabelSet</h4>
-<pre>public static&nbsp;Set&lt;Label&gt;&nbsp;getWriteLabelSet(Runnable&nbsp;runnable,
-                                          EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<pre class="methodSignature">public static&nbsp;Set&lt;Label&gt;&nbsp;getWriteLabelSet&#8203;(Runnable&nbsp;runnable,
+                                          EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</pre>
 <div class="block">Returns a set of labels written by the runnable</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -587,14 +604,14 @@
 </dl>
 </li>
 </ul>
-<a name="getLabelAccessList-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.emf.common.util.EMap-">
+<a id="getLabelAccessList(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getLabelAccessList</h4>
-<pre>public static&nbsp;List&lt;LabelAccess&gt;&nbsp;getLabelAccessList(Runnable&nbsp;runnable,
-                                                   EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<pre class="methodSignature">public static&nbsp;List&lt;LabelAccess&gt;&nbsp;getLabelAccessList&#8203;(Runnable&nbsp;runnable,
+                                                   EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</pre>
 <div class="block">Returns a list of all label accesses of the runnable</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -605,14 +622,14 @@
 </dl>
 </li>
 </ul>
-<a name="getReadLabelAccessList-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.emf.common.util.EMap-">
+<a id="getReadLabelAccessList(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getReadLabelAccessList</h4>
-<pre>public static&nbsp;List&lt;LabelAccess&gt;&nbsp;getReadLabelAccessList(Runnable&nbsp;runnable,
-                                                       EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<pre class="methodSignature">public static&nbsp;List&lt;LabelAccess&gt;&nbsp;getReadLabelAccessList&#8203;(Runnable&nbsp;runnable,
+                                                       EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</pre>
 <div class="block">Returns a list of read label accesses of the runnable</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -623,14 +640,14 @@
 </dl>
 </li>
 </ul>
-<a name="getWriteLabelAccessList-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.emf.common.util.EMap-">
+<a id="getWriteLabelAccessList(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getWriteLabelAccessList</h4>
-<pre>public static&nbsp;List&lt;LabelAccess&gt;&nbsp;getWriteLabelAccessList(Runnable&nbsp;runnable,
-                                                        EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<pre class="methodSignature">public static&nbsp;List&lt;LabelAccess&gt;&nbsp;getWriteLabelAccessList&#8203;(Runnable&nbsp;runnable,
+                                                        EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</pre>
 <div class="block">Returns a list of write label accesses of the runnable</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -641,14 +658,14 @@
 </dl>
 </li>
 </ul>
-<a name="getLabelToLabelAccessMap-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.emf.common.util.EMap-">
+<a id="getLabelToLabelAccessMap(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getLabelToLabelAccessMap</h4>
-<pre>public static&nbsp;Map&lt;Label,List&lt;LabelAccess&gt;&gt;&nbsp;getLabelToLabelAccessMap(Runnable&nbsp;runnable,
-                                                                    EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<pre class="methodSignature">public static&nbsp;Map&lt;Label,&#8203;List&lt;LabelAccess&gt;&gt;&nbsp;getLabelToLabelAccessMap&#8203;(Runnable&nbsp;runnable,
+                                                                          EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</pre>
 <div class="block">Returns a map: labels accessed from runnable -&gt; the corresponding label accesses</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -659,14 +676,14 @@
 </dl>
 </li>
 </ul>
-<a name="getLabelAccessStatisticsMap-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.emf.common.util.EMap-">
+<a id="getLabelAccessStatisticsMap(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getLabelAccessStatisticsMap</h4>
-<pre>public static&nbsp;Map&lt;Label,List&lt;LabelAccessStatistic&gt;&gt;&nbsp;getLabelAccessStatisticsMap(Runnable&nbsp;runnable,
-                                                                                EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<pre class="methodSignature">public static&nbsp;Map&lt;Label,&#8203;List&lt;LabelAccessStatistic&gt;&gt;&nbsp;getLabelAccessStatisticsMap&#8203;(Runnable&nbsp;runnable,
+                                                                                      EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</pre>
 <div class="block">Returns a map: labels accessed by the runnable -&gt; the corresponding LabelAccessStatistics</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -678,14 +695,14 @@
 </dl>
 </li>
 </ul>
-<a name="getReadLabelAccessStatisticsMap-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.emf.common.util.EMap-">
+<a id="getReadLabelAccessStatisticsMap(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getReadLabelAccessStatisticsMap</h4>
-<pre>public static&nbsp;Map&lt;Label,List&lt;LabelAccessStatistic&gt;&gt;&nbsp;getReadLabelAccessStatisticsMap(Runnable&nbsp;runnable,
-                                                                                    EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<pre class="methodSignature">public static&nbsp;Map&lt;Label,&#8203;List&lt;LabelAccessStatistic&gt;&gt;&nbsp;getReadLabelAccessStatisticsMap&#8203;(Runnable&nbsp;runnable,
+                                                                                          EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</pre>
 <div class="block">Returns a map: labels read by the runnable -&gt; the corresponding LabelAccessStatistics</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -696,14 +713,14 @@
 </dl>
 </li>
 </ul>
-<a name="getWriteLabelAccessStatisticsMap-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.emf.common.util.EMap-">
+<a id="getWriteLabelAccessStatisticsMap(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getWriteLabelAccessStatisticsMap</h4>
-<pre>public static&nbsp;Map&lt;Label,List&lt;LabelAccessStatistic&gt;&gt;&nbsp;getWriteLabelAccessStatisticsMap(Runnable&nbsp;runnable,
-                                                                                     EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<pre class="methodSignature">public static&nbsp;Map&lt;Label,&#8203;List&lt;LabelAccessStatistic&gt;&gt;&nbsp;getWriteLabelAccessStatisticsMap&#8203;(Runnable&nbsp;runnable,
+                                                                                           EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</pre>
 <div class="block">Returns a map: labels written by the runnable -&gt; the corresponding LabelAccessStatistics</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -714,14 +731,14 @@
 </dl>
 </li>
 </ul>
-<a name="getAccessedLabelSet-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-">
+<a id="getAccessedLabelSet(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getAccessedLabelSet</h4>
-<pre>public static&nbsp;Set&lt;Label&gt;&nbsp;getAccessedLabelSet(Process&nbsp;process,
-                                             EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<pre class="methodSignature">public static&nbsp;Set&lt;Label&gt;&nbsp;getAccessedLabelSet&#8203;(Process&nbsp;process,
+                                             EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</pre>
 <div class="block">Returns a set of labels accessed by the process</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -732,14 +749,14 @@
 </dl>
 </li>
 </ul>
-<a name="getReadLabelSet-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-">
+<a id="getReadLabelSet(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getReadLabelSet</h4>
-<pre>public static&nbsp;Set&lt;Label&gt;&nbsp;getReadLabelSet(Process&nbsp;process,
-                                         EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<pre class="methodSignature">public static&nbsp;Set&lt;Label&gt;&nbsp;getReadLabelSet&#8203;(Process&nbsp;process,
+                                         EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</pre>
 <div class="block">Returns a set of labels read by the process</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -750,14 +767,14 @@
 </dl>
 </li>
 </ul>
-<a name="getWriteLabelSet-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-">
+<a id="getWriteLabelSet(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getWriteLabelSet</h4>
-<pre>public static&nbsp;Set&lt;Label&gt;&nbsp;getWriteLabelSet(Process&nbsp;process,
-                                          EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<pre class="methodSignature">public static&nbsp;Set&lt;Label&gt;&nbsp;getWriteLabelSet&#8203;(Process&nbsp;process,
+                                          EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</pre>
 <div class="block">Returns a set of labels written by the process</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -768,14 +785,14 @@
 </dl>
 </li>
 </ul>
-<a name="getLabelAccessList-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-">
+<a id="getLabelAccessList(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getLabelAccessList</h4>
-<pre>public static&nbsp;List&lt;LabelAccess&gt;&nbsp;getLabelAccessList(Process&nbsp;process,
-                                                   EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<pre class="methodSignature">public static&nbsp;List&lt;LabelAccess&gt;&nbsp;getLabelAccessList&#8203;(Process&nbsp;process,
+                                                   EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</pre>
 <div class="block">Returns a list of all label accesses of the process</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -786,14 +803,14 @@
 </dl>
 </li>
 </ul>
-<a name="getLabelToLabelAccessMap-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-">
+<a id="getLabelToLabelAccessMap(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getLabelToLabelAccessMap</h4>
-<pre>public static&nbsp;Map&lt;Label,List&lt;LabelAccess&gt;&gt;&nbsp;getLabelToLabelAccessMap(Process&nbsp;process,
-                                                                    EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<pre class="methodSignature">public static&nbsp;Map&lt;Label,&#8203;List&lt;LabelAccess&gt;&gt;&nbsp;getLabelToLabelAccessMap&#8203;(Process&nbsp;process,
+                                                                          EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</pre>
 <div class="block">Returns a map: accessed labels of the process -&gt; the corresponding label accesses</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -804,14 +821,14 @@
 </dl>
 </li>
 </ul>
-<a name="getLabelAccessStatisticsMap-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-">
+<a id="getLabelAccessStatisticsMap(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getLabelAccessStatisticsMap</h4>
-<pre>public static&nbsp;Map&lt;Label,List&lt;LabelAccessStatistic&gt;&gt;&nbsp;getLabelAccessStatisticsMap(Process&nbsp;process,
-                                                                                EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<pre class="methodSignature">public static&nbsp;Map&lt;Label,&#8203;List&lt;LabelAccessStatistic&gt;&gt;&nbsp;getLabelAccessStatisticsMap&#8203;(Process&nbsp;process,
+                                                                                      EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</pre>
 <div class="block">Returns a map: labels accessed by the process -&gt; the corresponding label access statistics</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -822,14 +839,14 @@
 </dl>
 </li>
 </ul>
-<a name="getReadLabelAccessStatisticsMap-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-">
+<a id="getReadLabelAccessStatisticsMap(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getReadLabelAccessStatisticsMap</h4>
-<pre>public static&nbsp;Map&lt;Label,List&lt;LabelAccessStatistic&gt;&gt;&nbsp;getReadLabelAccessStatisticsMap(Process&nbsp;process,
-                                                                                    EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<pre class="methodSignature">public static&nbsp;Map&lt;Label,&#8203;List&lt;LabelAccessStatistic&gt;&gt;&nbsp;getReadLabelAccessStatisticsMap&#8203;(Process&nbsp;process,
+                                                                                          EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</pre>
 <div class="block">Returns a map: labels read the process -&gt; the corresponding label access statistics</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -840,14 +857,14 @@
 </dl>
 </li>
 </ul>
-<a name="getWriteLabelAccessStatisticsMap-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-">
+<a id="getWriteLabelAccessStatisticsMap(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getWriteLabelAccessStatisticsMap</h4>
-<pre>public static&nbsp;Map&lt;Label,List&lt;LabelAccessStatistic&gt;&gt;&nbsp;getWriteLabelAccessStatisticsMap(Process&nbsp;process,
-                                                                                     EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<pre class="methodSignature">public static&nbsp;Map&lt;Label,&#8203;List&lt;LabelAccessStatistic&gt;&gt;&nbsp;getWriteLabelAccessStatisticsMap&#8203;(Process&nbsp;process,
+                                                                                           EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</pre>
 <div class="block">Returns a map: labels written by the process -&gt; the corresponding label access statistics</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -858,42 +875,42 @@
 </dl>
 </li>
 </ul>
-<a name="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-">
+<a id="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)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getLabelReadCount</h4>
-<pre>public static&nbsp;float&nbsp;getLabelReadCount(Label&nbsp;label,
+<pre class="methodSignature">public static&nbsp;float&nbsp;getLabelReadCount&#8203;(Label&nbsp;label,
                                       Process&nbsp;process,
-                                      EMap&lt;ModeLabel,String&gt;&nbsp;modes,
-                                      <a href="../../../../../../org/eclipse/app4mc/amalthea/model/util/RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;timeType)</pre>
+                                      EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes,
+                                      <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;timeType)</pre>
 <div class="block">Returns the reads from a process to a certain label. Evaluates the LabelAccessStatistic. 
  Definition of TimeType is possible. Null value returns the average case.</div>
 </li>
 </ul>
-<a name="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-">
+<a id="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)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getLabelWriteCount</h4>
-<pre>public static&nbsp;float&nbsp;getLabelWriteCount(Label&nbsp;label,
+<pre class="methodSignature">public static&nbsp;float&nbsp;getLabelWriteCount&#8203;(Label&nbsp;label,
                                        Process&nbsp;process,
-                                       EMap&lt;ModeLabel,String&gt;&nbsp;modes,
-                                       <a href="../../../../../../org/eclipse/app4mc/amalthea/model/util/RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;timeType)</pre>
+                                       EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes,
+                                       <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;timeType)</pre>
 <div class="block">Returns the writes from a process to a certain label. Evaluates the LabelAccessStatistic. 
  Definition of TimeType is possible. Null value returns the average case.</div>
 </li>
 </ul>
-<a name="getRunnableList-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-">
+<a id="getRunnableList(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getRunnableList</h4>
-<pre>public static&nbsp;List&lt;Runnable&gt;&nbsp;getRunnableList(Process&nbsp;process,
-                                             EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<pre class="methodSignature">public static&nbsp;List&lt;Runnable&gt;&nbsp;getRunnableList&#8203;(Process&nbsp;process,
+                                             EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</pre>
 <div class="block">Returns a list of runnables called by the process</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -904,14 +921,14 @@
 </dl>
 </li>
 </ul>
-<a name="getRunnableSet-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-">
+<a id="getRunnableSet(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getRunnableSet</h4>
-<pre>public static&nbsp;Set&lt;Runnable&gt;&nbsp;getRunnableSet(Process&nbsp;process,
-                                           EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<pre class="methodSignature">public static&nbsp;Set&lt;Runnable&gt;&nbsp;getRunnableSet&#8203;(Process&nbsp;process,
+                                           EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</pre>
 <div class="block">Returns a set of runnables called by the process - no duplicates</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -922,26 +939,26 @@
 </dl>
 </li>
 </ul>
-<a name="getLabelAccessCountFromStatistics-org.eclipse.app4mc.amalthea.model.LabelAccess-org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType-">
+<a id="getLabelAccessCountFromStatistics(org.eclipse.app4mc.amalthea.model.LabelAccess,org.eclipse.app4mc.amalthea.model.util.RuntimeUtil.TimeType)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getLabelAccessCountFromStatistics</h4>
-<pre>public static&nbsp;float&nbsp;getLabelAccessCountFromStatistics(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)</pre>
+<pre class="methodSignature">public static&nbsp;float&nbsp;getLabelAccessCountFromStatistics&#8203;(LabelAccess&nbsp;labelAcc,
+                                                      <a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a>&nbsp;accType)</pre>
 <div class="block">Returns the number of label accesses from a statistic.
  The accType defines if the minimum, maximum or average accesses are returned.</div>
 </li>
 </ul>
-<a name="getReaderListOfLabel-org.eclipse.app4mc.amalthea.model.Label-org.eclipse.emf.common.util.EMap-">
+<a id="getReaderListOfLabel(org.eclipse.app4mc.amalthea.model.Label,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getReaderListOfLabel</h4>
-<pre>public static&nbsp;List&lt;Runnable&gt;&nbsp;getReaderListOfLabel(Label&nbsp;label,
-                                                  EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<pre class="methodSignature">public static&nbsp;List&lt;Runnable&gt;&nbsp;getReaderListOfLabel&#8203;(Label&nbsp;label,
+                                                  EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</pre>
 <div class="block">Returns a list of runnables reading the label</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -952,14 +969,14 @@
 </dl>
 </li>
 </ul>
-<a name="getReadersSetOfLabel-org.eclipse.app4mc.amalthea.model.Label-org.eclipse.emf.common.util.EMap-">
+<a id="getReadersSetOfLabel(org.eclipse.app4mc.amalthea.model.Label,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getReadersSetOfLabel</h4>
-<pre>public static&nbsp;Set&lt;Runnable&gt;&nbsp;getReadersSetOfLabel(Label&nbsp;label,
-                                                 EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<pre class="methodSignature">public static&nbsp;Set&lt;Runnable&gt;&nbsp;getReadersSetOfLabel&#8203;(Label&nbsp;label,
+                                                 EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</pre>
 <div class="block">Returns a set of runnables reading the label</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -970,14 +987,14 @@
 </dl>
 </li>
 </ul>
-<a name="getWriterListOfLabel-org.eclipse.app4mc.amalthea.model.Label-org.eclipse.emf.common.util.EMap-">
+<a id="getWriterListOfLabel(org.eclipse.app4mc.amalthea.model.Label,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getWriterListOfLabel</h4>
-<pre>public static&nbsp;List&lt;Runnable&gt;&nbsp;getWriterListOfLabel(Label&nbsp;label,
-                                                  EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<pre class="methodSignature">public static&nbsp;List&lt;Runnable&gt;&nbsp;getWriterListOfLabel&#8203;(Label&nbsp;label,
+                                                  EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</pre>
 <div class="block">Returns a list of runnables writing the label</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -988,14 +1005,14 @@
 </dl>
 </li>
 </ul>
-<a name="getWriterSetOfLabel-org.eclipse.app4mc.amalthea.model.Label-org.eclipse.emf.common.util.EMap-">
+<a id="getWriterSetOfLabel(org.eclipse.app4mc.amalthea.model.Label,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getWriterSetOfLabel</h4>
-<pre>public static&nbsp;Set&lt;Runnable&gt;&nbsp;getWriterSetOfLabel(Label&nbsp;label,
-                                                EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<pre class="methodSignature">public static&nbsp;Set&lt;Runnable&gt;&nbsp;getWriterSetOfLabel&#8203;(Label&nbsp;label,
+                                                EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</pre>
 <div class="block">Returns a set of runnables writing the label</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1006,14 +1023,14 @@
 </dl>
 </li>
 </ul>
-<a name="collectSetEvents-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-">
+<a id="collectSetEvents(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>collectSetEvents</h4>
-<pre>public static&nbsp;List&lt;SetEvent&gt;&nbsp;collectSetEvents(Process&nbsp;process,
-                                              EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<pre class="methodSignature">public static&nbsp;List&lt;SetEvent&gt;&nbsp;collectSetEvents&#8203;(Process&nbsp;process,
+                                              EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</pre>
 <div class="block">Collects a list of set events calls for a process</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1024,14 +1041,14 @@
 </dl>
 </li>
 </ul>
-<a name="collectClearEvents-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-">
+<a id="collectClearEvents(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>collectClearEvents</h4>
-<pre>public static&nbsp;List&lt;ClearEvent&gt;&nbsp;collectClearEvents(Process&nbsp;process,
-                                                  EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<pre class="methodSignature">public static&nbsp;List&lt;ClearEvent&gt;&nbsp;collectClearEvents&#8203;(Process&nbsp;process,
+                                                  EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</pre>
 <div class="block">Collects a list of clear event calls for a process</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1042,14 +1059,14 @@
 </dl>
 </li>
 </ul>
-<a name="collectWaitEvents-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-">
+<a id="collectWaitEvents(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>collectWaitEvents</h4>
-<pre>public static&nbsp;List&lt;WaitEvent&gt;&nbsp;collectWaitEvents(Process&nbsp;process,
-                                                EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<pre class="methodSignature">public static&nbsp;List&lt;WaitEvent&gt;&nbsp;collectWaitEvents&#8203;(Process&nbsp;process,
+                                                EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</pre>
 <div class="block">Collects a list of wait event calls for a process</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1060,14 +1077,14 @@
 </dl>
 </li>
 </ul>
-<a name="collectEventsOfProcess-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-">
+<a id="collectEventsOfProcess(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>collectEventsOfProcess</h4>
-<pre>public static&nbsp;List&lt;CallGraphItem&gt;&nbsp;collectEventsOfProcess(Process&nbsp;process,
-                                                         EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<pre class="methodSignature">public static&nbsp;List&lt;ActivityGraphItem&gt;&nbsp;collectEventsOfProcess&#8203;(Process&nbsp;process,
+                                                             EMap&lt;ModeLabel,&#8203;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>
@@ -1078,15 +1095,15 @@
 </dl>
 </li>
 </ul>
-<a name="getInterTaskCommunication-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-">
+<a id="getInterTaskCommunication(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.app4mc.amalthea.model.Process,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getInterTaskCommunication</h4>
-<pre>public static&nbsp;List&lt;Label&gt;&nbsp;getInterTaskCommunication(Process&nbsp;sender,
+<pre class="methodSignature">public static&nbsp;List&lt;Label&gt;&nbsp;getInterTaskCommunication&#8203;(Process&nbsp;sender,
                                                     Process&nbsp;receiver,
-                                                    EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+                                                    EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</pre>
 <div class="block">Returns a list of all exchanged labels that are written by the sender process and read by the receiver process</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1098,14 +1115,14 @@
 </dl>
 </li>
 </ul>
-<a name="getCallingProcesses-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.emf.common.util.EMap-">
+<a id="getCallingProcesses(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getCallingProcesses</h4>
-<pre>public static&nbsp;List&lt;Process&gt;&nbsp;getCallingProcesses(Runnable&nbsp;runnable,
-                                                EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<pre class="methodSignature">public static&nbsp;List&lt;Process&gt;&nbsp;getCallingProcesses&#8203;(Runnable&nbsp;runnable,
+                                                EMap&lt;ModeLabel,&#8203;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>
@@ -1116,14 +1133,14 @@
 </dl>
 </li>
 </ul>
-<a name="getCallingRunnables-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.emf.common.util.EMap-">
+<a id="getCallingRunnables(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getCallingRunnables</h4>
-<pre>public static&nbsp;List&lt;Runnable&gt;&nbsp;getCallingRunnables(Runnable&nbsp;runnable,
-                                                 EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<pre class="methodSignature">public static&nbsp;List&lt;Runnable&gt;&nbsp;getCallingRunnables&#8203;(Runnable&nbsp;runnable,
+                                                 EMap&lt;ModeLabel,&#8203;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>
@@ -1134,14 +1151,14 @@
 </dl>
 </li>
 </ul>
-<a name="getCalledRunnables-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.emf.common.util.EMap-">
+<a id="getCalledRunnables(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getCalledRunnables</h4>
-<pre>public static&nbsp;List&lt;Runnable&gt;&nbsp;getCalledRunnables(Runnable&nbsp;runnable,
-                                                EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<pre class="methodSignature">public static&nbsp;List&lt;Runnable&gt;&nbsp;getCalledRunnables&#8203;(Runnable&nbsp;runnable,
+                                                EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</pre>
 <div class="block">Returns a list of runnables directly called by the runnable</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1152,14 +1169,14 @@
 </dl>
 </li>
 </ul>
-<a name="getExecutionNeeds-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.emf.common.util.EMap-">
+<a id="getExecutionNeeds(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getExecutionNeeds</h4>
-<pre>public static&nbsp;List&lt;ExecutionNeed&gt;&nbsp;getExecutionNeeds(Runnable&nbsp;runnable,
-                                                    EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<pre class="methodSignature">public static&nbsp;List&lt;ExecutionNeed&gt;&nbsp;getExecutionNeeds&#8203;(Runnable&nbsp;runnable,
+                                                    EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</pre>
 <div class="block">Returns a list of all execution needs for a given runnable</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1170,14 +1187,14 @@
 </dl>
 </li>
 </ul>
-<a name="getExecutionNeeds-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-">
+<a id="getExecutionNeeds(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getExecutionNeeds</h4>
-<pre>public static&nbsp;List&lt;ExecutionNeed&gt;&nbsp;getExecutionNeeds(Process&nbsp;process,
-                                                    EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<pre class="methodSignature">public static&nbsp;List&lt;ExecutionNeed&gt;&nbsp;getExecutionNeeds&#8203;(Process&nbsp;process,
+                                                    EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</pre>
 <div class="block">Returns a list of all execution needs for a given process</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1188,14 +1205,14 @@
 </dl>
 </li>
 </ul>
-<a name="getTicks-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.emf.common.util.EMap-">
+<a id="getTicks(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getTicks</h4>
-<pre>public static&nbsp;List&lt;Ticks&gt;&nbsp;getTicks(Runnable&nbsp;runnable,
-                                   EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<pre class="methodSignature">public static&nbsp;List&lt;Ticks&gt;&nbsp;getTicks&#8203;(Runnable&nbsp;runnable,
+                                   EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</pre>
 <div class="block">Returns a list of all ticks for a given runnable</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1206,14 +1223,14 @@
 </dl>
 </li>
 </ul>
-<a name="getTicks-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-">
+<a id="getTicks(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getTicks</h4>
-<pre>public static&nbsp;List&lt;Ticks&gt;&nbsp;getTicks(Process&nbsp;process,
-                                   EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<pre class="methodSignature">public static&nbsp;List&lt;Ticks&gt;&nbsp;getTicks&#8203;(Process&nbsp;process,
+                                   EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</pre>
 <div class="block">Returns a list of all ticks for a given process</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1224,14 +1241,14 @@
 </dl>
 </li>
 </ul>
-<a name="getServerCallSet-org.eclipse.app4mc.amalthea.model.Runnable-org.eclipse.emf.common.util.EMap-">
+<a id="getServerCallSet(org.eclipse.app4mc.amalthea.model.Runnable,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getServerCallSet</h4>
-<pre>public static&nbsp;Set&lt;ServerCall&gt;&nbsp;getServerCallSet(Runnable&nbsp;runnable,
-                                               EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<pre class="methodSignature">public static&nbsp;Set&lt;ServerCall&gt;&nbsp;getServerCallSet&#8203;(Runnable&nbsp;runnable,
+                                               EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</pre>
 <div class="block">Returns a set of server calls for a runnable</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1242,14 +1259,14 @@
 </dl>
 </li>
 </ul>
-<a name="getServerCallSet-org.eclipse.app4mc.amalthea.model.Process-org.eclipse.emf.common.util.EMap-">
+<a id="getServerCallSet(org.eclipse.app4mc.amalthea.model.Process,org.eclipse.emf.common.util.EMap)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>getServerCallSet</h4>
-<pre>public static&nbsp;Set&lt;ServerCall&gt;&nbsp;getServerCallSet(Process&nbsp;process,
-                                               EMap&lt;ModeLabel,String&gt;&nbsp;modes)</pre>
+<pre class="methodSignature">public static&nbsp;Set&lt;ServerCall&gt;&nbsp;getServerCallSet&#8203;(Process&nbsp;process,
+                                               EMap&lt;ModeLabel,&#8203;String&gt;&nbsp;modes)</pre>
 <div class="block">Returns a set of server calls for a process</div>
 <dl>
 <dt><span class="paramLabel">Parameters:</span></dt>
@@ -1262,10 +1279,12 @@
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
 </div>
+</main>
 <!-- ========= END OF CLASS DATA ========= -->
 </body>
 </html>
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 7e08057..5ef3a2d 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
@@ -1,16 +1,18 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML>
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
+<!-- Generated by javadoc (11.0.8) on Mon Nov 30 13:15:36 CET 2020 -->
 <title>TimeUtil</title>
-<meta name="date" content="2019-07-31">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-11-30">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
 <!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
 <div class="header">
-<div class="subTitle">org.eclipse.app4mc.amalthea.model.util</div>
+<div class="subTitle"><span class="packageLabelInType">Package</span>&nbsp;<a href="package-summary.html">org.eclipse.app4mc.amalthea.model.util</a></div>
 <h2 title="Class TimeUtil" class="title">Class TimeUtil</h2>
 </div>
 <div class="contentContainer">
@@ -26,7 +28,6 @@
 <ul class="blockList">
 <li class="blockList">
 <hr>
-<br>
 <pre>public class <span class="typeNameLabel">TimeUtil</span>
 extends Object</pre>
 </li>
@@ -35,51 +36,38 @@
 <div class="summary">
 <ul class="blockList">
 <li class="blockList">
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.summary">
-<!--   -->
-</a>
-<h3>Constructor Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Constructor Summary table, listing constructors, and an explanation">
-<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
-<tr>
-<th class="colOne" scope="col">Constructor and Description</th>
-</tr>
-<tr class="altColor">
-<td class="colOne"><code><span class="memberNameLink"><a href="#TimeUtil--">TimeUtil</a></span>()</code>&nbsp;</td>
-</tr>
-</table>
-</li>
-</ul>
 <!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.summary">
+<li class="blockList"><a id="method.summary">
 <!--   -->
 </a>
 <h3>Method Summary</h3>
-<table class="memberSummary" border="0" cellpadding="3" cellspacing="0" summary="Method Summary table, listing methods, and an explanation">
+<table class="memberSummary">
 <caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span></caption>
 <tr>
 <th class="colFirst" scope="col">Modifier and Type</th>
-<th class="colLast" scope="col">Method and Description</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
 </tr>
 <tr id="i0" class="altColor">
 <td class="colFirst"><code>static Time</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#convertToTimeUnit-org.eclipse.app4mc.amalthea.model.Time-org.eclipse.app4mc.amalthea.model.TimeUnit-">convertToTimeUnit</a></span>(Time&nbsp;time,
-                 TimeUnit&nbsp;unit)</code>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#convertToTimeUnit(org.eclipse.app4mc.amalthea.model.Time,org.eclipse.app4mc.amalthea.model.TimeUnit)">convertToTimeUnit</a></span>&#8203;(Time&nbsp;time,
+                 TimeUnit&nbsp;unit)</code></th>
+<td class="colLast">
 <div class="block">Converts a Time object to the given TimeUnit.</div>
 </td>
 </tr>
 <tr id="i1" class="rowColor">
 <td class="colFirst"><code>static List&lt;TimeUnit&gt;</code></td>
-<td class="colLast"><code><span class="memberNameLink"><a href="#getTimeUnitList--">getTimeUnitList</a></span>()</code>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getTimeUnitList()">getTimeUnitList</a></span>()</code></th>
+<td class="colLast">
 <div class="block">Returns a list with all possible Units</div>
 </td>
 </tr>
 </table>
 <ul class="blockList">
-<li class="blockList"><a name="methods.inherited.from.class.Object">
+<li class="blockList"><a id="methods.inherited.from.class.Object">
 <!--   -->
 </a>
 <h3>Methods inherited from class&nbsp;Object</h3>
@@ -87,42 +75,27 @@
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
 <div class="details">
 <ul class="blockList">
 <li class="blockList">
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<ul class="blockList">
-<li class="blockList"><a name="constructor.detail">
-<!--   -->
-</a>
-<h3>Constructor Detail</h3>
-<a name="TimeUtil--">
-<!--   -->
-</a>
-<ul class="blockListLast">
-<li class="blockList">
-<h4>TimeUtil</h4>
-<pre>public&nbsp;TimeUtil()</pre>
-</li>
-</ul>
-</li>
-</ul>
 <!-- ============ METHOD DETAIL ========== -->
+<section role="region">
 <ul class="blockList">
-<li class="blockList"><a name="method.detail">
+<li class="blockList"><a id="method.detail">
 <!--   -->
 </a>
 <h3>Method Detail</h3>
-<a name="getTimeUnitList--">
+<a id="getTimeUnitList()">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getTimeUnitList</h4>
-<pre>public static&nbsp;List&lt;TimeUnit&gt;&nbsp;getTimeUnitList()</pre>
+<pre class="methodSignature">public static&nbsp;List&lt;TimeUnit&gt;&nbsp;getTimeUnitList()</pre>
 <div class="block">Returns a list with all possible Units</div>
 <dl>
 <dt><span class="returnLabel">Returns:</span></dt>
@@ -130,13 +103,13 @@
 </dl>
 </li>
 </ul>
-<a name="convertToTimeUnit-org.eclipse.app4mc.amalthea.model.Time-org.eclipse.app4mc.amalthea.model.TimeUnit-">
+<a id="convertToTimeUnit(org.eclipse.app4mc.amalthea.model.Time,org.eclipse.app4mc.amalthea.model.TimeUnit)">
 <!--   -->
 </a>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>convertToTimeUnit</h4>
-<pre>public static&nbsp;Time&nbsp;convertToTimeUnit(Time&nbsp;time,
+<pre class="methodSignature">public static&nbsp;Time&nbsp;convertToTimeUnit&#8203;(Time&nbsp;time,
                                      TimeUnit&nbsp;unit)</pre>
 <div class="block">Converts a Time object to the given TimeUnit.
  Note: when convert from small unit to bigger unit, the function will round the number e.g 5200Ps = 5Ns</div>
@@ -144,10 +117,12 @@
 </ul>
 </li>
 </ul>
+</section>
 </li>
 </ul>
 </div>
 </div>
+</main>
 <!-- ========= END OF CLASS DATA ========= -->
 </body>
 </html>
diff --git a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/WeibullUtil.Parameters.html b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/WeibullUtil.Parameters.html
new file mode 100644
index 0000000..c643a35
--- /dev/null
+++ b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/WeibullUtil.Parameters.html
@@ -0,0 +1,287 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="de">
+<head>
+<!-- Generated by javadoc (11.0.8) on Mon Nov 30 13:15:36 CET 2020 -->
+<title>WeibullUtil.Parameters</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-11-30">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+<!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
+<div class="header">
+<div class="subTitle"><span class="packageLabelInType">Package</span>&nbsp;<a href="package-summary.html">org.eclipse.app4mc.amalthea.model.util</a></div>
+<h2 title="Class WeibullUtil.Parameters" class="title">Class WeibullUtil.Parameters</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>Object</li>
+<li>
+<ul class="inheritance">
+<li>Parameters</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<dl>
+<dt>Enclosing class:</dt>
+<dd><a href="WeibullUtil.html" title="class in org.eclipse.app4mc.amalthea.model.util">WeibullUtil</a></dd>
+</dl>
+<hr>
+<pre>public static class <span class="typeNameLabel">WeibullUtil.Parameters</span>
+extends Object</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- =========== FIELD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="field.summary">
+<!--   -->
+</a>
+<h3>Field Summary</h3>
+<table class="memberSummary">
+<caption><span>Fields</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Field</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>String</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#error">error</a></span></code></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>double</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#given_lowerBound">given_lowerBound</a></span></code></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>double</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#given_upperBound">given_upperBound</a></span></code></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>double</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#requested_mean">requested_mean</a></span></code></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>double</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#requested_pRemainPromille">requested_pRemainPromille</a></span></code></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<td class="colFirst"><code>double</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#scale">scale</a></span></code></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>double</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#shape">shape</a></span></code></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.summary">
+<!--   -->
+</a>
+<h3>Constructor Summary</h3>
+<table class="memberSummary">
+<caption><span>Constructors</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Constructor</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<th class="colConstructorName" scope="row"><code><span class="memberNameLink"><a href="#%3Cinit%3E()">Parameters</a></span>()</code></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>String</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#qualityReport()">qualityReport</a></span>()</code></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>String</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#toString()">toString</a></span>()</code></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a id="methods.inherited.from.class.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ FIELD DETAIL =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="field.detail">
+<!--   -->
+</a>
+<h3>Field Detail</h3>
+<a id="given_lowerBound">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>given_lowerBound</h4>
+<pre>public&nbsp;double given_lowerBound</pre>
+</li>
+</ul>
+<a id="given_upperBound">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>given_upperBound</h4>
+<pre>public&nbsp;double given_upperBound</pre>
+</li>
+</ul>
+<a id="requested_mean">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>requested_mean</h4>
+<pre>public&nbsp;double requested_mean</pre>
+</li>
+</ul>
+<a id="requested_pRemainPromille">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>requested_pRemainPromille</h4>
+<pre>public&nbsp;double requested_pRemainPromille</pre>
+</li>
+</ul>
+<a id="shape">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>shape</h4>
+<pre>public&nbsp;double shape</pre>
+</li>
+</ul>
+<a id="scale">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>scale</h4>
+<pre>public&nbsp;double scale</pre>
+</li>
+</ul>
+<a id="error">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>error</h4>
+<pre>public&nbsp;String error</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="constructor.detail">
+<!--   -->
+</a>
+<h3>Constructor Detail</h3>
+<a id="&lt;init&gt;()">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>Parameters</h4>
+<pre>public&nbsp;Parameters()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+<!-- ============ METHOD DETAIL ========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a id="toString()">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>toString</h4>
+<pre class="methodSignature">public&nbsp;String&nbsp;toString()</pre>
+<dl>
+<dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
+<dd><code>toString</code>&nbsp;in class&nbsp;<code>Object</code></dd>
+</dl>
+</li>
+</ul>
+<a id="qualityReport()">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>qualityReport</h4>
+<pre class="methodSignature">public&nbsp;String&nbsp;qualityReport()</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+</div>
+</main>
+<!-- ========= END OF CLASS DATA ========= -->
+</body>
+</html>
diff --git a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/WeibullUtil.html b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/WeibullUtil.html
new file mode 100644
index 0000000..5cdd0a4
--- /dev/null
+++ b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/model/util/WeibullUtil.html
@@ -0,0 +1,325 @@
+<!DOCTYPE HTML>
+<!-- NewPage -->
+<html lang="de">
+<head>
+<!-- Generated by javadoc (11.0.8) on Mon Nov 30 13:15:36 CET 2020 -->
+<title>WeibullUtil</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-11-30">
+<link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
+
+</head>
+<body>
+<!-- ======== START OF CLASS DATA ======== -->
+<main role="main">
+<div class="header">
+<div class="subTitle"><span class="packageLabelInType">Package</span>&nbsp;<a href="package-summary.html">org.eclipse.app4mc.amalthea.model.util</a></div>
+<h2 title="Class WeibullUtil" class="title">Class WeibullUtil</h2>
+</div>
+<div class="contentContainer">
+<ul class="inheritance">
+<li>Object</li>
+<li>
+<ul class="inheritance">
+<li>WeibullUtil</li>
+</ul>
+</li>
+</ul>
+<div class="description">
+<ul class="blockList">
+<li class="blockList">
+<hr>
+<pre>public class <span class="typeNameLabel">WeibullUtil</span>
+extends Object</pre>
+</li>
+</ul>
+</div>
+<div class="summary">
+<ul class="blockList">
+<li class="blockList">
+<!-- ======== NESTED CLASS SUMMARY ======== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="nested.class.summary">
+<!--   -->
+</a>
+<h3>Nested Class Summary</h3>
+<table class="memberSummary">
+<caption><span>Nested Classes</span><span class="tabEnd">&nbsp;</span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Class</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr class="altColor">
+<td class="colFirst"><code>static class&nbsp;</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="WeibullUtil.Parameters.html" title="class in org.eclipse.app4mc.amalthea.model.util">WeibullUtil.Parameters</a></span></code></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+</table>
+</li>
+</ul>
+</section>
+<!-- ========== METHOD SUMMARY =========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.summary">
+<!--   -->
+</a>
+<h3>Method Summary</h3>
+<table class="memberSummary">
+<caption><span id="t0" class="activeTableTab"><span>All Methods</span><span class="tabEnd">&nbsp;</span></span></caption>
+<tr>
+<th class="colFirst" scope="col">Modifier and Type</th>
+<th class="colSecond" scope="col">Method</th>
+<th class="colLast" scope="col">Description</th>
+</tr>
+<tr id="i0" class="altColor">
+<td class="colFirst"><code>static double</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#computeAverage(double,double,double,java.lang.Double)">computeAverage</a></span>&#8203;(double&nbsp;shape,
+              double&nbsp;scale,
+              double&nbsp;location,
+              Double&nbsp;upperBound)</code></th>
+<td class="colLast">
+<div class="block">See Crénin, François, Truncated Weibull Distribution Functions and Moments (October 30, 2015).</div>
+</td>
+</tr>
+<tr id="i1" class="rowColor">
+<td class="colFirst"><code>static double</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#computeMedian(double,double,double,java.lang.Double)">computeMedian</a></span>&#8203;(double&nbsp;shape,
+             double&nbsp;scale,
+             double&nbsp;location,
+             Double&nbsp;upperBound)</code></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr id="i2" class="altColor">
+<td class="colFirst"><code>static double</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#computeMedianWithPRemainPromille(double,double,double,double)">computeMedianWithPRemainPromille</a></span>&#8203;(double&nbsp;shape,
+                                double&nbsp;scale,
+                                double&nbsp;location,
+                                double&nbsp;pRemainPromille)</code></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr id="i3" class="rowColor">
+<td class="colFirst"><code>static double</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#computePRemainPromille(double,double,double,double)">computePRemainPromille</a></span>&#8203;(double&nbsp;shape,
+                      double&nbsp;scale,
+                      double&nbsp;location,
+                      double&nbsp;upperBound)</code></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr id="i4" class="altColor">
+<td class="colFirst"><code>static double</code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#computeUpperBound(double,double,double,double)">computeUpperBound</a></span>&#8203;(double&nbsp;shape,
+                 double&nbsp;scale,
+                 double&nbsp;location,
+                 double&nbsp;pRemainPromille)</code></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr id="i5" class="rowColor">
+<td class="colFirst"><code>static <a href="WeibullUtil.Parameters.html" title="class in org.eclipse.app4mc.amalthea.model.util">WeibullUtil.Parameters</a></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#findParameters(double,double,double,double)">findParameters</a></span>&#8203;(double&nbsp;lowerBound,
+              double&nbsp;average,
+              double&nbsp;upperBound,
+              double&nbsp;pRemainPromille)</code></th>
+<td class="colLast">
+<div class="block">This is a simple attempt to get a better parameter estimation for big pRemainPromille values.</div>
+</td>
+</tr>
+<tr id="i6" class="altColor">
+<td class="colFirst"><code>static <a href="WeibullUtil.Parameters.html" title="class in org.eclipse.app4mc.amalthea.model.util">WeibullUtil.Parameters</a></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#findParametersForAverage(double,double,double,double)">findParametersForAverage</a></span>&#8203;(double&nbsp;lowerBound,
+                        double&nbsp;average,
+                        double&nbsp;upperBound,
+                        double&nbsp;pRemainPromille)</code></th>
+<td class="colLast">
+<div class="block">The approximation from the given parameters boil down to the following problem (latex formulas):</div>
+</td>
+</tr>
+<tr id="i7" class="rowColor">
+<td class="colFirst"><code>static <a href="WeibullUtil.Parameters.html" title="class in org.eclipse.app4mc.amalthea.model.util">WeibullUtil.Parameters</a></code></td>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#findParametersForMedian(double,double,double,double)">findParametersForMedian</a></span>&#8203;(double&nbsp;lowerBound,
+                       double&nbsp;median,
+                       double&nbsp;upperBound,
+                       double&nbsp;pRemainPromille)</code></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+</table>
+<ul class="blockList">
+<li class="blockList"><a id="methods.inherited.from.class.Object">
+<!--   -->
+</a>
+<h3>Methods inherited from class&nbsp;Object</h3>
+<code>equals, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait</code></li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+<div class="details">
+<ul class="blockList">
+<li class="blockList">
+<!-- ============ METHOD DETAIL ========== -->
+<section role="region">
+<ul class="blockList">
+<li class="blockList"><a id="method.detail">
+<!--   -->
+</a>
+<h3>Method Detail</h3>
+<a id="computeAverage(double,double,double,java.lang.Double)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>computeAverage</h4>
+<pre class="methodSignature">public static&nbsp;double&nbsp;computeAverage&#8203;(double&nbsp;shape,
+                                    double&nbsp;scale,
+                                    double&nbsp;location,
+                                    Double&nbsp;upperBound)</pre>
+<div class="block">See Crénin, François, Truncated Weibull Distribution Functions and Moments (October 30, 2015).
+ Available at SSRN: https://ssrn.com/abstract=2690255 or http://dx.doi.org/10.2139/ssrn.2690255</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>shape</code> - </dd>
+<dd><code>scale</code> - </dd>
+<dd><code>location</code> - </dd>
+<dd><code>upperBound</code> - </dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+</dl>
+</li>
+</ul>
+<a id="computeMedian(double,double,double,java.lang.Double)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>computeMedian</h4>
+<pre class="methodSignature">public static&nbsp;double&nbsp;computeMedian&#8203;(double&nbsp;shape,
+                                   double&nbsp;scale,
+                                   double&nbsp;location,
+                                   Double&nbsp;upperBound)</pre>
+</li>
+</ul>
+<a id="computeMedianWithPRemainPromille(double,double,double,double)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>computeMedianWithPRemainPromille</h4>
+<pre class="methodSignature">public static&nbsp;double&nbsp;computeMedianWithPRemainPromille&#8203;(double&nbsp;shape,
+                                                      double&nbsp;scale,
+                                                      double&nbsp;location,
+                                                      double&nbsp;pRemainPromille)</pre>
+</li>
+</ul>
+<a id="computePRemainPromille(double,double,double,double)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>computePRemainPromille</h4>
+<pre class="methodSignature">public static&nbsp;double&nbsp;computePRemainPromille&#8203;(double&nbsp;shape,
+                                            double&nbsp;scale,
+                                            double&nbsp;location,
+                                            double&nbsp;upperBound)</pre>
+</li>
+</ul>
+<a id="computeUpperBound(double,double,double,double)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>computeUpperBound</h4>
+<pre class="methodSignature">public static&nbsp;double&nbsp;computeUpperBound&#8203;(double&nbsp;shape,
+                                       double&nbsp;scale,
+                                       double&nbsp;location,
+                                       double&nbsp;pRemainPromille)</pre>
+</li>
+</ul>
+<a id="findParameters(double,double,double,double)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>findParameters</h4>
+<pre class="methodSignature">public static&nbsp;<a href="WeibullUtil.Parameters.html" title="class in org.eclipse.app4mc.amalthea.model.util">WeibullUtil.Parameters</a>&nbsp;findParameters&#8203;(double&nbsp;lowerBound,
+                                                    double&nbsp;average,
+                                                    double&nbsp;upperBound,
+                                                    double&nbsp;pRemainPromille)</pre>
+<div class="block">This is a simple attempt to get a better parameter estimation for big pRemainPromille values.
+ 
+ As an alternative to the regular estimation another estimation based on the median value is calculated.
+ The better result is selected according to the relative error of both requested values.
+ 
+ Better solutions are welcome !</div>
+<dl>
+<dt><span class="paramLabel">Parameters:</span></dt>
+<dd><code>lowerBound</code> - </dd>
+<dd><code>average</code> - </dd>
+<dd><code>upperBound</code> - </dd>
+<dd><code>pRemainPromille</code> - </dd>
+<dt><span class="returnLabel">Returns:</span></dt>
+</dl>
+</li>
+</ul>
+<a id="findParametersForAverage(double,double,double,double)">
+<!--   -->
+</a>
+<ul class="blockList">
+<li class="blockList">
+<h4>findParametersForAverage</h4>
+<pre class="methodSignature">public static&nbsp;<a href="WeibullUtil.Parameters.html" title="class in org.eclipse.app4mc.amalthea.model.util">WeibullUtil.Parameters</a>&nbsp;findParametersForAverage&#8203;(double&nbsp;lowerBound,
+                                                              double&nbsp;average,
+                                                              double&nbsp;upperBound,
+                                                              double&nbsp;pRemainPromille)</pre>
+<div class="block">The approximation from the given parameters boil down to the following problem (latex formulas):
+ <p>
+ CDF_{weibull}(upperBound) = 1 - pRemainPromille/1000
+ <p>
+ Using the Weibull CDF (1) and the Expectation Value (average) (2)
+ we can derive a formula for the scale dependent on shape and known values from (2)
+ <p>
+ (1) CDF_{weibull}(x) = 1 - e^{- (\frac{x}{scale})^{shape}}
+ <p>
+ (2) avg = scale \cdot \Gamma(1 + \frac{1}{shape})
+ <p>
+ (3) scale = \frac{avg}{\Gamma(1 + (1 / shape))}
+ <p>
+ with (1), (3) and pRemain = pRemainPromille/1000 follows
+ <p>
+ (4) pRemain = e^{-(\frac{upper limit}{E_{avg}} \cdot \Gamma(1 + \frac{1}{shape}))^{shape}}
+ <p>
+ from this we form a zero finding problem
+ <p>
+ (5) 0 = e^{-(\frac{upper limit}{E_{avg}}\cdot \Gamma(1 + \frac{1}{shape}))^{shape}} - pRemain
+ <p>
+ The work "Robust Scheduling of Real-Time Applications on Efficient Embedded Multicore Systems"
+ (https://mediatum.ub.tum.de/download/1063381/1063381.pdf) proposes an algorithm from (4) which
+ is basically the bisection method.</div>
+</li>
+</ul>
+<a id="findParametersForMedian(double,double,double,double)">
+<!--   -->
+</a>
+<ul class="blockListLast">
+<li class="blockList">
+<h4>findParametersForMedian</h4>
+<pre class="methodSignature">public static&nbsp;<a href="WeibullUtil.Parameters.html" title="class in org.eclipse.app4mc.amalthea.model.util">WeibullUtil.Parameters</a>&nbsp;findParametersForMedian&#8203;(double&nbsp;lowerBound,
+                                                             double&nbsp;median,
+                                                             double&nbsp;upperBound,
+                                                             double&nbsp;pRemainPromille)</pre>
+</li>
+</ul>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</div>
+</div>
+</main>
+<!-- ========= END OF CLASS DATA ========= -->
+</body>
+</html>
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 43806a6..b69ce4e 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
@@ -1,20 +1,22 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML>
 <!-- NewPage -->
 <html lang="de">
 <head>
-<!-- Generated by javadoc (1.8.0_201) on Wed Jul 31 11:27:00 CEST 2019 -->
+<!-- Generated by javadoc (11.0.8) on Mon Nov 30 13:15:36 CET 2020 -->
 <title>org.eclipse.app4mc.amalthea.model.util</title>
-<meta name="date" content="2019-07-31">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="dc.created" content="2020-11-30">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
+<main role="main">
 <div class="header">
 <h1 title="Package" class="title">Package&nbsp;org.eclipse.app4mc.amalthea.model.util</h1>
 </div>
 <div class="contentContainer">
 <ul class="blockList">
 <li class="blockList">
-<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Class Summary table, listing classes, and an explanation">
+<table class="typeSummary">
 <caption><span>Class Summary</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Class</th>
@@ -22,42 +24,60 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><a href="CustomPropertyUtil.html" title="class in org.eclipse.app4mc.amalthea.model.util">CustomPropertyUtil</a></td>
+<th class="colFirst" scope="row"><a href="ConstraintsUtil.html" title="class in org.eclipse.app4mc.amalthea.model.util">ConstraintsUtil</a></th>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a href="DeploymentUtil.html" title="class in org.eclipse.app4mc.amalthea.model.util">DeploymentUtil</a></td>
+<th class="colFirst" scope="row"><a href="CustomPropertyUtil.html" title="class in org.eclipse.app4mc.amalthea.model.util">CustomPropertyUtil</a></th>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a href="FactoryUtil.html" title="class in org.eclipse.app4mc.amalthea.model.util">FactoryUtil</a></td>
+<th class="colFirst" scope="row"><a href="DeploymentUtil.html" title="class in org.eclipse.app4mc.amalthea.model.util">DeploymentUtil</a></th>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a href="HardwareUtil.html" title="class in org.eclipse.app4mc.amalthea.model.util">HardwareUtil</a></td>
+<th class="colFirst" scope="row"><a href="FactoryUtil.html" title="class in org.eclipse.app4mc.amalthea.model.util">FactoryUtil</a></th>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a href="ModelUtil.html" title="class in org.eclipse.app4mc.amalthea.model.util">ModelUtil</a></td>
+<th class="colFirst" scope="row"><a href="HardwareUtil.html" title="class in org.eclipse.app4mc.amalthea.model.util">HardwareUtil</a></th>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a href="RuntimeUtil.html" title="class in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil</a></td>
+<th class="colFirst" scope="row"><a href="InstructionsUtil.html" title="class in org.eclipse.app4mc.amalthea.model.util">InstructionsUtil</a></th>
+<td class="colLast">Deprecated.
+<div class="deprecationComment">(0.9.3) use <code>Ticks</code> instead.</div>
+</td>
+</tr>
+<tr class="altColor">
+<th class="colFirst" scope="row"><a href="ModelUtil.html" title="class in org.eclipse.app4mc.amalthea.model.util">ModelUtil</a></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<th class="colFirst" scope="row"><a href="RuntimeUtil.html" title="class in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil</a></th>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a href="SoftwareUtil.html" title="class in org.eclipse.app4mc.amalthea.model.util">SoftwareUtil</a></td>
+<th class="colFirst" scope="row"><a href="SoftwareUtil.html" title="class in org.eclipse.app4mc.amalthea.model.util">SoftwareUtil</a></th>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a href="TimeUtil.html" title="class in org.eclipse.app4mc.amalthea.model.util">TimeUtil</a></td>
+<th class="colFirst" scope="row"><a href="TimeUtil.html" title="class in org.eclipse.app4mc.amalthea.model.util">TimeUtil</a></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="altColor">
+<th class="colFirst" scope="row"><a href="WeibullUtil.html" title="class in org.eclipse.app4mc.amalthea.model.util">WeibullUtil</a></th>
+<td class="colLast">&nbsp;</td>
+</tr>
+<tr class="rowColor">
+<th class="colFirst" scope="row"><a href="WeibullUtil.Parameters.html" title="class in org.eclipse.app4mc.amalthea.model.util">WeibullUtil.Parameters</a></th>
 <td class="colLast">&nbsp;</td>
 </tr>
 </tbody>
 </table>
 </li>
 <li class="blockList">
-<table class="typeSummary" border="0" cellpadding="3" cellspacing="0" summary="Enum Summary table, listing enums, and an explanation">
+<table class="typeSummary">
 <caption><span>Enum Summary</span><span class="tabEnd">&nbsp;</span></caption>
 <tr>
 <th class="colFirst" scope="col">Enum</th>
@@ -65,15 +85,15 @@
 </tr>
 <tbody>
 <tr class="altColor">
-<td class="colFirst"><a href="RuntimeUtil.AccessDirection.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.AccessDirection</a></td>
+<th class="colFirst" scope="row"><a href="RuntimeUtil.AccessDirection.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.AccessDirection</a></th>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<td class="colFirst"><a href="RuntimeUtil.PositionType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.PositionType</a></td>
+<th class="colFirst" scope="row"><a href="RuntimeUtil.PositionType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.PositionType</a></th>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">
-<td class="colFirst"><a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a></td>
+<th class="colFirst" scope="row"><a href="RuntimeUtil.TimeType.html" title="enum in org.eclipse.app4mc.amalthea.model.util">RuntimeUtil.TimeType</a></th>
 <td class="colLast">&nbsp;</td>
 </tr>
 </tbody>
@@ -81,5 +101,6 @@
 </li>
 </ul>
 </div>
+</main>
 </body>
 </html>
diff --git a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/stylesheet.css b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/stylesheet.css
index 98055b2..fa24676 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/stylesheet.css
+++ b/plugins/org.eclipse.app4mc.amalthea.model.help/help-javadoc/stylesheet.css
@@ -1,35 +1,51 @@
-/* Javadoc style sheet */
-/*
-Overall document style
-*/
+/* 
+ * Javadoc style sheet
+ */
 
 @import url('resources/fonts/dejavu.css');
 
+/*
+ * Styles for individual HTML elements.
+ *
+ * These are styles that are specific to individual HTML elements. Changing them affects the style of a particular
+ * HTML element throughout the page.
+ */
+
 body {
     background-color:#ffffff;
     color:#353833;
     font-family:'DejaVu Sans', Arial, Helvetica, sans-serif;
     font-size:14px;
     margin:0;
+    padding:0;
+    height:100%;
+    width:100%;
+}
+iframe {
+    margin:0;
+    padding:0;
+    height:100%;
+    width:100%;
+    overflow-y:scroll;
+    border:none;
 }
 a:link, a:visited {
     text-decoration:none;
     color:#4A6782;
 }
-a:hover, a:focus {
+a[href]:hover, a[href]:focus {
     text-decoration:none;
     color:#bb7a2a;
 }
-a:active {
-    text-decoration:none;
-    color:#4A6782;
-}
 a[name] {
     color:#353833;
 }
-a[name]:hover {
-    text-decoration:none;
-    color:#353833;
+a[name]:before, a[name]:target, a[id]:before, a[id]:target {
+    content:"";
+    display:inline-block;
+    position:relative;
+    padding-top:129px;
+    margin-top:-129px;
 }
 pre {
     font-family:'DejaVu Sans Mono', monospace;
@@ -78,9 +94,16 @@
 sup {
     font-size:8px;
 }
+
 /*
-Document title and Copyright styles
-*/
+ * Styles for HTML generated by javadoc.
+ *
+ * These are style classes that are used by the standard doclet to generate HTML documentation.
+ */
+
+/*
+ * Styles for document title and copyright.
+ */
 .clear {
     clear:both;
     height:0px;
@@ -111,8 +134,8 @@
     font-weight:bold;
 }
 /*
-Navigation bar styles
-*/
+ * Styles for navigation bar.
+ */
 .bar {
     background-color:#4D7A97;
     color:#FFFFFF;
@@ -121,6 +144,15 @@
     font-size:11px;
     margin:0;
 }
+.navPadding {
+    padding-top: 107px;
+}
+.fixedNav {
+    position:fixed;
+    width:100%;
+    z-index:999;
+    background-color:#ffffff;
+}
 .topNav {
     background-color:#4D7A97;
     color:#FFFFFF;
@@ -170,7 +202,22 @@
     padding: 5px 6px;
     text-transform:uppercase;
 }
-ul.subNavList li{
+ul.navListSearch {
+    float:right;
+    margin:0 0 0 0;
+    padding:0;
+}
+ul.navListSearch li {
+    list-style:none;
+    float:right;
+    padding: 5px 6px;
+    text-transform:uppercase;
+}
+ul.navListSearch li label {
+    position:relative;
+    right:-16px;
+}
+ul.subNavList li {
     list-style:none;
     float:left;
 }
@@ -196,21 +243,29 @@
     overflow:hidden;
 }
 /*
-Page header and footer styles
-*/
+ * Styles for page header and footer.
+ */
 .header, .footer {
     clear:both;
     margin:0 20px;
     padding:5px 0 0 0;
 }
-.indexHeader {
-    margin:10px;
+.indexNav {
     position:relative;
+    font-size:12px;
+    background-color:#dee3e9;
 }
-.indexHeader span{
-    margin-right:15px;
+.indexNav ul {
+    margin-top:0;
+    padding:5px;
 }
-.indexHeader h1 {
+.indexNav ul li {
+    display:inline;
+    list-style-type:none;
+    padding-right:10px;
+    text-transform:uppercase;
+}
+.indexNav h1 {
     font-size:13px;
 }
 .title {
@@ -232,8 +287,8 @@
     font-size:13px;
 }
 /*
-Heading styles
-*/
+ * Styles for headings.
+ */
 div.details ul.blockList ul.blockList ul.blockList li.blockList h4, div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 {
     background-color:#dee3e9;
     border:1px solid #d0d9e0;
@@ -254,9 +309,10 @@
     padding:0px 0 20px 0;
 }
 /*
-Page layout container styles
-*/
-.contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer, .constantValuesContainer {
+ * Styles for page layout containers.
+ */
+.contentContainer, .sourceContainer, .classUseContainer, .serializedFormContainer, .constantValuesContainer,
+.allClassesContainer, .allPackagesContainer {
     clear:both;
     padding:10px 20px;
     position:relative;
@@ -287,7 +343,7 @@
 .contentContainer .description dl dd, .contentContainer .details dl dd, .serializedFormContainer dl dd {
     margin:5px 0 10px 0px;
     font-size:14px;
-    font-family:'DejaVu Sans Mono',monospace;
+    font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
 }
 .serializedFormContainer dl.nameValue dt {
     margin-left:1px;
@@ -301,8 +357,11 @@
     display:inline;
 }
 /*
-List styles
-*/
+ * Styles for lists.
+ */
+li.circle {
+    list-style:circle;
+}
 ul.horizontal li {
     display:inline;
     font-size:0.9em;
@@ -355,19 +414,22 @@
     margin-bottom:1px;
 }
 /*
-Table styles
-*/
-.overviewSummary, .memberSummary, .typeSummary, .useSummary, .constantsSummary, .deprecatedSummary {
+ * Styles for tables.
+ */
+.overviewSummary, .memberSummary, .typeSummary, .useSummary, .constantsSummary, .deprecatedSummary,
+.requiresSummary, .packagesSummary, .providesSummary, .usesSummary {
     width:100%;
+    border-spacing:0;
     border-left:1px solid #EEE; 
     border-right:1px solid #EEE; 
     border-bottom:1px solid #EEE; 
 }
-.overviewSummary, .memberSummary  {
+.overviewSummary, .memberSummary, .requiresSummary, .packagesSummary, .providesSummary, .usesSummary  {
     padding:0px;
 }
 .overviewSummary caption, .memberSummary caption, .typeSummary caption,
-.useSummary caption, .constantsSummary caption, .deprecatedSummary caption {
+.useSummary caption, .constantsSummary caption, .deprecatedSummary caption,
+.requiresSummary caption, .packagesSummary caption, .providesSummary caption, .usesSummary caption {
     position:relative;
     text-align:left;
     background-repeat:no-repeat;
@@ -382,17 +444,31 @@
     white-space:pre;
 }
 .overviewSummary caption a:link, .memberSummary caption a:link, .typeSummary caption a:link,
-.useSummary caption a:link, .constantsSummary caption a:link, .deprecatedSummary caption a:link,
+.constantsSummary caption a:link, .deprecatedSummary caption a:link,
+.requiresSummary caption a:link, .packagesSummary caption a:link, .providesSummary caption a:link,
+.usesSummary caption a:link,
 .overviewSummary caption a:hover, .memberSummary caption a:hover, .typeSummary caption a:hover,
-.useSummary caption a:hover, .constantsSummary caption a:hover, .deprecatedSummary caption a:hover,
+.constantsSummary caption a:hover, .deprecatedSummary caption a:hover,
+.requiresSummary caption a:hover, .packagesSummary caption a:hover, .providesSummary caption a:hover,
+.usesSummary caption a:hover,
 .overviewSummary caption a:active, .memberSummary caption a:active, .typeSummary caption a:active,
-.useSummary caption a:active, .constantsSummary caption a:active, .deprecatedSummary caption a:active,
+.constantsSummary caption a:active, .deprecatedSummary caption a:active,
+.requiresSummary caption a:active, .packagesSummary caption a:active, .providesSummary caption a:active,
+.usesSummary caption a:active,
 .overviewSummary caption a:visited, .memberSummary caption a:visited, .typeSummary caption a:visited,
-.useSummary caption a:visited, .constantsSummary caption a:visited, .deprecatedSummary caption a:visited {
+.constantsSummary caption a:visited, .deprecatedSummary caption a:visited,
+.requiresSummary caption a:visited, .packagesSummary caption a:visited, .providesSummary caption a:visited,
+.usesSummary caption a:visited {
     color:#FFFFFF;
 }
+.useSummary caption a:link, .useSummary caption a:hover, .useSummary caption a:active,
+.useSummary caption a:visited {
+    color:#1f389c;
+}
 .overviewSummary caption span, .memberSummary caption span, .typeSummary caption span,
-.useSummary caption span, .constantsSummary caption span, .deprecatedSummary caption span {
+.useSummary caption span, .constantsSummary caption span, .deprecatedSummary caption span,
+.requiresSummary caption span, .packagesSummary caption span, .providesSummary caption span,
+.usesSummary caption span {
     white-space:nowrap;
     padding-top:5px;
     padding-left:12px;
@@ -404,7 +480,8 @@
     border: none;
     height:16px;
 }
-.memberSummary caption span.activeTableTab span {
+.memberSummary caption span.activeTableTab span, .packagesSummary caption span.activeTableTab span,
+.overviewSummary caption span.activeTableTab span, .typeSummary caption span.activeTableTab span {
     white-space:nowrap;
     padding-top:5px;
     padding-left:12px;
@@ -415,7 +492,8 @@
     background-color:#F8981D;
     height:16px;
 }
-.memberSummary caption span.tableTab span {
+.memberSummary caption span.tableTab span, .packagesSummary caption span.tableTab span,
+.overviewSummary caption span.tableTab span, .typeSummary caption span.tableTab span {
     white-space:nowrap;
     padding-top:5px;
     padding-left:12px;
@@ -426,7 +504,10 @@
     background-color:#4D7A97;
     height:16px;
 }
-.memberSummary caption span.tableTab, .memberSummary caption span.activeTableTab {
+.memberSummary caption span.tableTab, .memberSummary caption span.activeTableTab,
+.packagesSummary caption span.tableTab, .packagesSummary caption span.activeTableTab,
+.overviewSummary caption span.tableTab, .overviewSummary caption span.activeTableTab,
+.typeSummary caption span.tableTab, .typeSummary caption span.activeTableTab {
     padding-top:0px;
     padding-left:0px;
     padding-right:0px;
@@ -435,14 +516,16 @@
     display:inline;
 }
 .overviewSummary .tabEnd, .memberSummary .tabEnd, .typeSummary .tabEnd,
-.useSummary .tabEnd, .constantsSummary .tabEnd, .deprecatedSummary .tabEnd {
+.useSummary .tabEnd, .constantsSummary .tabEnd, .deprecatedSummary .tabEnd,
+.requiresSummary .tabEnd, .packagesSummary .tabEnd, .providesSummary .tabEnd, .usesSummary .tabEnd {
     display:none;
     width:5px;
     position:relative;
     float:left;
     background-color:#F8981D;
 }
-.memberSummary .activeTableTab .tabEnd {
+.memberSummary .activeTableTab .tabEnd, .packagesSummary .activeTableTab .tabEnd,
+.overviewSummary .activeTableTab .tabEnd, .typeSummary .activeTableTab .tabEnd {
     display:none;
     width:5px;
     margin-right:3px;
@@ -450,66 +533,88 @@
     float:left;
     background-color:#F8981D;
 }
-.memberSummary .tableTab .tabEnd {
+.memberSummary .tableTab .tabEnd, .packagesSummary .tableTab .tabEnd,
+.overviewSummary .tableTab .tabEnd, .typeSummary .tableTab .tabEnd {
     display:none;
     width:5px;
     margin-right:3px;
     position:relative;
     background-color:#4D7A97;
     float:left;
-
+}
+.rowColor th, .altColor th {
+    font-weight:normal;
 }
 .overviewSummary td, .memberSummary td, .typeSummary td,
-.useSummary td, .constantsSummary td, .deprecatedSummary td {
+.useSummary td, .constantsSummary td, .deprecatedSummary td,
+.requiresSummary td, .packagesSummary td, .providesSummary td, .usesSummary td {
     text-align:left;
     padding:0px 0px 12px 10px;
 }
-th.colOne, th.colFirst, th.colLast, .useSummary th, .constantsSummary th,
-td.colOne, td.colFirst, td.colLast, .useSummary td, .constantsSummary td{
+th.colFirst, th.colSecond, th.colLast, th.colConstructorName, th.colDeprecatedItemName, .useSummary th,
+.constantsSummary th, .packagesSummary th, td.colFirst, td.colSecond, td.colLast, .useSummary td,
+.constantsSummary td {
     vertical-align:top;
     padding-right:0px;
     padding-top:8px;
     padding-bottom:3px;
 }
-th.colFirst, th.colLast, th.colOne, .constantsSummary th {
+th.colFirst, th.colSecond, th.colLast, th.colConstructorName, th.colDeprecatedItemName, .constantsSummary th,
+.packagesSummary th {
     background:#dee3e9;
     text-align:left;
     padding:8px 3px 3px 7px;
 }
 td.colFirst, th.colFirst {
-    white-space:nowrap;
     font-size:13px;
 }
-td.colLast, th.colLast {
+td.colSecond, th.colSecond, td.colLast, th.colConstructorName, th.colDeprecatedItemName, th.colLast {
     font-size:13px;
 }
-td.colOne, th.colOne {
+.constantsSummary th, .packagesSummary th {
+    font-size:13px;
+}
+.providesSummary th.colFirst, .providesSummary th.colLast, .providesSummary td.colFirst,
+.providesSummary td.colLast {
+    white-space:normal;
     font-size:13px;
 }
 .overviewSummary td.colFirst, .overviewSummary th.colFirst,
-.useSummary td.colFirst, .useSummary th.colFirst,
-.overviewSummary td.colOne, .overviewSummary th.colOne,
+.requiresSummary td.colFirst, .requiresSummary th.colFirst,
+.packagesSummary td.colFirst, .packagesSummary td.colSecond, .packagesSummary th.colFirst, .packagesSummary th,
+.usesSummary td.colFirst, .usesSummary th.colFirst,
+.providesSummary td.colFirst, .providesSummary th.colFirst,
 .memberSummary td.colFirst, .memberSummary th.colFirst,
-.memberSummary td.colOne, .memberSummary th.colOne,
-.typeSummary td.colFirst{
-    width:25%;
+.memberSummary td.colSecond, .memberSummary th.colSecond, .memberSummary th.colConstructorName,
+.typeSummary td.colFirst, .typeSummary th.colFirst {
     vertical-align:top;
 }
-td.colOne a:link, td.colOne a:active, td.colOne a:visited, td.colOne a:hover, td.colFirst a:link, td.colFirst a:active, td.colFirst a:visited, td.colFirst a:hover, td.colLast a:link, td.colLast a:active, td.colLast a:visited, td.colLast a:hover, .constantValuesContainer td a:link, .constantValuesContainer td a:active, .constantValuesContainer td a:visited, .constantValuesContainer td a:hover {
+.packagesSummary th.colLast, .packagesSummary td.colLast {
+    white-space:normal;
+}
+td.colFirst a:link, td.colFirst a:visited,
+td.colSecond a:link, td.colSecond a:visited,
+th.colFirst a:link, th.colFirst a:visited,
+th.colSecond a:link, th.colSecond a:visited,
+th.colConstructorName a:link, th.colConstructorName a:visited,
+th.colDeprecatedItemName a:link, th.colDeprecatedItemName a:visited, 
+.constantValuesContainer td a:link, .constantValuesContainer td a:visited, 
+.allClassesContainer td a:link, .allClassesContainer td a:visited, 
+.allPackagesContainer td a:link, .allPackagesContainer td a:visited {
     font-weight:bold;
 }
 .tableSubHeadingColor {
     background-color:#EEEEFF;
 }
-.altColor {
+.altColor, .altColor th {
     background-color:#FFFFFF;
 }
-.rowColor {
+.rowColor, .rowColor th {
     background-color:#EEEEEF;
 }
 /*
-Content styles
-*/
+ * Styles for contents.
+ */
 .description pre {
     margin-top:0;
 }
@@ -520,27 +625,22 @@
 .docSummary {
     padding:0;
 }
-
 ul.blockList ul.blockList ul.blockList li.blockList h3 {
     font-style:normal;
 }
-
 div.block {
     font-size:14px;
     font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
 }
-
 td.colLast div {
     padding-top:0px;
 }
-
-
 td.colLast a {
     padding-bottom:3px;
 }
 /*
-Formatting effect styles
-*/
+ * Styles for formatting effect.
+ */
 .sourceLineNo {
     color:green;
     padding:0 30px 0 0;
@@ -555,20 +655,252 @@
     margin:3px 10px 2px 0px;
     color:#474747;
 }
-.deprecatedLabel, .descfrmTypeLabel, .memberNameLabel, .memberNameLink,
-.overrideSpecifyLabel, .packageHierarchyLabel, .paramLabel, .returnLabel,
-.seeLabel, .simpleTagLabel, .throwsLabel, .typeNameLabel, .typeNameLink {
+.deprecatedLabel, .descfrmTypeLabel, .implementationLabel, .memberNameLabel, .memberNameLink,
+.moduleLabelInPackage, .moduleLabelInType, .overrideSpecifyLabel, .packageLabelInType,
+.packageHierarchyLabel, .paramLabel, .returnLabel, .seeLabel, .simpleTagLabel,
+.throwsLabel, .typeNameLabel, .typeNameLink, .searchTagLink {
     font-weight:bold;
 }
 .deprecationComment, .emphasizedPhrase, .interfaceName {
     font-style:italic;
 }
-
-div.block div.block span.deprecationComment, div.block div.block span.emphasizedPhrase,
+.deprecationBlock {
+    font-size:14px;
+    font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
+    border-style:solid;
+    border-width:thin;
+    border-radius:10px;
+    padding:10px;
+    margin-bottom:10px;
+    margin-right:10px;
+    display:inline-block;
+}
+div.block div.deprecationComment, div.block div.block span.emphasizedPhrase,
 div.block div.block span.interfaceName {
     font-style:normal;
 }
-
-div.contentContainer ul.blockList li.blockList h2{
+div.contentContainer ul.blockList li.blockList h2 {
     padding-bottom:0px;
 }
+/*
+ * Styles for IFRAME.
+ */
+.mainContainer {
+    margin:0 auto; 
+    padding:0; 
+    height:100%; 
+    width:100%; 
+    position:fixed; 
+    top:0; 
+    left:0;
+}
+.leftContainer {
+    height:100%;
+    position:fixed;
+    width:320px;
+}
+.leftTop {
+    position:relative;
+    float:left;
+    width:315px;
+    top:0;
+    left:0;
+    height:30%;
+    border-right:6px solid #ccc;
+    border-bottom:6px solid #ccc;
+}
+.leftBottom {
+    position:relative;
+    float:left;
+    width:315px;
+    bottom:0;
+    left:0;
+    height:70%;
+    border-right:6px solid #ccc;
+    border-top:1px solid #000;
+}
+.rightContainer {
+    position:absolute;
+    left:320px;
+    top:0;
+    bottom:0;
+    height:100%;
+    right:0;
+    border-left:1px solid #000;
+}
+.rightIframe {
+    margin:0;
+    padding:0;
+    height:100%;
+    right:30px;
+    width:100%;
+    overflow:visible;
+    margin-bottom:30px;
+}
+/*
+ * Styles specific to HTML5 elements.
+ */
+main, nav, header, footer, section {
+    display:block;
+}
+/*
+ * Styles for javadoc search.
+ */
+.ui-autocomplete-category {
+    font-weight:bold;
+    font-size:15px;
+    padding:7px 0 7px 3px;
+    background-color:#4D7A97;
+    color:#FFFFFF;
+}
+.resultItem {
+    font-size:13px;
+}
+.ui-autocomplete {
+    max-height:85%;
+    max-width:65%;
+    overflow-y:scroll;
+    overflow-x:scroll;
+    white-space:nowrap;
+    box-shadow: 0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23);
+}
+ul.ui-autocomplete {
+    position:fixed;
+    z-index:999999;
+}
+ul.ui-autocomplete  li {
+    float:left;
+    clear:both;
+    width:100%;
+}
+.resultHighlight {
+    font-weight:bold;
+}
+#search {
+    background-image:url('resources/glass.png');
+    background-size:13px;
+    background-repeat:no-repeat;
+    background-position:2px 3px;
+    padding-left:20px;
+    position:relative;
+    right:-18px;
+}
+#reset {
+    background-color: rgb(255,255,255);
+    background-image:url('resources/x.png');
+    background-position:center;
+    background-repeat:no-repeat;
+    background-size:12px;
+    border:0 none;
+    width:16px;
+    height:17px;
+    position:relative;
+    left:-4px;
+    top:-4px;
+    font-size:0px;
+}
+.watermark {
+    color:#545454;
+}
+.searchTagDescResult {
+    font-style:italic;
+    font-size:11px;
+}
+.searchTagHolderResult {
+    font-style:italic;
+    font-size:12px;
+}
+.searchTagResult:before, .searchTagResult:target {
+    color:red;
+}
+.moduleGraph span {
+    display:none;
+    position:absolute;
+}
+.moduleGraph:hover span {
+    display:block;
+    margin: -100px 0 0 100px;
+    z-index: 1;
+}
+.methodSignature {
+    white-space:normal;
+}
+
+/*
+ * Styles for user-provided tables.
+ *
+ * borderless:
+ *      No borders, vertical margins, styled caption.
+ *      This style is provided for use with existing doc comments.
+ *      In general, borderless tables should not be used for layout purposes.
+ *
+ * plain:
+ *      Plain borders around table and cells, vertical margins, styled caption.
+ *      Best for small tables or for complex tables for tables with cells that span
+ *      rows and columns, when the "striped" style does not work well.
+ *
+ * striped:
+ *      Borders around the table and vertical borders between cells, striped rows,
+ *      vertical margins, styled caption.
+ *      Best for tables that have a header row, and a body containing a series of simple rows.
+ */
+
+table.borderless,
+table.plain,
+table.striped {
+    margin-top: 10px;
+    margin-bottom: 10px;
+}
+table.borderless > caption,
+table.plain > caption,
+table.striped > caption {
+    font-weight: bold;
+    font-size: smaller;
+}
+table.borderless th, table.borderless td,
+table.plain th, table.plain td,
+table.striped th, table.striped td {
+    padding: 2px 5px;
+}
+table.borderless,
+table.borderless > thead > tr > th, table.borderless > tbody > tr > th, table.borderless > tr > th,
+table.borderless > thead > tr > td, table.borderless > tbody > tr > td, table.borderless > tr > td {
+    border: none;
+}
+table.borderless > thead > tr, table.borderless > tbody > tr, table.borderless > tr {
+    background-color: transparent;
+}
+table.plain {
+    border-collapse: collapse;
+    border: 1px solid black;
+}
+table.plain > thead > tr, table.plain > tbody tr, table.plain > tr {
+    background-color: transparent;
+}
+table.plain > thead > tr > th, table.plain > tbody > tr > th, table.plain > tr > th,
+table.plain > thead > tr > td, table.plain > tbody > tr > td, table.plain > tr > td {
+    border: 1px solid black;
+}
+table.striped {
+    border-collapse: collapse;
+    border: 1px solid black;
+}
+table.striped > thead {
+    background-color: #E3E3E3;
+}
+table.striped > thead > tr > th, table.striped > thead > tr > td {
+    border: 1px solid black;
+}
+table.striped > tbody > tr:nth-child(even) {
+    background-color: #EEE
+}
+table.striped > tbody > tr:nth-child(odd) {
+    background-color: #FFF
+}
+table.striped > tbody > tr > th, table.striped > tbody > tr > td {
+    border-left: 1px solid black;
+    border-right: 1px solid black;
+}
+table.striped > tbody > tr > th {
+    font-weight: normal;
+}
diff --git a/plugins/org.eclipse.app4mc.amalthea.model/build-javadoc.ant b/plugins/org.eclipse.app4mc.amalthea.model/build-javadoc.ant
index 9afd28e..bf9ebd6 100644
--- a/plugins/org.eclipse.app4mc.amalthea.model/build-javadoc.ant
+++ b/plugins/org.eclipse.app4mc.amalthea.model/build-javadoc.ant
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
  * *******************************************************************************
- *  Copyright (c) 2019 Robert Bosch GmbH and others.
+ *  Copyright (c) 2020 Robert Bosch GmbH and others.
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License 2.0
  *  which accompanies this distribution, and is available at
@@ -13,26 +13,23 @@
 -->
 
 <project default="javadoc">
-	
-	<property name="model-package" value="${basedir}/src/org/eclipse/app4mc/amalthea/model"/>
-	<property name="builder-package" value="${model-package}/builder"/>
-	<property name="util-package" value="${model-package}/util"/>
-	
+
 	<target name="javadoc">
 		<javadoc
- 			additionalparam=" -nonavbar -noqualifier all "
+			additionalparam=" -nonavbar -noqualifier all "
 			access="public"
 			author="false"
-			classpath="C:\workspace\e_ide\2018-12_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\com.google.guava_21.0.0.v20170206-1425.jar;C:\workspace\e_ide\2018-12_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.emf.common_2.13.0.v20170609-0707.jar;C:\workspace\e_ide\2018-12_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.emf.transaction_1.9.0.201706061339.jar;C:\workspace\e_ide\2018-12_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.emf.ecore.change_2.11.0.v20170609-0707.jar;C:\workspace\e_ide\2018-12_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.sphinx.platform_0.11.0.201706140911.jar;C:\workspace\e_ide\2018-12_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.equinox.common_3.9.0.v20170207-1454.jar;C:\workspace\e_ide\2018-12_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.core.expressions_3.6.0.v20170207-1037.jar;C:\workspace\e_ide\_targets\app4mc.platform-0.9.2\plugins\org.eclipse.emf.ecore.xcore.lib_1.1.100.v20170613-0242.jar;C:\workspace\e_ide\_targets\app4mc.platform-0.9.2\plugins\org.eclipse.equinox.weaving.hook_1.2.0.v20160929-1449.jar;C:\workspace\e_ide\2018-12_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.osgi_3.12.100.v20180210-1608.jar;C:\workspace\e_ide\2018-12_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.core.contenttype_3.6.0.v20170207-1037.jar;C:\workspace\e_ide\2018-12_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.core.commands_3.9.0.v20170530-1048.jar;C:\workspace\e_ide\2018-12_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.emf.ecore_2.13.0.v20170609-0707.jar;C:\workspace\e_ide\_targets\app4mc.platform-0.9.2\plugins\org.eclipse.equinox.transforms.hook_1.2.0.v20170105-1446.jar;C:\workspace\e_ide\2018-12_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.core.filesystem_1.7.0.v20170406-1337.jar;C:\workspace\e_ide\2018-12_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.apache.commons.cli_1.2.0.v201404270220.jar;C:\workspace\e_ide\2018-12_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.sphinx.emf_0.11.0.201706140911.jar;C:\workspace\_repos\git-eclipse\app4mc.1\plugins\org.eclipse.app4mc.amalthea.sphinx\bin;C:\progs_mc\java\jdk-8u191\jre\lib\jfxswt.jar;C:\workspace\e_ide\2018-12_committer\plugins\org.eclipse.fx.ide.css.jfx8_3.3.0.201809010700.jar;C:\workspace\e_ide\2018-12_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.core.jobs_3.9.3.v20180115-1757.jar;C:\workspace\e_ide\_targets\app4mc.platform-0.9.2\plugins\org.eclipse.equinox.region_1.4.0.v20170117-1425.jar;C:\workspace\e_ide\2018-12_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.osgi.compatibility.state_1.1.0.v20170516-1513.jar;C:\workspace\e_ide\2018-12_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.jdt.annotation_2.1.150.v20180322-1206.jar;C:\workspace\e_ide\2018-12_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.core.runtime_3.13.0.v20170207-1030.jar;C:\workspace\e_ide\2018-12_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.apache.xerces_2.9.0.v201101211617.jar;C:\workspace\e_ide\2018-12_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.sphinx.emf.workspace_0.11.0.201706140911.jar;C:\workspace\e_ide\_targets\app4mc.platform-0.9.2\plugins\org.apache.commons.math3_3.5.0.v20160301-1110.jar;C:\workspace\e_ide\_targets\app4mc.platform-0.9.2\plugins\org.eclipse.fx.osgi_3.0.0.201705220748.jar;C:\workspace\e_ide\2018-12_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.emf.ecore.xmi_2.13.0.v20170609-0707.jar;C:\workspace\e_ide\2018-12_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.emf.validation_1.8.0.201706061352.jar;C:\workspace\e_ide\2018-12_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.core.resources_3.12.0.v20170417-1558.jar;C:\workspace\e_ide\2018-12_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.emf.edit_2.12.0.v20170609-0928.jar;C:\workspace\e_ide\2018-12_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.equinox.registry_3.7.0.v20170222-1344.jar;C:\workspace\e_ide\2018-12_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\javax.inject_1.0.0.v20091030.jar;C:\workspace\e_ide\2018-12_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.equinox.app_1.3.400.v20150715-1528.jar;C:\workspace\e_ide\_targets\app4mc.platform-0.9.2\plugins\org.eclipse.xtext.xbase.lib_2.13.0.v20171020-0659.jar;C:\workspace\e_ide\2018-12_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.equinox.preferences_3.7.0.v20170126-2132.jar;C:\workspace\e_ide\2018-12_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.apache.xml.resolver_1.2.0.v201005080400.jar;C:\workspace\e_ide\2018-12_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.emf.workspace_1.5.1.201706061339.jar;C:\workspace\e_ide\2018-12_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\javax.xml_1.3.4.v201005080400.jar"
+			classpath="C:\workspace\e_ide\2020-09_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.fx.osgi_3.6.0.201907240103.jar;C:\workspace\e_ide\2020-09_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\com.google.guava_27.1.0.v20190517-1946.jar;C:\workspace\e_ide\2020-09_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.equinox.weaving.hook_1.2.500.v20190925-1452.jar;C:\workspace\e_ide\2020-09_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.sphinx.emf_0.11.2.201802230805.jar;C:\workspace\e_ide\2020-09_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.emf.validation_1.8.0.201812070911.jar;C:\workspace\e_ide\2020-09_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.osgi.compatibility.state_1.1.600.v20190814-1451.jar;C:\workspace\e_ide\2020-09_committer\plugins\org.eclipse.fx.ide.css.jfx8_3.5.0.201907240300.jar;C:\workspace\e_ide\2020-09_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.emf.transaction_1.9.1.201805140824.jar;C:\workspace\e_ide\2020-09_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.core.filesystem_1.7.600.v20191122-2104.jar;C:\workspace\e_ide\2020-09_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.emf.edit_2.16.0.v20190920-0401.jar;C:\workspace\e_ide\2020-09_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.core.commands_3.9.600.v20191122-2109.jar;C:\workspace\e_ide\2020-09_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.sphinx.platform_0.11.2.201802230805.jar;C:\workspace\e_ide\2020-09_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.apache.xml.resolver_1.2.0.v201005080400.jar;C:\workspace\e_ide\2020-09_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\javax.xml_1.3.4.v201005080400.jar;C:\workspace\e_ide\2020-09_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.emf.ecore_2.20.0.v20190920-0401.jar;C:\workspace\e_ide\2020-09_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.core.contenttype_3.7.500.v20190916-2125.jar;C:\workspace\e_ide\2020-09_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.emf.ecore.xmi_2.16.0.v20190528-0725.jar;C:\workspace\e_ide\2020-09_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.emf.workspace_1.5.1.201805140824.jar;C:\workspace\e_ide\2020-09_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.apache.xerces_2.9.0.v201101211617.jar;C:\workspace\e_ide\2020-09_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.equinox.transforms.hook_1.2.500.v20190714-1852.jar;C:\workspace\_tools\openjdk-1.8.0_265\jre\lib\jfxswt.jar;C:\workspace\e_ide\2020-09_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.core.expressions_3.6.600.v20191122-2104.jar;C:\workspace\e_ide\2020-09_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.apache.commons.cli_1.2.0.v201404270220.jar;C:\workspace\e_ide\2020-09_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.slf4j.api_1.7.2.v20121108-1250.jar;C:\workspace\e_ide\2020-09_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.equinox.region_1.4.600.v20191002-1632.jar;C:\workspace\e_ide\2020-09_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.equinox.preferences_3.7.600.v20191017-2055.jar;C:\workspace\e_ide\2020-09_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.apache.commons.math3_3.5.0.v20190611-1023.jar;C:\workspace\e_ide\2020-09_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.core.jobs_3.10.600.v20191122-2104.jar;C:\workspace\e_ide\2020-09_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.jdt.annotation_2.2.400.v20191120-1313.jar;C:\workspace\e_ide\2020-09_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.equinox.common_3.10.600.v20191004-1420.jar;C:\workspace\e_ide\2020-09_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.equinox.registry_3.8.600.v20191017-2055.jar;C:\workspace\e_ide\2020-09_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.xtext.xbase.lib_2.20.0.v20191202-0907.jar;C:\workspace\e_ide\2020-09_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.emf.common_2.17.0.v20190920-0401.jar;C:\workspace\e_ide\2020-09_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.equinox.app_1.4.300.v20190815-1535.jar;C:\workspace\e_ide\2020-09_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.core.resources_3.13.600.v20191122-2104.jar;C:\workspace\e_ide\2020-09_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.emf.ecore.change_2.14.0.v20190528-0725.jar;C:\workspace\e_ide\2020-09_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.core.runtime_3.17.0.v20191122-2104.jar;C:\workspace\e_ide\2020-09_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.emf.ecore.xcore.lib_1.4.0.v20190401-0856.jar;C:\workspace\e_ide\2020-09_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.osgi_3.15.100.v20191114-1701.jar;C:\workspace\e_ide\2020-09_committer\_ws\.metadata\.plugins\org.eclipse.pde.core\.bundle_pool\plugins\org.eclipse.sphinx.emf.workspace_0.11.2.201802230805.jar"
 			destdir="doc"
 			nodeprecated="false"
 			nodeprecatedlist="false"
-			noindex="true" nonavbar="true"
+			noindex="true"
+			nonavbar="true"
 			notree="true"
 			packagenames="org.eclipse.app4mc.amalthea.model.io"
 			source="1.8"
-			sourcefiles="${model-package}/AmaltheaIndex.java,${util-package}/FactoryUtil.java,${builder-package}/ConstraintsBuilder.java,${builder-package}/HardwareBuilder.java,${util-package}/CustomPropertyUtil.java,${util-package}/SoftwareUtil.java,${util-package}/RuntimeUtil.java,${builder-package}/DatatypeBuilder.java,${builder-package}/CommonElementsBuilder.java,${builder-package}/AmaltheaBuilder.java,${builder-package}/OperatingSystemBuilder.java,${util-package}/DeploymentUtil.java,${model-package}/AmaltheaMerger.java,${model-package}/AmaltheaServices.java,${builder-package}/MappingBuilder.java,${util-package}/HardwareUtil.java,${util-package}/TimeUtil.java,${builder-package}/SoftwareBuilder.java,${util-package}/ModelUtil.java,${builder-package}/InstructionsBuilder.java"
-			sourcepath="xtend-gen;src-gen;src"
+			sourcefiles="src/org/eclipse/app4mc/amalthea/model/AmaltheaIndex.java,src/org/eclipse/app4mc/amalthea/model/builder/ConstraintsBuilder.java,src/org/eclipse/app4mc/amalthea/model/util/SoftwareUtil.java,src/org/eclipse/app4mc/amalthea/model/util/RuntimeUtil.java,src/org/eclipse/app4mc/amalthea/model/builder/CommonElementsBuilder.java,src/org/eclipse/app4mc/amalthea/model/builder/AmaltheaBuilder.java,src/org/eclipse/app4mc/amalthea/model/util/DeploymentUtil.java,src/org/eclipse/app4mc/amalthea/model/AmaltheaMerger.java,src/org/eclipse/app4mc/amalthea/model/AmaltheaServices.java,src/org/eclipse/app4mc/amalthea/model/builder/MappingBuilder.java,src/org/eclipse/app4mc/amalthea/model/util/HardwareUtil.java,src/org/eclipse/app4mc/amalthea/model/util/TimeUtil.java,src/org/eclipse/app4mc/amalthea/model/util/WeibullUtil.java,src/org/eclipse/app4mc/amalthea/model/util/ConstraintsUtil.java,src/org/eclipse/app4mc/amalthea/model/util/ModelUtil.java,src/org/eclipse/app4mc/amalthea/model/AmaltheaCrossReferenceAdapter.java,src/org/eclipse/app4mc/amalthea/model/util/InstructionsUtil.java,src/org/eclipse/app4mc/amalthea/model/util/FactoryUtil.java,src/org/eclipse/app4mc/amalthea/model/AmaltheaExtensions.java,src/org/eclipse/app4mc/amalthea/model/AmaltheaServices2.java,src/org/eclipse/app4mc/amalthea/model/builder/HardwareBuilder.java,src/org/eclipse/app4mc/amalthea/model/util/CustomPropertyUtil.java,src/org/eclipse/app4mc/amalthea/model/builder/DatatypeBuilder.java,src/org/eclipse/app4mc/amalthea/model/AmaltheaValidations.java,src/org/eclipse/app4mc/amalthea/model/builder/OperatingSystemBuilder.java,src/org/eclipse/app4mc/amalthea/model/builder/SoftwareBuilder.java,src/org/eclipse/app4mc/amalthea/model/builder/InstructionsBuilder.java,src/org/eclipse/app4mc/amalthea/model/builder/StimuliBuilder.java"
+			sourcepath="xcore-gen;xtend-gen;src"
 			splitindex="false"
 			use="false"
 			version="true" />