diff --git a/com.minres.projects.setup b/com.minres.projects.setup
index 886af10..ae29e84 100644
--- a/com.minres.projects.setup
+++ b/com.minres.projects.setup
@@ -45,7 +45,7 @@
   <project href="projects/RDL-Editor.setup?name='RDL.Editor'#/"/>
   <project href="projects/SCViewer.setup?name='SCViewer'#/"/>
   <project href="projects/SystemC-Quickstart.setup?name='systemc.quickstart'#/"/>
-  <project href="projects/JIT-ISS-CoreDsl.setup?name='JIT.ISS.CoreDsl'#/"/>
-  <project href="projects/Mendel.setup?name='mendel'#/"/>
+  <project href="projects/JIT-ISS-CoreDsl.setup?name='CoreDsl'#/"/>
+  <project href="projects/Mendel.setup?name='Mendel'#/"/>
   <description>MINRES provided cool projects.</description>
 </setup:ProjectCatalog>
diff --git a/projects/DBT-RISE-RISCV.setup b/projects/DBT-RISE-RISCV.setup
index 47ef61a..5e85c8d 100644
--- a/projects/DBT-RISE-RISCV.setup
+++ b/projects/DBT-RISE-RISCV.setup
@@ -124,6 +124,16 @@
           label="HTTPS (read-only, anonymous)"/>
       <description>Choose from the available Github URIs</description>
     </setupTask>
+    <setupTask
+        xsi:type="setup:VariableTask"
+        name="git-stream"
+        label="Stream to checkout">
+      <choice
+          value="master"/>
+      <choice
+          value="develop"/>
+      <description>Stream to checkout</description>
+    </setupTask>
   </setupTask>
   <setupTask
       xsi:type="setup:EclipseIniTask"
@@ -182,18 +192,7 @@
     <sourceLocator
         rootFolder="${git.clone.dbt_rise_riscv.location}"/>
   </setupTask>
-  <stream name="master">
-    <setupTask
-        xsi:type="setup:EclipseIniTask"
-        option="-Doomph.redirection.dbt_rise_riscv"
-        value="=https://git.eclipse.org/c/Minres/oomph-setups.git.git/plain//DBT-RISE-RISCV.setup->${git.clone.dbt_rise_riscv.location|uri}//DBT-RISE-RISCV.setup"
-        vm="true">
-      <description>
-        Set an Oomph redirection system property to redirect the
-        logical location of this setup to its physical location in the Git
-        clone.
-      </description>
-    </setupTask>
-  </stream>
+  <stream name="${git-stream}"
+      label="Stream to checkout"/>
   <description>An instruction set simulator based on DBT-RISE implementing the RISC-V ISA.</description>
 </setup:Project>
diff --git a/projects/JIT-ISS-CoreDsl.setup b/projects/JIT-ISS-CoreDsl.setup
index 5b82dd6..75d6570 100644
--- a/projects/JIT-ISS-CoreDsl.setup
+++ b/projects/JIT-ISS-CoreDsl.setup
@@ -12,8 +12,8 @@
     xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/1.0"
     xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/workingsets/1.0"
     xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/jdt/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/oomph/setup/pde/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/PDE.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/projects/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Projects.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore"
-    name="JIT.ISS.CoreDsl"
-    label="JIT ISS CoreDsl (non-public)">
+    name="CoreDsl"
+    label="CoreDsl (non-public)">
   <setupTask
       xsi:type="setup:CompoundTask"
       name="Global Variables">
@@ -28,10 +28,10 @@
         xsi:type="setup:VariableTask"
         name="minres-git-stream"
         label="Stream to checkout">
-      <choice
-          value="develop"/>
       <choice
           value="master"/>
+      <choice
+          value="develop"/>
       <description>Stream to checkout</description>
     </setupTask>
   </setupTask>
@@ -73,7 +73,7 @@
   </setupTask>
   <setupTask
       xsi:type="git:GitCloneTask"
-      id="git.clone.JIT.ISS.CoreDsl"
+      id="git.clone.CoreDsl"
       filter=""
       remoteURI="https://${minres.git.user.id}@minres.com/git/SystemC/JIT-ISS-CoreDsl.git">
     <description>${scope.project.label}</description>
