diff --git a/gs-create-model/index.html b/gs-create-model/index.html
index 4e60389..fd499c2 100644
--- a/gs-create-model/index.html
+++ b/gs-create-model/index.html
@@ -272,7 +272,7 @@
 with <em>org.eclipse.amalthea.training.model</em>, then click <strong>Finish</strong><br />
 &nbsp;<br />
 <img src="https://www.eclipse.org/app4mc/images/gs-create-model/01-create-project.png" class="img-responsive"><br /></li>
-<li>The project created should appear in the <strong>Model Explorer</strong> view
+<li>The project created should appear in the <strong>Model Explorer</strong> view<br />
 <br /></li>
 </ul></li>
 
@@ -321,8 +321,8 @@
 <li><p>Create a label named <em>LabelA</em></p>
 
 <ul>
-<li>Under the <strong>Software</strong> item select the <strong>Labels</strong> item and right-click on <strong>New Child &gt; Label</strong>.<br />
-This will add a new child under <strong>Labels</strong> by default labeled <strong>Label</strong>.</li>
+<li>Select the <strong>Software</strong> item and right-click on <strong>New Child &gt; Label</strong>.<br />
+This will add a new child under <strong>Labels</strong>.</li>
 <li>Select this <em>Label</em> then click on the <strong>Properties</strong> tab below the tree editor to display the label properties.</li>
 <li>Click on the cell next to the property named <strong>Name</strong> and fill it with <em>LabelA</em>.<br />
 Press enter. The label item in the tree editor should be renamed <em>LabelA</em>.<br />
@@ -335,9 +335,9 @@
 <li><p>Create a Runnable named <em>Runnable1</em></p>
 
 <ul>
-<li>Under the <strong>Software</strong> item select the <strong>Runnables</strong> item and right-click on <strong>New Child &gt; Runnable</strong>.<br />
-This will add a new child under <strong>Runnables</strong> by default labeled <strong>Runnable</strong></li>
-<li>Select this <em>Runnable</em> then click on the <strong>Properties</strong> tab below the tree editor to name it <em>Runnable1</em>.
+<li>Select the <strong>Software</strong> item and right-click on <strong>New Child &gt; Runnable</strong>.<br />
+This will add a new child under <strong>Runnables</strong></li>
+<li>Select this <em>Runnable</em> then click on the <strong>Properties</strong> tab below the tree editor to name it <em>Runnable1</em>.<br />
 <br /></li>
 </ul></li>
 
@@ -345,20 +345,22 @@
 &nbsp;<br />
 <img src="https://www.eclipse.org/app4mc/images/gs-create-model/08-create-runnables.png" class="img-responsive"></p></li>
 
-<li><p>Expand the runnable named <em>Runnable1</em></p>
+<li><p>Select the runnable named <em>Runnable1</em></p>
 
 <ul>
-<li>Create an instance of * instructions (constant) 20 *
+<li>Right-click on <strong>New Child &gt; Call Graph</strong></li>
+<li>Create * 20 constant ticks*
 
 <ul>
-<li>From the context menu under <strong>Runnable Items</strong>, select <strong>New Child &gt; Instructions Constant</strong></li>
-<li>Select the child created then click on the <strong>Properties</strong> tab above the tree editor.</li>
+<li>From the context menu under <strong>Call Graph</strong>, select <strong>New Child &gt; Items &gt; Ticks</strong></li>
+<li>From the context menu under <strong>Ticks</strong>, select <strong>New Child &gt; Default &gt; Discrete Value Constant</strong></li>
+<li>Select the child created then click on the <strong>Properties</strong> tab below the tree editor.</li>
 <li>Change the value of the <strong>Value</strong> property to <em>20</em></li>
 </ul></li>
 <li>Create a <em>write access to LabelA</em>
 
 <ul>
-<li>Create another runnable item by selecting the menu item <strong>New Child &gt; Label Access</strong></li>
+<li>Create another call graph item by selecting the menu item <strong>New Child &gt; Items &gt; Label Access</strong></li>
 <li>Select the child created then click on the <strong>Properties</strong> tab above the tree editor.</li>
 <li>Select for the <strong>Access</strong> property the value <em>write</em></li>
 <li>Select for the <strong>Data</strong> property the value <em>Label LabelA</em><br />
@@ -368,19 +370,20 @@
 </ul></li>
 </ul></li>
 
-<li><p>Expand the runnable named <em>Runnable2</em> and, under its runnable items:</p>
+<li><p>Expand the runnable named <em>Runnable2</em> and, under its call graph:</p>
 
 <ul>
 <li>Create a <em>read access to LabelA</em></li>
-<li>Create a <em>25 constant instructions</em></li>
-<li>Create a <em>write access to LabelB</em></li>
+<li>Create <em>25 constant ticks</em></li>
+<li>Create a <em>write access to LabelB</em><br />
+<br /></li>
 </ul></li>
 
-<li><p>Expand the runnable named <em>Runnable3</em> and, under its runnable items:</p>
+<li><p>Expand the runnable named <em>Runnable3</em> and, under its call graph:</p>
 
 <ul>
 <li>Create a <em>read access to LabelB</em></li>
-<li>Create a <em>10 constant instructions</em><br />
+<li>Create <em>10 constant ticks</em><br />
 &nbsp;<br />
 <img src="https://www.eclipse.org/app4mc/images/gs-create-model/10-create-runnables-final.png" class="img-responsive"><br />
 <br /></li>
@@ -389,30 +392,24 @@
 <li><p>Create 3 tasks named respectively <em>Task1</em>, <em>Task2</em> and <em>Task3</em></p>
 
 <ul>
-<li>Under the <strong>Software</strong> item select the <strong>Tasks</strong> item and right-click on <strong>New Child &gt; Task</strong>.<br />
-It will add a new child by default labeled <strong>Task</strong>.</li>
+<li>Select the <strong>Software</strong> item and right-click on <strong>New Child &gt; Task</strong>.</li>
 <li>Select this <em>Task</em> then click on the <strong>Properties</strong> tab above the tree editor to name it <em>Task1</em>.</li>
-<li>Repeat these steps to create the 2 other tasks.</li>
+<li>Repeat these steps to create the 2 other tasks.<br />
+<br /></li>
 </ul></li>
 
 <li><p>Create a <em>CallGraph</em> for the task <em>Task1</em></p>
 
 <ul>
 <li>Right-click on the task named <em>Task1</em> then select the menu item <strong>New Child &gt; Call Graph</strong></li>
-<li>Create a Call Sequence <em>CS1</em>
+<li>Create a Runnable Call to <em>Runnable1</em>
 
 <ul>
-<li>Expand the task <em>Task1</em> to visualize its child</li>
-<li>Right-click on the <strong>Call Graph</strong> child then select the menu item <strong>New Child &gt; Graph Entries &gt; Call Sequence</strong></li>
-<li>Name this new call sequence <em>CS1</em></li>
-</ul></li>
-<li>Create a Task Runnable Call to <em>Runnable1</em>
-
-<ul>
-<li>Right-click on the call sequence <em>CS1</em><br />
-then select the menu item <strong>New Child &gt; Calls &gt; Task Runnable Call</strong></li>
+<li>Right-click on the call graph<br />
+then select the menu item <strong>New Child &gt; Items &gt; Runnable Call</strong></li>
 <li>Select the created child then click on the <strong>Properties</strong> tab<br />
-and set the <strong>Runnable</strong> property to <em>Runnable Runnable1</em>.</li>
+and set the <strong>Runnable</strong> property to <em>Runnable Runnable1</em>.<br />
+<br /></li>
 </ul></li>
 </ul></li>
 
@@ -420,16 +417,15 @@
 
 <ul>
 <li>Right-click on the task named <em>Task2</em> then select the menu item <strong>New Child &gt; Call Graph</strong></li>
-<li>Create a Call Sequence <em>CS1</em></li>
-<li>Create a Task Runnable Call to <em>Runnable2</em></li>
+<li>Create a Runnable Call to <em>Runnable2</em><br />
+<br /></li>
 </ul></li>
 
 <li><p>Create a <em>CallGraph</em> for the task <em>Task3</em></p>
 
 <ul>
 <li>Right-click on the task named <em>Task3</em> then select the menu item <strong>New Child &gt; Call Graph</strong></li>