@@ -81,7 +81,7 @@
   <setupTask
       xsi:type="projects:ProjectsImportTask">
     <sourceLocator
-        rootFolder="${git.clone.JIT.ISS.CoreDsl.location}"
+        rootFolder="${git.clone.CoreDsl.location}"
         locateNestedProjects="true"/>
   </setupTask>
   <setupTask
@@ -103,14 +103,6 @@
     <description>Sets the CoreDSL target platform</description>
   </setupTask>
   <stream name="${minres-git-stream}"
-      label="Stream to checkout">
-    <setupTask
-        xsi:type="setup:EclipseIniTask"
-        option="-Doomph.redirection.JIT.ISS.CoreDsl"
-        value="=https://git.eclipse.org/c/Minres/oomph-setups.git.git/plain//JITISSCoreDsl.setup->${git.clone.JIT.ISS.CoreDsl.location|uri}//JITISSCoreDsl.setup"
-        vm="true">
-      <description>Set an Oomph redirection system property to redirect the logical location of this setup to its physical location in the Git clone.</description>
-    </setupTask>
-  </stream>
+      label="Stream to checkout"/>
   <description>A Xtext based CoreDSL editor with syntax highlighting and context sensitive help.</description>
 </setup:Project>
diff --git a/projects/Mendel.setup b/projects/Mendel.setup
index e39d2d4..0643f69 100644
--- a/projects/Mendel.setup
+++ b/projects/Mendel.setup
@@ -12,7 +12,7 @@
     xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/1.0"
     xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/workingsets/1.0"
     xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/jdt/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/oomph/setup/pde/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/PDE.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/projects/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Projects.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore"
-    name="mendel"
+    name="Mendel"
     label="Mendel (non-public)">
   <setupTask
       xsi:type="setup:CompoundTask"
@@ -28,10 +28,10 @@
         xsi:type="setup:VariableTask"
         name="minres-git-stream"
         label="Stream to checkout">
-      <choice
-          value="develop"/>
       <choice
           value="master"/>
+      <choice
+          value="develop"/>
       <description>Stream to checkout</description>
     </setupTask>
   </setupTask>
@@ -99,11 +99,8 @@
     <workingSet
         name="${scope.project.name} Features">
       <predicate
-          xsi:type="predicates:AndPredicate">
-        <operand
-            xsi:type="predicates:LocationPredicate"
-            pattern="${git.clone.mendel.location}/features/.*"/>
-      </predicate>
+          xsi:type="predicates:LocationPredicate"
+          pattern="${git.clone.mendel.location}/features/.*"/>
     </workingSet>
     <description>The dynamic working sets for ${scope.project.label}</description>
   </setupTask>
@@ -121,7 +118,10 @@
               pattern="com.minres.sbml_editor.product"/>
           <operand
               xsi:type="predicates:NamePredicate"
-              pattern="com\.minres\.mendel\.models\.sbml"/>
+              pattern="com\.minres\.mendel\.models\.sbml\.diagram\..*"/>
+          <operand
+              xsi:type="predicates:NamePredicate"
+              pattern="com\.minres\.mendel\.models\.sbml\.editor"/>
         </operand>
         <operand
             xsi:type="predicates:LocationPredicate"
@@ -135,11 +135,8 @@
     <workingSet
         name="${scope.project.name} Tests">
       <predicate
-          xsi:type="predicates:AndPredicate">
-        <operand
-            xsi:type="predicates:LocationPredicate"
-            pattern="${git.clone.mendel.location}/tests/.*"/>
-      </predicate>
+          xsi:type="predicates:LocationPredicate"
+          pattern="${git.clone.mendel.location}/tests/.*"/>
     </workingSet>
     <description>The dynamic working sets for ${scope.project.label}</description>
   </setupTask>
@@ -148,11 +145,8 @@
     <workingSet
         name="${scope.project.name} Releng">
       <predicate