-<li>Create a Call Sequence <em>CS1</em></li>
-<li>Create a Task Runnable Call to <em>Runnable3</em><br />
+<li>Create a Runnable Call to <em>Runnable3</em><br />
 &nbsp;<br />
 <img src="https://www.eclipse.org/app4mc/images/gs-create-model/11-create-task-runnable-calls.png" class="img-responsive"></li>
 </ul></li>
@@ -465,7 +461,8 @@
 <li>Right-click on the Stimuli Model and select the menu item <strong>New Child &gt; Stimuli &gt; Inter Process</strong></li>
 <li>Select the Inter Process node and name it <strong>Stimuli3</strong><br />
 &nbsp;<br />
-<img src="https://www.eclipse.org/app4mc/images/gs-create-model/12-create-stimuli.png" class="img-responsive"/></li>
+<img src="https://www.eclipse.org/app4mc/images/gs-create-model/12-create-stimuli.png" class="img-responsive"/><br />
+<br /></li>
 </ul></li>
 </ul></li>
 
@@ -494,8 +491,7 @@
 <ul>
 <li>Expand the <em>Task2</em>,</li>
 <li>Expand its <em>Call Graph</em> node</li>
-<li>Select the call sequence <strong>CS1</strong></li>
-<li>Right-click on the node and select the menu item <strong>New Child &gt; Calls &gt; Inter Process Activation</strong></li>
+<li>Right-click on the node and select the menu item <strong>New Child &gt; Items &gt; Inter Process Trigger</strong></li>
 <li>Select the created node and in the <em>Stimuli</em> property, select the Stiuli named <strong>Inter Process Stimuli3</strong></li>
 </ul></li>
 </ol>
@@ -510,128 +506,132 @@
 <li><p>Right-click on the AMALTHEA model on the tree editor then select the menu item <strong>New Child &gt; Hw Model</strong>.<br />
 It will add a child node named <strong>Hardware</strong> to the model</p></li>
 
-<li><p>Create a new system name <em>DemoSystem</em></p>
+<li><p>Create a new structure named <em>DemoSystem</em></p>
 
 <ul>
 <li>Select the <em>Hardware</em> node previously created</li>
-<li>Right-click on the item then select the menu item <strong>New Child &gt; System</strong>.</li>
-<li>Name the created item <em>DemoSystem</em> [PK: Is it expected that there is no type from this System?]</li>
+<li>Right-click on the item then select the menu item <strong>New Child &gt; Structure</strong>.</li>
+<li>Name the created item <em>DemoSystem</em></li>
+<li>Set the StructureType to <em>System</em><br />
+<br /></li>
 </ul></li>
 
 <li><p>Create a new ECU named <em>Ecu1</em></p>
 
 <ul>
-<li>Select the system named <em>DemoSystem</em></li>
-<li>Right-click on the item then select the menu item <strong>New Child &gt; ECU</strong>.</li>
+<li>Select the structure named <em>DemoSystem</em></li>
+<li>Right-click on the item then select the menu item <strong>New Child &gt; Structure</strong>.</li>
 <li>Name the created item <em>Ecu1</em></li>
+<li>Set the StructureType to <em>ECU</em><br />
+<br /></li>
 </ul></li>
 
 <li><p>Add a microcontroller named <em>MC1</em> to the ECU <em>Ecu1</em></p>
 
 <ul>
 <li>Select the ECU <em>Ecu1</em></li>
-<li>Right-click on the item then select the menu item <strong>New Child &gt; Microcontroller</strong>.</li>
+<li>Right-click on the item then select the menu item <strong>New Child &gt; Structure</strong>.</li>
 <li>Name the created item <em>MC1</em></li>
+<li>Set the StructureType to <em>Microcontroller</em><br />
+<br /></li>
 </ul></li>
 
-<li><p>Create a memory type named <em>GlobalMemoryType</em></p>
+<li><p>Create a memory definition named <em>GlobalMemoryType</em></p>
 
 <ul>
 <li>Select the <em>Hardware</em> node under the AMALTHEA model node</li>
-<li>Right-click on the item then select the menu item <strong>New Child &gt; Memory type</strong>.</li>
+<li>Right-click on the item then select the menu item <strong>New Child &gt; Definitions &gt; Memory Definition</strong>.</li>
 <li>Set the name to <em>GlobalMemoryType</em></li>
 <li>Set the size of memory to <em>512</em> (bytes)</li>
-<li>Set the type of memory to RAM</li>
+<li>Set the type of memory to RAM<br />
+<br /></li>
 </ul></li>
 
 <li><p>Add a memory named <em>GlobalMemory</em> to <em>MC1</em></p>
 
 <ul>
 <li>Select the microcontroller <em>MC1</em></li>
-<li>Right-click on the item then select the menu item <strong>New Child &gt; Memory</strong></li>
+<li>Right-click on the item then select the menu item <strong>New Child &gt; Modules &gt; Memory</strong></li>
 <li>Name the created item <em>GlobalMemory</em></li>
-<li>Set the type to <em>Memory Type GlobalMemoryType</em></li>
+<li>Set the definition to <em>Memory Definition GlobalMemoryType</em><br />
+<br /></li>
 </ul></li>
 
-<li><p>Add a quartz &ldquo;100MHz&rdquo; to &ldquo;MC1&rdquo;</p>
+<li><p>Create a frequency domain &ldquo;100MHz&rdquo;</p>
 
 <ul>
-<li>Select the microcontroller <em>MC1</em></li>
-<li>Right-click on the item then select the menu item <strong>New Child &gt; Quartz</strong></li>
+<li>Select the <em>Hardware</em> node under the AMALTHEA model node</li>
+<li>Right-click on the item then select the menu item <strong>New Child &gt; Domains &gt; Frequency Domain</strong>.</li>
 <li>Name the created item <em>100MHz</em></li>
-<li>Set the <strong>Frequency</strong> property to <em>100000000</em></li>
+<li>Right-click on the item then select the menu item <strong>New Child &gt; Default Value</strong></li>
+<li>Set value to 100.0 and unit to MHz<br />
+<br /></li>
 </ul></li>
 
-<li><p>Create a core type named <em>CT1</em></p>
+<li><p>Create a frequency domain &ldquo;200MHz&rdquo;</p></li>
+
+<li><p>Create a processing unit definition named <em>CT1</em></p>
 
 <ul>
 <li>Select the <em>Hardware</em> node under the AMALTHEA model node</li>
-<li>Right-click on the item then select the menu item <strong>New Child &gt; Core type</strong></li>
+<li>Right-click on the item then select the menu item <strong>New Child &gt; Definitions &gt; Processing Unit Definition</strong></li>
 <li>Set the name to <em>CT1</em></li>
-<li>Set <strong>Instructions Per Cycle</strong> roperty of the core type to <em>1</em></li>
+<li>Set Pu Type to <em>CPU</em><br />
+<br /></li>
 </ul></li>
 
-<li><p>Add a core &ldquo;Core1&rdquo; to &ldquo;MC1&rdquo;</p>
+<li><p>Add a processing unit &ldquo;Core1&rdquo; to &ldquo;MC1&rdquo;</p>
 
 <ul>
 <li>Select the microcontroller <em>MC1</em></li>
-<li>Right-click on the item then select the menu item <strong>New Child &gt; Core</strong></li>
+<li>Right-click on the item then select the menu item <strong>New Child &gt; Modules &gt; Processing Unit</strong></li>
 <li>Name the created item <em>Core1</em></li>
-<li>Set core type of &ldquo;Core1&rdquo; to &ldquo;CT1&rdquo;</li>
+<li>Set definition of &ldquo;Core1&rdquo; to &ldquo;CT1&rdquo;</li>
+<li>Set frequency domain of &ldquo;Core1&rdquo; to &ldquo;100MHz&rdquo;<br />
+<br /></li>
 </ul></li>
 
-<li><p>Add a <strong>Prescaler</strong> named <em>PS1</em> to <em>Core1</em></p>
+<li><p>Add a processing unit &ldquo;Core2&rdquo; to &ldquo;MC1&rdquo;</p>
 
 <ul>
-<li>Select the core <em>Core1</em></li>
-<li>Right-click on the item then select the menu item <strong>New Child &gt; Prescaler</strong></li>
-<li>Name the created item <em>PS1</em></li>
-<li>Set the <strong>Clock Ratio</strong> property to <em>1.0</em></li>
-<li>Set the <strong>Quartz</strong> property to &ldquo;100Mhz&rdquo;</li>
+<li>Select the microcontroller <em>MC1</em></li>
+<li>Right-click on the item then select the menu item <strong>New Child &gt; Modules &gt; Processing Unit</strong></li>
+<li>Name the created item <em>Core2</em></li>
+<li>Set definition of &ldquo;Core2&rdquo; to &ldquo;CT1&rdquo;</li>
+<li>Set frequency domain of &ldquo;Core2&rdquo; to &ldquo;200MHz&rdquo;<br />
+<br /></li>
 </ul></li>
 