-          xsi:type="predicates:AndPredicate">
-        <operand
-            xsi:type="predicates:LocationPredicate"
-            pattern="${git.clone.mendel.location}/releng/.*"/>
-      </predicate>
+          xsi:type="predicates:LocationPredicate"
+          pattern="${git.clone.mendel.location}/releng/.*"/>
     </workingSet>
     <description>The dynamic working sets for ${scope.project.label}</description>
   </setupTask>
@@ -161,11 +155,8 @@
     <workingSet
         name="${scope.project.name} 3rd Party">
       <predicate
-          xsi:type="predicates:AndPredicate">
-        <operand
-            xsi:type="predicates:LocationPredicate"
-            pattern="${git.clone.mendel.location}/3rdparty/.*"/>
-      </predicate>
+          xsi:type="predicates:LocationPredicate"
+          pattern="${git.clone.mendel.location}/3rdparty/.*"/>
     </workingSet>
     <description>The dynamic working sets for ${scope.project.label}</description>
   </setupTask>
@@ -174,11 +165,8 @@
     <workingSet
         name="${scope.project.name} Plugins">
       <predicate
-          xsi:type="predicates:AndPredicate">
-        <operand
-            xsi:type="predicates:LocationPredicate"
-            pattern="${git.clone.mendel.location}/bundles/.*"/>
-      </predicate>
+          xsi:type="predicates:LocationPredicate"
+          pattern="${git.clone.mendel.location}/bundles/.*"/>
     </workingSet>
     <description>The dynamic working sets for ${scope.project.label}</description>
   </setupTask>
@@ -187,23 +175,13 @@
     <workingSet
         name="${scope.project.name} C++">
       <predicate
-          xsi:type="predicates:AndPredicate">
-        <operand
-            xsi:type="predicates:LocationPredicate"
-            pattern="${git.clone.mendel.location}/C\+\+/.*"/>
-      </predicate>
+          xsi:type="predicates:LocationPredicate"
+          pattern="${git.clone.mendel.location}/C\+\+/.*"/>
     </workingSet>
     <description>The dynamic working sets for ${scope.project.label}</description>
   </setupTask>
   <stream name="${minres-git-stream}"
-      label="Stream">
-    <setupTask
-        xsi:type="setup:EclipseIniTask"
-        option="-Doomph.redirection.mendel"
-        value="=https://git.eclipse.org/c/Minres/oomph-setups.git.git/plain//Mendel.setup->${git.clone.mendel.location|uri}//mendel.setup"
-        vm="true">
-      <description>Set an Oomph redirection system property to redirect the logical location of this setup to its physical location in the Git clone.</description>
-    </setupTask>
+      label="Stream to checkout">
     <description></description>
   </stream>
   <description>A Xtext based CoreDSL editor with syntax highlighting and context sensitive help.</description>
diff --git a/projects/RDL-Editor.setup b/projects/RDL-Editor.setup
index 995a355..2f7b6a4 100644
--- a/projects/RDL-Editor.setup
+++ b/projects/RDL-Editor.setup
@@ -14,204 +14,205 @@
     xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/jdt/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/oomph/setup/pde/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/PDE.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/projects/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Projects.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore"
     name="RDL.Editor"
     label="RDL Editor">
+  <setupTask
+      xsi:type="setup:CompoundTask"
+      name="Global Variables">
     <setupTask
-        xsi:type="setup:CompoundTask"
-        name="Global Variables">
-      <setupTask
-          xsi:type="setup:VariableTask"
-          name="github.user.id"
-          defaultValue="anonymous"
-          label="Github user ID">
-        <description>The user ID of the Github account</description>
-      </setupTask>
-      <setupTask
-          xsi:type="setup:VariableTask"
-          name="github.author.name"
-          label="Github author name">
-        <description>The author name used for Github commits</description>
-      </setupTask>
-      <setupTask
-          xsi:type="setup:VariableTask"
-          name="github.author.email"
-          label="Github author email">
-        <description>The email address associated with Github commits</description>
-      </setupTask>
-      <setupTask
-          xsi:type="setup:VariableTask"
-          type="PASSWORD"
-          name="github.user.password"
-          label="Github password for issues">
-        <annotation
-            source="http://www.eclipse.org/oomph/setup/PasswordVerificationDisabled">
-          <detail
-              key="type">
-            <value>form</value>
-          </detail>
-          <detail
-              key="form.url">
-            <value>https://github.com/session</value>
-          </detail>
-          <detail
-              key="form.cookie">
-            <value>PHPSESSID</value>
-          </detail>
-          <detail
-              key="form.parameters">
-            <value>login password authenticity_token utf8 commit</value>
-          </detail>
-          <detail
-              key="form.secure.parameters">
-            <value>password</value>
-          </detail>
-          <detail
-              key="form.filter">
-            <value>login=anonymous\&amp;.*</value>
-          </detail>
-          <detail
-              key="form.parameter.login">
-            <value>$${github.user.id}</value>
-          </detail>
-          <detail
-              key="form.parameter.password">
-            <value>$${value}</value>
-          </detail>
-          <detail
-              key="form.parameter.utf8">
-            <value>✓</value>
-          </detail>
-          <detail
-              key="form.parameter.commit">
-            <value>Sign in</value>
-          </detail>
-          <detail
-              key="form.ok">
-            <value>Valid password for $${form.parameter.login} at $${form.url}.</value>
-          </detail>
-          <detail
-              key="form.info">
-            <value>Validate the password for $${form.parameter.login} at $${form.url}.</value>
-          </detail>
-          <detail
-              key="form.warning">
-            <value>Unable to validate the password for $${form.parameter.login} because $${form.url} is unreachable.</value>
-          </detail>
-          <detail
-              key="form.error">
-            <value>Invalid password for $${form.parameter.login} at $${form.url}.</value>
-          </detail>
-        </annotation>
-      </setupTask>
-      <setupTask
-          xsi:type="setup:VariableTask"
-          name="github.remoteURIs"
-          label="Github repository">
-        <choice
-            value="git@github.com:@{remoteURI}.git"
-            label="Git (read-write)"/>
-        <choice
-            value="https://${github.user.id|username}@github.com/@{remoteURI}.git"
-            label="HTTPS (read-write)">
-          <annotation
-              source="http://www.eclipse.org/oomph/setup/MatchChoice"/>
-        </choice>
-        <choice
-            value="https://github.com/@{remoteURI}.git"
-            label="HTTPS (read-only, anonymous)"/>
-        <description>Choose from the available Github URIs</description>
-      </setupTask>
-    </setupTask>
-    <setupTask
-        xsi:type="jdt:JRETask"
-        version="JavaSE-1.8"
-        location="${jre.location-1.8}">
-      <description>Define the JRE needed to compile and run the Java projects of ${scope.project.label}</description>
-    </setupTask>
-    <setupTask
-        xsi:type="setup:EclipseIniTask"
-        option="-Xmx"
-        value="1G"
-        vm="true">
-      <description>Set the heap space needed to work with the projects of ${scope.project.label}</description>
-    </setupTask>
-    <setupTask
-        xsi:type="setup:ResourceCreationTask"
-        excludedTriggers="STARTUP MANUAL"
-        content="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;section name=&quot;Workbench&quot;>&#xD;&#xA;&#x9;&lt;section name=&quot;org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart&quot;>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;true&quot; key=&quot;group_libraries&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;false&quot; key=&quot;linkWithEditor&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;2&quot; key=&quot;layout&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;2&quot; key=&quot;rootMode&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;packageExplorer configured=&amp;quot;true&amp;quot; group_libraries=&amp;quot;1&amp;quot; layout=&amp;quot;2&amp;quot; linkWithEditor=&amp;quot;0&amp;quot; rootMode=&amp;quot;2&amp;quot; sortWorkingSets=&amp;quot;false&amp;quot; workingSetName=&amp;quot;&amp;quot;&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;localWorkingSetManager&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;workingSet editPageId=&amp;quot;org.eclipse.jdt.internal.ui.OthersWorkingSet&amp;quot; factoryID=&amp;quot;org.eclipse.ui.internal.WorkingSetFactory&amp;quot; id=&amp;quot;1382792884467_1&amp;quot; label=&amp;quot;Other Projects&amp;quot; name=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;/localWorkingSetManager&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;activeWorkingSet workingSetName=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;allWorkingSets workingSetName=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;/packageExplorer&amp;gt;&quot; key=&quot;memento&quot;/>&#xD;&#xA;&#x9;&lt;/section>&#xD;&#xA;&lt;/section>&#xD;&#xA;"
-        targetURL="${workspace.location|uri}/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml"
-        encoding="UTF-8">
-      <description>Initialize JDT's package explorer to show working sets as its root objects</description>
+        xsi:type="setup:VariableTask"
+        name="github.user.id"
+        defaultValue="anonymous"
+        label="Github user ID">
+      <description>The user ID of the Github account</description>
     </setupTask>
     <setupTask
         xsi:type="setup:VariableTask"