-<li><p>Add a core &ldquo;Core2&rdquo; to &ldquo;MC1&rdquo;</p>
+<li><p>Add an access element from &ldquo;Core1&rdquo; to &ldquo;GlobalMemory&rdquo;</p>
 
 <ul>
-<li>Set core type of &ldquo;Core2&rdquo; to &ldquo;CT1&rdquo;</li>
-</ul></li>
-
-<li><p>Add a <strong>Prescaler</strong> named <em>PS2</em> to <em>Core2</em></p>
+<li>Create an access element named <em>Path1</em>
 
 <ul>
-<li>Add prescaler &ldquo;PS2&rdquo; to &ldquo;Core1&rdquo;</li>
-<li>Set the <strong>Clock Ratio</strong> property to 2.0</li>
-<li>Set the <strong>Quartz</strong> property to &ldquo;100Mhz&rdquo;</li>
-</ul></li>
-
-<li><p>Add a <strong>Latency Path</strong> from cores to memory</p>
-
-<ul>
-<li>Create a <strong>Latency Access Path</strong> named <em>Path1</em>
-
-<ul>
-<li>Select the <em>Hardware</em> node under the AMALTHEA model node</li>
-<li>Right-click on the item then select the menu item <strong>New Child &gt; Access Paths &gt; Latency Access Path</strong></li>
+<li>Select &ldquo;Core1&rdquo;</li>
+<li>Right-click on the item then select the menu item <strong>New Child &gt; Access Element</strong></li>
 <li>Name the created item <em>Path1</em></li>
-<li>Set the <strong>Source</strong> property to <em>Core Core1</em></li>
-<li>Set the <strong>Target</strong> property to <em>Memory GlobalMemory</em></li>
+<li>Set the <strong>Destination</strong> property to <em>Memory GlobalMemory</em></li>
 </ul></li>
-<li>Create a <strong>Latency Access Path</strong> named <em>Path2</em>
+<li>Add a constant read latency to &ldquo;Path1&rdquo; with value 10 (cycles)
 
 <ul>
-<li>Set the <strong>Source</strong> property to <em>Core Core1</em></li>
-<li>Set the <strong>Target</strong> property to <em>Memory GlobalMemory</em></li>
-</ul></li>
-<li>Add a constant latency to &ldquo;Path1&rdquo; with access type &ldquo;RW&rdquo;, quartz &ldquo;100Mhz&rdquo; and value 20
-
-<ul>
-<li>Select the path <em>Path1</em></li>
-<li>Right-click on the item then select the menu item <strong>New Child &gt; Latencies &gt; Latency Constant</strong></li>
+<li>Select the access element <em>Path1</em></li>
+<li>Right-click on the item then select the menu item <strong>New Child &gt; Read Latency &gt; Discrete Value Constant</strong></li>
 <li>Select the created item</li>
-<li>Set the <strong>Access Type</strong> property to <em>RW</em></li>
-<li>Set the <strong>Quartz</strong> property to <em>Quartz 100Mhz</em></li>
 <li>Set the <strong>Value</strong> property to <em>20</em></li>
 </ul></li>
+<li>Add a constant write latency to &ldquo;Path1&rdquo; with value 10 (cycles)<br />
+<br /></li>
+</ul></li>
+
+<li><p>Add an access element from &ldquo;Core2&rdquo; to &ldquo;GlobalMemory&rdquo;</p>
+
+<ul>
+<li>Create an access element named <em>Path2</em></li>
+<li>Add a constant read latency to &ldquo;Path2&rdquo; with value 20 (cycles)</li>
+<li>Add a constant write latency to &ldquo;Path2&rdquo; with value 20 (cycles)<br />
+<br /></li>
 </ul></li>
 
 <li><p>Optional: Feel free to add more memory elements to represent local memories
@@ -657,7 +657,8 @@
 <ul>
 <li>Select the <em>Operating System</em> node previously created</li>
 <li>Right-click on the item then select the menu item <strong>New Child &gt; Operating Systems &gt; Operating System</strong>.</li>