-        name="eclipse.target.platform"
-        value="None"
-        defaultValue="Neon"
-        storageURI="scope://Workspace"/>
-    <setupTask
-        xsi:type="setup.p2:P2Task">
-      <requirement
-          name="org.eclipse.xtext.sdk.feature.group"
-          versionRange="[2.13.0,2.99.0]"/>
-      <repository
-          url="http://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/"/>
-      <description>Install the tools needed in the IDE to work with the source code for ${scope.project.label}</description>
+        name="github.author.name"
+        label="Github author name">
+      <description>The author name used for Github commits</description>
     </setupTask>
     <setupTask
-        xsi:type="git:GitCloneTask"
-        id="git.clone.RDL_Editor"
-        filter=""
-        remoteURI="Minres/RDL-Editor">
+        xsi:type="setup:VariableTask"
+        name="github.author.email"
+        label="Github author email">
+      <description>The email address associated with Github commits</description>
+    </setupTask>
+    <setupTask
+        xsi:type="setup:VariableTask"
+        type="PASSWORD"
+        name="github.user.password"
+        label="Github password for issues">
       <annotation
-          source="http://www.eclipse.org/oomph/setup/InducedChoices">
+          source="http://www.eclipse.org/oomph/setup/PasswordVerificationDisabled">
         <detail
-            key="inherit">
-          <value>github.remoteURIs</value>
+            key="type">
+          <value>form</value>
         </detail>
         <detail
-            key="label">
-          <value>${scope.project.label} Git repository</value>
+            key="form.url">
+          <value>https://github.com/session</value>
         </detail>
         <detail
-            key="target">
-          <value>remoteURI</value>
+            key="form.cookie">
+          <value>PHPSESSID</value>
+        </detail>
+        <detail
+            key="form.parameters">
+          <value>login password authenticity_token utf8 commit</value>
+        </detail>
+        <detail
+            key="form.secure.parameters">
+          <value>password</value>
+        </detail>
+        <detail
+            key="form.filter">
+          <value>login=anonymous\&amp;.*</value>
+        </detail>
+        <detail
+            key="form.parameter.login">
+          <value>$${github.user.id}</value>
+        </detail>
+        <detail
+            key="form.parameter.password">
+          <value>$${value}</value>
+        </detail>
+        <detail
+            key="form.parameter.utf8">
+          <value>✓</value>
+        </detail>
+        <detail
+            key="form.parameter.commit">
+          <value>Sign in</value>
+        </detail>
+        <detail
+            key="form.ok">
+          <value>Valid password for $${form.parameter.login} at $${form.url}.</value>
+        </detail>
+        <detail
+            key="form.info">
+          <value>Validate the password for $${form.parameter.login} at $${form.url}.</value>
+        </detail>
+        <detail
+            key="form.warning">
+          <value>Unable to validate the password for $${form.parameter.login} because $${form.url} is unreachable.</value>
+        </detail>
+        <detail
+            key="form.error">
+          <value>Invalid password for $${form.parameter.login} at $${form.url}.</value>
         </detail>
       </annotation>
-      <description>${scope.project.label}</description>
     </setupTask>
     <setupTask
-        xsi:type="projects:ProjectsImportTask">
-      <sourceLocator
-          rootFolder="${git.clone.RDL_Editor.location}"
-          locateNestedProjects="true"/>
+        xsi:type="setup:VariableTask"
+        name="github.remoteURIs"
+        label="Github repository">
+      <choice
+          value="git@github.com:@{remoteURI}.git"
+          label="Git (read-write)"/>
+      <choice
+          value="https://${github.user.id|username}@github.com/@{remoteURI}.git"
+          label="HTTPS (read-write)">
+        <annotation
+            source="http://www.eclipse.org/oomph/setup/MatchChoice"/>
+      </choice>
+      <choice
+          value="https://github.com/@{remoteURI}.git"
+          label="HTTPS (read-only, anonymous)"/>
+      <description>Choose from the available Github URIs</description>
     </setupTask>
     <setupTask
-        xsi:type="setup.workingsets:WorkingSetTask">
-      <workingSet
-          name="${scope.project.name}">
-        <predicate
-            xsi:type="predicates:AndPredicate">
-          <operand
-              xsi:type="predicates:RepositoryPredicate"
-              project="com.minres.coredsl"/>
-        </predicate>
-      </workingSet>
-      <description>The dynamic working sets for ${scope.project.label}</description>
+        xsi:type="setup:VariableTask"
+        name="git-stream"
+        label="Stream to checkout">
+      <choice
+          value="master"/>
+      <choice
+          value="develop"/>
+      <description>Stream to checkout</description>
     </setupTask>