-<li>Name the created item <em>Default</em></li>
+<li>Name the created item <em>Default</em><br />
+<br /></li>
 </ul></li>
 
 <li><p>Add a Task Scheduler named <em>Scheduler1</em></p>
@@ -665,21 +666,16 @@
 <ul>
 <li>Right-click on the <em>Default</em> operating system
 then select the menu item <strong>New Child &gt; Task Scheduler</strong></li>
-<li>Name the created item <em>Scheduler1</em></li>
+<li>Name the created item <em>Scheduler1</em><br />
+<br /></li>
 </ul></li>
 
 <li><p>Add scheduling algorithm OSEK to <em>Scheduler1</em></p>
 
 <ul>
 <li>Right-click on the <em>Scheduler1</em> task scheduler
-then select the menu item <strong>New Child &gt; Scheduling Algorithm &gt; OSEK</strong></li>
-</ul></li>
-
-<li><p>Add a Scheduling HW Unit to <em>Scheduler1</em></p>
-
-<ul>
-<li>Right-click on the <em>Scheduler1</em> task scheduler
-then select the menu item <strong>New Child &gt; Scheduling Unit &gt; Scheduling HW Unit</strong></li>
+then select the menu item <strong>New Child &gt; Scheduling Algorithm &gt; OSEK</strong><br />
+<br /></li>
 </ul></li>
 
 <li><p>Add a Task Scheduler named <em>Scheduler2</em></p></li>
@@ -710,7 +706,8 @@
 <li>Select the folder <em>model1</em> created during the paragraph <strong>General model setup</strong></li>
 <li>Right-click on the mouse and select the menu item <strong>New &gt; AMALTHEA Model</strong></li>
 <li>Press <strong>Next</strong> to define the associated model file naming it <em>constraints.amxmi</em><br />
-then press on <strong>Finish</strong> to create an empty model.</li>
+then press on <strong>Finish</strong> to create an empty model.<br />
+<br /></li>
 </ul></li>
 
 <li><p>Right-click on the AMALTHEA model on the tree editor then select the menu item <strong>New Child &gt; Constraints Model</strong>.<br />
@@ -722,7 +719,8 @@
 <li>Select the <strong>Constraints</strong> item on the tree editor</li>
 <li>Right-click on the mouse and select the menu item <strong>New Child &gt; Requirements &gt; Process Requirement</strong></li>
 <li>Name the created item <em>DeadlineTask1</em></li>
-<li>Set the <strong>Process</strong> property to the value <em>Task Task1</em></li>
+<li>Set the <strong>Process</strong> property to the value <em>Task Task1</em><br />
+<br /></li>
 </ul></li>
 
 <li><p>Add a Time Requirement Limit to &ldquo;DeadlineTask1&rdquo; Process Requirement</p>
@@ -737,7 +735,8 @@
 <ul>
 <li>Right-click the mouse on the <em>ResponseTime</em> item and select the menu item <strong>New Child &gt; Limit Value</strong></li>
 <li>Set the <strong>Unit</strong> property of the new item to <em>ms</em></li>
-<li>Set the <strong>Value</strong> property to <em>10</em></li>
+<li>Set the <strong>Value</strong> property to <em>10</em><br />
+<br /></li>
 </ul></li>
 </ul></li>
 
@@ -794,41 +793,34 @@
 <li><p>Right-click on the AMALTHEA model on the tree editor then select the menu item <strong>New Child &gt; Mapping Model</strong>.<br />
 It will add a child node named <strong>Mapping</strong> to the model</p></li>
 
-<li><p>Add a <strong>Task Allocation</strong> element to the Mapping</p>
+<li><p>Add a <strong>Scheduler Allocation</strong> element Scheduler1 -&gt; Core1</p>
 
 <ul>
 <li>Right-click the mouse on the <em>Mapping</em> item and select<br />
-the menu item <strong>New Child &gt; Process Allocation &gt; Task Allocation</strong></li>
-<li>Set the <strong>Process</strong> property to <em>Task Task1</em></li>
-<li>Set the <strong>Scheduler</strong> property to <em>Task Scheduler Scheduler1</em></li>
+the menu item <strong>New Child &gt; Scheduler Allocation</strong></li>
+<li>Set the <strong>Scheduler</strong> property to <em>Task Scheduler Scheduler1</em><br /></li>
+<li>Set the <strong>Responsibility</strong> property to <em>Processing Unit Core1</em><br />
+<br /></li>
 </ul></li>
 
-<li><p>Add a second <strong>Task Allocation</strong> element to the Mapping and<br />
-set the <strong>Process</strong> to <em>Task2</em> and the <strong>Scheduler</strong> to <em>Scheduler1</em></p></li>
+<li><p>Add a <strong>Scheduler Allocation</strong> element Scheduler2 -&gt; Core2</p></li>
 
-<li><p>Add a third <strong>Task Allocation</strong> element to the Mapping<br />
-and set the <strong>Process</strong> to <em>Task3</em> and the <strong>Scheduler</strong> to <em>Scheduler2</em></p></li>
+<li><p>Add a <strong>Task Allocation</strong> element Task1 -&gt; Scheduler1<br />
+set the <strong>Task</strong> to <em>Task1</em> and the <strong>Scheduler</strong> to <em>Scheduler1</em></p></li>
 
-<li><p>Under the Mapping item add a <strong>Core Allocation</strong> element</p>
+<li><p>Add a <strong>Task Allocation</strong> element Task2 -&gt; Scheduler1</p></li>
 
-<ul>
-<li>Right-click the mouse on the <em>Mapping</em> item<br />
-and select the menu item <strong>New Child &gt; Core Allocation</strong></li>
-<li>Set the <strong>Core</strong> property to <em>Core Core1</em></li>
-<li>Set the <strong>Scheduler</strong> property to <em>Task Scheduler Scheduler1</em></li>
-</ul></li>
+<li><p>Add a <strong>Task Allocation</strong> element Task3 -&gt; Scheduler2</p></li>
 
-<li><p>Add a second <strong>Core Allocation</strong> element and set
-the <strong>Core</strong> to <em>Core Core2</em> and the <strong>Scheduler</strong> to <em>Scheduler2</em></p></li>
-
-<li><p>Add an Abstract Element Mapping at least for all Labels to map them to <em>GlobalMemory</em></p>
+<li><p>Add a <strong>Memory Mapping</strong> at least for all Labels to map them to <em>GlobalMemory</em></p>
 
 <ul>
 <li>Right-click the mouse on the <em>Mapping</em> item and select<br />
-the menu item <strong>New Child &gt; Mapping &gt; Abstract Element Mapping</strong></li>
+the menu item <strong>New Child &gt; Memory Mapping</strong></li>
 <li>Set the <strong>Abstract Element</strong> property to <em>Label LabelA</em></li>
-<li>Set the <strong>Mem</strong> property to <em>Memory GlobalMemory</em></li>
-<li>Repeat the last 3 steps steps for the <em>Label LabelB</em></li>
+<li>Set the <strong>Memory</strong> property to <em>Memory GlobalMemory</em></li>
+<li>Repeat the last 3 steps steps for the <em>Label LabelB</em><br />
+<br /></li>
 </ul></li>
 
 <li><p>Optional: If more memories are available, make a proper assignment to other memory elements.</p></li>