-    <setupTask
-        xsi:type="pde:TargetPlatformTask"
-        name="com.minres.rdl.target">
-      <description>Sets the RDL Editor target platform</description>
-    </setupTask>
-    <stream
-        name="master"
-        label="Master">
-      <setupTask
-          xsi:type="setup:EclipseIniTask"
-          option="-Doomph.redirection.JIT.ISS.CoreDsl"
-          value="=https://git.eclipse.org/c/Minres/oomph-setups.git.git/plain//JITISSCoreDsl.setup->${git.clone.JIT.ISS.CoreDsl.location|uri}//JITISSCoreDsl.setup"
-          vm="true">
-        <description>Set an Oomph redirection system property to redirect the logical location of this setup to its physical location in the Git clone.</description>
-      </setupTask>
-    </stream>
-    <description>A Xtext based SystemRDL editor with syntax highlighting and context sensitive help.</description>
+  </setupTask>
+  <setupTask
+      xsi:type="jdt:JRETask"
+      version="JavaSE-1.8"
+      location="${jre.location-1.8}">
+    <description>Define the JRE needed to compile and run the Java projects of ${scope.project.label}</description>
+  </setupTask>
+  <setupTask
+      xsi:type="setup:EclipseIniTask"
+      option="-Xmx"
+      value="1G"
+      vm="true">
+    <description>Set the heap space needed to work with the projects of ${scope.project.label}</description>
+  </setupTask>
+  <setupTask
+      xsi:type="setup:ResourceCreationTask"
+      excludedTriggers="STARTUP MANUAL"
+      content="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?>&#xD;&#xA;&lt;section name=&quot;Workbench&quot;>&#xD;&#xA;&#x9;&lt;section name=&quot;org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart&quot;>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;true&quot; key=&quot;group_libraries&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;false&quot; key=&quot;linkWithEditor&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;2&quot; key=&quot;layout&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;2&quot; key=&quot;rootMode&quot;/>&#xD;&#xA;&#x9;&#x9;&lt;item value=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot;?&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;packageExplorer configured=&amp;quot;true&amp;quot; group_libraries=&amp;quot;1&amp;quot; layout=&amp;quot;2&amp;quot; linkWithEditor=&amp;quot;0&amp;quot; rootMode=&amp;quot;2&amp;quot; sortWorkingSets=&amp;quot;false&amp;quot; workingSetName=&amp;quot;&amp;quot;&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;localWorkingSetManager&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;workingSet editPageId=&amp;quot;org.eclipse.jdt.internal.ui.OthersWorkingSet&amp;quot; factoryID=&amp;quot;org.eclipse.ui.internal.WorkingSetFactory&amp;quot; id=&amp;quot;1382792884467_1&amp;quot; label=&amp;quot;Other Projects&amp;quot; name=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;/localWorkingSetManager&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;activeWorkingSet workingSetName=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;allWorkingSets workingSetName=&amp;quot;Other Projects&amp;quot;/&amp;gt;&amp;#x0D;&amp;#x0A;&amp;lt;/packageExplorer&amp;gt;&quot; key=&quot;memento&quot;/>&#xD;&#xA;&#x9;&lt;/section>&#xD;&#xA;&lt;/section>&#xD;&#xA;"
+      targetURL="${workspace.location|uri}/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml"
+      encoding="UTF-8">
+    <description>Initialize JDT's package explorer to show working sets as its root objects</description>
+  </setupTask>
+  <setupTask
+      xsi:type="setup:VariableTask"
+      name="eclipse.target.platform"
+      value="None"
+      defaultValue="Neon"
+      storageURI="scope://Workspace"/>
+  <setupTask
+      xsi:type="setup.p2:P2Task">
+    <requirement
+        name="org.eclipse.xtext.sdk.feature.group"
+        versionRange="[2.13.0,2.99.0]"/>
+    <repository
+        url="http://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/"/>
+    <description>Install the tools needed in the IDE to work with the source code for ${scope.project.label}</description>
+  </setupTask>
+  <setupTask
+      xsi:type="git:GitCloneTask"
+      id="git.clone.RDL_Editor"
+      filter=""
+      remoteURI="Minres/RDL-Editor">
+    <annotation
+        source="http://www.eclipse.org/oomph/setup/InducedChoices">
+      <detail
+          key="inherit">
+        <value>github.remoteURIs</value>
+      </detail>
+      <detail
+          key="label">
+        <value>${scope.project.label} Git repository</value>
+      </detail>
+      <detail
+          key="target">
+        <value>remoteURI</value>
+      </detail>
+    </annotation>
+    <description>${scope.project.label}</description>
+  </setupTask>
+  <setupTask
+      xsi:type="projects:ProjectsImportTask">
+    <sourceLocator
+        rootFolder="${git.clone.RDL_Editor.location}"
+        locateNestedProjects="true"/>
+  </setupTask>
+  <setupTask
+      xsi:type="setup.workingsets:WorkingSetTask">
+    <workingSet
+        name="${scope.project.name}">
+      <predicate
+          xsi:type="predicates:AndPredicate">
+        <operand
+            xsi:type="predicates:RepositoryPredicate"
+            project="com.minres.coredsl"/>
+      </predicate>
+    </workingSet>
+    <description>The dynamic working sets for ${scope.project.label}</description>
+  </setupTask>
+  <setupTask
+      xsi:type="pde:TargetPlatformTask"
+      name="com.minres.rdl.target">
+    <description>Sets the RDL Editor target platform</description>
+  </setupTask>
+  <stream name="${git-stream}"
+      label="Stream to checkout"/>
+  <description>A Xtext based SystemRDL editor with syntax highlighting and context sensitive help.</description>
 </setup:Project>
diff --git a/projects/SCViewer.setup b/projects/SCViewer.setup
index f2cabc5..703590d 100644
--- a/projects/SCViewer.setup
+++ b/projects/SCViewer.setup
@@ -120,6 +120,16 @@
           label="HTTPS (read-only, anonymous)"/>
       <description>Choose from the available Github URIs</description>
     </setupTask>
+    <setupTask
+        xsi:type="setup:VariableTask"
+        name="git-stream"
+        label="Stream to checkout">
+      <choice
+          value="master"/>
+      <choice
+          value="develop"/>
+      <description>Stream to checkout</description>
+    </setupTask>
   </setupTask>
   <setupTask
       xsi:type="jdt:JRETask"
@@ -200,7 +210,7 @@
       name="Neon Platform">
     <description>Sets the RDL Editor target platform</description>
   </setupTask>
-  <stream name="master"
-      label="Master"/>
+  <stream name="${git-stream}"
+      label="Stream to checkout"/>
   <description>A lightweight tool to visualize VCD and transaction traces.</description>
 </setup:Project>