diff --git a/images/gs-create-model/05-create-model.png b/images/gs-create-model/05-create-model.png
index 25c89c0..eccfaf3 100644
--- a/images/gs-create-model/05-create-model.png
+++ b/images/gs-create-model/05-create-model.png
Binary files differ
diff --git a/images/gs-create-model/06-create-sw-model.png b/images/gs-create-model/06-create-sw-model.png
index b44dffd..b33d272 100644
--- a/images/gs-create-model/06-create-sw-model.png
+++ b/images/gs-create-model/06-create-sw-model.png
Binary files differ
diff --git a/images/gs-create-model/07-create-label.png b/images/gs-create-model/07-create-label.png
index 14c833c..acd0752 100644
--- a/images/gs-create-model/07-create-label.png
+++ b/images/gs-create-model/07-create-label.png
Binary files differ
diff --git a/images/gs-create-model/08-create-runnables.png b/images/gs-create-model/08-create-runnables.png
index ffc23fd..6cea3c2 100644
--- a/images/gs-create-model/08-create-runnables.png
+++ b/images/gs-create-model/08-create-runnables.png
Binary files differ
diff --git a/images/gs-create-model/09-create-runnable1-label-access.png b/images/gs-create-model/09-create-runnable1-label-access.png
index 511e492..ddee2d0 100644
--- a/images/gs-create-model/09-create-runnable1-label-access.png
+++ b/images/gs-create-model/09-create-runnable1-label-access.png
Binary files differ
diff --git a/images/gs-create-model/10-create-runnables-final.png b/images/gs-create-model/10-create-runnables-final.png
index 3a9d82f..3a2483d 100644
--- a/images/gs-create-model/10-create-runnables-final.png
+++ b/images/gs-create-model/10-create-runnables-final.png
Binary files differ
diff --git a/images/gs-create-model/11-create-task-runnable-calls.png b/images/gs-create-model/11-create-task-runnable-calls.png
index bbefcb6..55de49c 100644
--- a/images/gs-create-model/11-create-task-runnable-calls.png
+++ b/images/gs-create-model/11-create-task-runnable-calls.png
Binary files differ
diff --git a/images/gs-create-model/12-create-stimuli.png b/images/gs-create-model/12-create-stimuli.png
index 407e6e0..ed5538d 100644
--- a/images/gs-create-model/12-create-stimuli.png
+++ b/images/gs-create-model/12-create-stimuli.png
Binary files differ
diff --git a/images/gs-create-model/13-task1-stimulus-1.png b/images/gs-create-model/13-task1-stimulus-1.png
index 89d955e..125a5f2 100644
--- a/images/gs-create-model/13-task1-stimulus-1.png
+++ b/images/gs-create-model/13-task1-stimulus-1.png
Binary files differ
diff --git a/images/gs-create-model/15-hardware.png b/images/gs-create-model/15-hardware.png
index 033a189..9d8c66e 100644
--- a/images/gs-create-model/15-hardware.png
+++ b/images/gs-create-model/15-hardware.png
Binary files differ
diff --git a/images/gs-create-model/16-operating-system.png b/images/gs-create-model/16-operating-system.png
index 1c898a2..597a2a4 100644
--- a/images/gs-create-model/16-operating-system.png
+++ b/images/gs-create-model/16-operating-system.png
Binary files differ
diff --git a/images/gs-create-model/17-constraints.png b/images/gs-create-model/17-constraints.png
index 904c980..f5abad1 100644
--- a/images/gs-create-model/17-constraints.png
+++ b/images/gs-create-model/17-constraints.png
Binary files differ
diff --git a/images/gs-create-model/18-mapping.png b/images/gs-create-model/18-mapping.png
index c5ff1b9..ec12d25 100644
--- a/images/gs-create-model/18-mapping.png
+++ b/images/gs-create-model/18-mapping.png
Binary files differ
diff --git a/index.xml b/index.xml
index 8a4adb3..420b16c 100644
--- a/index.xml
+++ b/index.xml
Binary files differ
diff --git a/models/org.eclipse.app4mc.amalthea.solution1.zip b/models/org.eclipse.app4mc.amalthea.solution1.zip
index 5355573..7e67acf 100644
--- a/models/org.eclipse.app4mc.amalthea.solution1.zip
+++ b/models/org.eclipse.app4mc.amalthea.solution1.zip
Binary files differ
diff --git a/sitemap.xml b/sitemap.xml
index 86ed8c6..0e23ce8 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -28,6 +28,11 @@
   </url>
   
   <url>
+    <loc>https://www.eclipse.org/app4mc/gs-create-model/</loc>
+    <lastmod>2019-08-02T00:00:00+00:00</lastmod>
+  </url>
+  
+  <url>
     <loc>https://www.eclipse.org/app4mc/news/2019-05-02-release-0-9-4/</loc>
     <lastmod>2019-05-02T00:00:00+00:00</lastmod>
   </url>
@@ -143,11 +148,6 @@
   </url>
   
   <url>
-    <loc>https://www.eclipse.org/app4mc/gs-create-model/</loc>
-    <lastmod>2016-05-13T00:00:00+00:00</lastmod>
-  </url>
-  
-  <url>
     <loc>https://www.eclipse.org/app4mc/news/2016-04-07_parallel_2016_app4mc_platform/</loc>
     <lastmod>2016-04-07T00:00:00+00:00</lastmod>
   </url>