Added releng
diff --git a/features/org.eclipse.epsilon.sirius.widget.feature/.project b/features/org.eclipse.epsilon.sirius.widget.feature/.project
new file mode 100644
index 0000000..958bf13
--- /dev/null
+++ b/features/org.eclipse.epsilon.sirius.widget.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.epsilon.sirius.widget.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/features/org.eclipse.epsilon.sirius.widget.feature/EPL-2.0.html b/features/org.eclipse.epsilon.sirius.widget.feature/EPL-2.0.html
new file mode 100644
index 0000000..637a181
--- /dev/null
+++ b/features/org.eclipse.epsilon.sirius.widget.feature/EPL-2.0.html
@@ -0,0 +1,300 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>Eclipse Public License - Version 2.0</title>
+    <style type="text/css">
+      body {
+        margin: 1.5em 3em;
+      }
+      h1{
+        font-size:1.5em;
+      }
+      h2{
+        font-size:1em;
+        margin-bottom:0.5em;
+        margin-top:1em;
+      }
+      p {
+        margin-top:  0.5em;
+        margin-bottom: 0.5em;
+      }
+      ul, ol{
+        list-style-type:none;
+      }
+    </style>
+  </head>
+  <body>
+    <h1>Eclipse Public License - v 2.0</h1>
+    <p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
+      PUBLIC LICENSE (&ldquo;AGREEMENT&rdquo;). ANY USE, REPRODUCTION OR DISTRIBUTION
+      OF THE PROGRAM CONSTITUTES RECIPIENT&#039;S ACCEPTANCE OF THIS AGREEMENT.
+    </p>
+    <h2 id="definitions">1. DEFINITIONS</h2>
+    <p>&ldquo;Contribution&rdquo; means:</p>
+    <ul>
+      <li>a) in the case of the initial Contributor, the initial content
+        Distributed under this Agreement, and
+      </li>
+      <li>
+        b) in the case of each subsequent Contributor:
+        <ul>
+          <li>i) changes to the Program, and</li>
+          <li>ii) additions to the Program;</li>
+        </ul>
+        where such changes and/or additions to the Program originate from
+        and are Distributed by that particular Contributor. A Contribution
+        &ldquo;originates&rdquo; from a Contributor if it was added to the Program by such
+        Contributor itself or anyone acting on such Contributor&#039;s behalf.
+        Contributions do not include changes or additions to the Program that
+        are not Modified Works.
+      </li>
+    </ul>
+    <p>&ldquo;Contributor&rdquo; means any person or entity that Distributes the Program.</p>
+    <p>&ldquo;Licensed Patents&rdquo; mean patent claims licensable by a Contributor which
+      are necessarily infringed by the use or sale of its Contribution alone
+      or when combined with the Program.
+    </p>
+    <p>&ldquo;Program&rdquo; means the Contributions Distributed in accordance with this
+      Agreement.
+    </p>
+    <p>&ldquo;Recipient&rdquo; means anyone who receives the Program under this Agreement
+      or any Secondary License (as applicable), including Contributors.
+    </p>
+    <p>&ldquo;Derivative Works&rdquo; shall mean any work, whether in Source Code or other
+      form, that is based on (or derived from) the Program and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship.
+    </p>
+    <p>&ldquo;Modified Works&rdquo; shall mean any work in Source Code or other form that
+      results from an addition to, deletion from, or modification of the
+      contents of the Program, including, for purposes of clarity any new file
+      in Source Code form that contains any contents of the Program. Modified
+      Works shall not include works that contain only declarations, interfaces,
+      types, classes, structures, or files of the Program solely in each case
+      in order to link to, bind by name, or subclass the Program or Modified
+      Works thereof.
+    </p>
+    <p>&ldquo;Distribute&rdquo; means the acts of a) distributing or b) making available
+      in any manner that enables the transfer of a copy.
+    </p>
+    <p>&ldquo;Source Code&rdquo; means the form of a Program preferred for making
+      modifications, including but not limited to software source code,
+      documentation source, and configuration files.
+    </p>
+    <p>&ldquo;Secondary License&rdquo; means either the GNU General Public License,
+      Version 2.0, or any later versions of that license, including any
+      exceptions or additional permissions as identified by the initial
+      Contributor.
+    </p>
+    <h2 id="grant-of-rights">2. GRANT OF RIGHTS</h2>
+    <ul>
+      <li>a) Subject to the terms of this Agreement, each Contributor hereby
+        grants Recipient a non-exclusive, worldwide, royalty-free copyright
+        license to reproduce, prepare Derivative Works of, publicly display,
+        publicly perform, Distribute and sublicense the Contribution of such
+        Contributor, if any, and such Derivative Works.
+      </li>
+      <li>b) Subject to the terms of this Agreement, each Contributor hereby
+        grants Recipient a non-exclusive, worldwide, royalty-free patent
+        license under Licensed Patents to make, use, sell, offer to sell,
+        import and otherwise transfer the Contribution of such Contributor,
+        if any, in Source Code or other form. This patent license shall
+        apply to the combination of the Contribution and the Program if,
+        at the time the Contribution is added by the Contributor, such
+        addition of the Contribution causes such combination to be covered
+        by the Licensed Patents. The patent license shall not apply to any
+        other combinations which include the Contribution. No hardware per
+        se is licensed hereunder.
+      </li>
+      <li>c) Recipient understands that although each Contributor grants the
+        licenses to its Contributions set forth herein, no assurances are
+        provided by any Contributor that the Program does not infringe the
+        patent or other intellectual property rights of any other entity.
+        Each Contributor disclaims any liability to Recipient for claims
+        brought by any other entity based on infringement of intellectual
+        property rights or otherwise. As a condition to exercising the rights
+        and licenses granted hereunder, each Recipient hereby assumes sole
+        responsibility to secure any other intellectual property rights needed,
+        if any. For example, if a third party patent license is required to
+        allow Recipient to Distribute the Program, it is Recipient&#039;s
+        responsibility to acquire that license before distributing the Program.
+      </li>
+      <li>d) Each Contributor represents that to its knowledge it has sufficient
+        copyright rights in its Contribution, if any, to grant the copyright
+        license set forth in this Agreement.
+      </li>
+      <li>e) Notwithstanding the terms of any Secondary License, no Contributor
+        makes additional grants to any Recipient (other than those set forth
+        in this Agreement) as a result of such Recipient&#039;s receipt of the
+        Program under the terms of a Secondary License (if permitted under
+        the terms of Section 3).
+      </li>
+    </ul>
+    <h2 id="requirements">3. REQUIREMENTS</h2>
+    <p>3.1 If a Contributor Distributes the Program in any form, then:</p>
+    <ul>
+      <li>a) the Program must also be made available as Source Code, in
+        accordance with section 3.2, and the Contributor must accompany
+        the Program with a statement that the Source Code for the Program
+        is available under this Agreement, and informs Recipients how to
+        obtain it in a reasonable manner on or through a medium customarily
+        used for software exchange; and
+      </li>
+      <li>
+        b) the Contributor may Distribute the Program under a license
+        different than this Agreement, provided that such license:
+        <ul>
+          <li>i) effectively disclaims on behalf of all other Contributors all
+            warranties and conditions, express and implied, including warranties
+            or conditions of title and non-infringement, and implied warranties
+            or conditions of merchantability and fitness for a particular purpose;
+          </li>
+          <li>ii) effectively excludes on behalf of all other Contributors all
+            liability for damages, including direct, indirect, special, incidental
+            and consequential damages, such as lost profits;
+          </li>
+          <li>iii) does not attempt to limit or alter the recipients&#039; rights in the
+            Source Code under section 3.2; and
+          </li>
+          <li>iv) requires any subsequent distribution of the Program by any party
+            to be under a license that satisfies the requirements of this section 3.
+          </li>
+        </ul>
+      </li>
+    </ul>
+    <p>3.2 When the Program is Distributed as Source Code:</p>
+    <ul>
+      <li>a) it must be made available under this Agreement, or if the Program (i)
+        is combined with other material in a separate file or files made available
+        under a Secondary License, and (ii) the initial Contributor attached to
+        the Source Code the notice described in Exhibit A of this Agreement,
+        then the Program may be made available under the terms of such
+        Secondary Licenses, and
+      </li>
+      <li>b) a copy of this Agreement must be included with each copy of the Program.</li>
+    </ul>
+    <p>3.3 Contributors may not remove or alter any copyright, patent, trademark,
+      attribution notices, disclaimers of warranty, or limitations of liability
+      (&lsquo;notices&rsquo;) contained within the Program from any copy of the Program which
+      they Distribute, provided that Contributors may add their own appropriate
+      notices.
+    </p>
+    <h2 id="commercial-distribution">4. COMMERCIAL DISTRIBUTION</h2>
+    <p>Commercial distributors of software may accept certain responsibilities
+      with respect to end users, business partners and the like. While this
+      license is intended to facilitate the commercial use of the Program, the
+      Contributor who includes the Program in a commercial product offering should
+      do so in a manner which does not create potential liability for other
+      Contributors. Therefore, if a Contributor includes the Program in a
+      commercial product offering, such Contributor (&ldquo;Commercial Contributor&rdquo;)
+      hereby agrees to defend and indemnify every other Contributor
+      (&ldquo;Indemnified Contributor&rdquo;) against any losses, damages and costs
+      (collectively &ldquo;Losses&rdquo;) arising from claims, lawsuits and other legal actions
+      brought by a third party against the Indemnified Contributor to the extent
+      caused by the acts or omissions of such Commercial Contributor in connection
+      with its distribution of the Program in a commercial product offering.
+      The obligations in this section do not apply to any claims or Losses relating
+      to any actual or alleged intellectual property infringement. In order to
+      qualify, an Indemnified Contributor must: a) promptly notify the
+      Commercial Contributor in writing of such claim, and b) allow the Commercial
+      Contributor to control, and cooperate with the Commercial Contributor in,
+      the defense and any related settlement negotiations. The Indemnified
+      Contributor may participate in any such claim at its own expense.
+    </p>
+    <p>For example, a Contributor might include the Program
+      in a commercial product offering, Product X. That Contributor is then a
+      Commercial Contributor. If that Commercial Contributor then makes performance
+      claims, or offers warranties related to Product X, those performance claims
+      and warranties are such Commercial Contributor&#039;s responsibility alone.
+      Under this section, the Commercial Contributor would have to defend claims
+      against the other Contributors related to those performance claims and
+      warranties, and if a court requires any other Contributor to pay any damages
+      as a result, the Commercial Contributor must pay those damages.
+    </p>
+    <h2 id="warranty">5. NO WARRANTY</h2>
+    <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED
+      BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN &ldquo;AS IS&rdquo; BASIS, WITHOUT
+      WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
+      WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
+      MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is
+      solely responsible for determining the appropriateness of using and
+      distributing the Program and assumes all risks associated with its
+      exercise of rights under this Agreement, including but not limited to the
+      risks and costs of program errors, compliance with applicable laws, damage
+      to or loss of data, programs or equipment, and unavailability or
+      interruption of operations.
+    </p>
+    <h2 id="disclaimer">6. DISCLAIMER OF LIABILITY</h2>
+    <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED
+      BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY
+      LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+      OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS),
+      HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+      LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+      OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
+      GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+    </p>
+    <h2 id="general">7. GENERAL</h2>
+    <p>If any provision of this Agreement is invalid or unenforceable under
+      applicable law, it shall not affect the validity or enforceability of the
+      remainder of the terms of this Agreement, and without further action by the
+      parties hereto, such provision shall be reformed to the minimum extent
+      necessary to make such provision valid and enforceable.
+    </p>
+    <p>If Recipient institutes patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Program itself
+      (excluding combinations of the Program with other software or hardware)
+      infringes such Recipient&#039;s patent(s), then such Recipient&#039;s rights granted
+      under Section 2(b) shall terminate as of the date such litigation is filed.
+    </p>
+    <p>All Recipient&#039;s rights under this Agreement shall terminate if it fails to
+      comply with any of the material terms or conditions of this Agreement and
+      does not cure such failure in a reasonable period of time after becoming
+      aware of such noncompliance. If all Recipient&#039;s rights under this Agreement
+      terminate, Recipient agrees to cease use and distribution of the Program
+      as soon as reasonably practicable. However, Recipient&#039;s obligations under
+      this Agreement and any licenses granted by Recipient relating to the
+      Program shall continue and survive.
+    </p>
+    <p>Everyone is permitted to copy and distribute copies of this Agreement,
+      but in order to avoid inconsistency the Agreement is copyrighted and may
+      only be modified in the following manner. The Agreement Steward reserves
+      the right to publish new versions (including revisions) of this Agreement
+      from time to time. No one other than the Agreement Steward has the right
+      to modify this Agreement. The Eclipse Foundation is the initial Agreement
+      Steward. The Eclipse Foundation may assign the responsibility to serve as
+      the Agreement Steward to a suitable separate entity. Each new version of
+      the Agreement will be given a distinguishing version number. The Program
+      (including Contributions) may always be Distributed subject to the version
+      of the Agreement under which it was received. In addition, after a new
+      version of the Agreement is published, Contributor may elect to Distribute
+      the Program (including its Contributions) under the new version.
+    </p>
+    <p>Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
+      receives no rights or licenses to the intellectual property of any
+      Contributor under this Agreement, whether expressly, by implication,
+      estoppel or otherwise. All rights in the Program not expressly granted
+      under this Agreement are reserved. Nothing in this Agreement is intended
+      to be enforceable by any entity that is not a Contributor or Recipient.
+      No third-party beneficiary rights are created under this Agreement.
+    </p>
+    <h2 id="exhibit-a">Exhibit A &ndash; Form of Secondary Licenses Notice</h2>
+    <p>&ldquo;This Source Code may also be made available under the following 
+    	Secondary Licenses when the conditions for such availability set forth 
+    	in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
+    	version(s), and exceptions or additional permissions here}.&rdquo;
+    </p>
+    <blockquote>
+      <p>Simply including a copy of this Agreement, including this Exhibit A
+        is not sufficient to license the Source Code under Secondary Licenses.
+      </p>
+      <p>If it is not possible or desirable to put the notice in a particular file,
+        then You may include the notice in a location (such as a LICENSE file in a
+        relevant directory) where a recipient would be likely to look for
+        such a notice.
+      </p>
+      <p>You may add additional accurate notices of copyright ownership.</p>
+    </blockquote>
+  </body>
+</html>
\ No newline at end of file
diff --git a/features/org.eclipse.epsilon.sirius.widget.feature/about.html b/features/org.eclipse.epsilon.sirius.widget.feature/about.html
new file mode 100644
index 0000000..1601de9
--- /dev/null
+++ b/features/org.eclipse.epsilon.sirius.widget.feature/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>April 27, 2020</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/features/org.eclipse.epsilon.sirius.widget.feature/build.properties b/features/org.eclipse.epsilon.sirius.widget.feature/build.properties
new file mode 100644
index 0000000..4aa5687
--- /dev/null
+++ b/features/org.eclipse.epsilon.sirius.widget.feature/build.properties
@@ -0,0 +1,3 @@
+bin.includes = feature.xml,\
+               EPL-2.0.html,\
+               about.html
diff --git a/features/org.eclipse.epsilon.sirius.widget.feature/feature.xml b/features/org.eclipse.epsilon.sirius.widget.feature/feature.xml
new file mode 100644
index 0000000..1307b9b
--- /dev/null
+++ b/features/org.eclipse.epsilon.sirius.widget.feature/feature.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.epsilon.sirius.widget.feature"
+      label="Sirius Embedded Editor Widget"
+      version="2.4.0.qualifier"
+      provider-name="Eclipse Modeling Project"
+      license-feature="org.eclipse.license"
+      license-feature-version="0.0.0">
+
+   <description url="http://www.eclipse.org/epsilon">
+      This feature allows for EOL widgets to be embedded in Sirius properties views
+   </description>
+
+   <copyright>
+      Copyright (c) 2021 The University of York.
+        This program and the accompanying materials are made
+        available under the terms of the Eclipse Public License 2.0
+        which is available at https://www.eclipse.org/legal/epl-2.0
+   </copyright>
+
+   <plugin
+         id="org.eclipse.epsilon.sirius.widget"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>
diff --git a/features/org.eclipse.epsilon.sirius.widget.feature/pom.xml b/features/org.eclipse.epsilon.sirius.widget.feature/pom.xml
new file mode 100644
index 0000000..f177591
--- /dev/null
+++ b/features/org.eclipse.epsilon.sirius.widget.feature/pom.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.epsilon</groupId>
+    <artifactId>features</artifactId>
+    <version>2.4.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>org.eclipse.epsilon.sirius.widget.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+</project>
diff --git a/features/pom.xml b/features/pom.xml
index af738ae..5bc0684 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -38,6 +38,7 @@
     <module>org.eclipse.epsilon.picto.feature</module>
     <module>org.eclipse.epsilon.simulink.dt.feature</module>
     <module>org.eclipse.epsilon.simulink.feature</module>
+    <module>org.eclipse.epsilon.sirius.widget.feature</module>
     <module>org.eclipse.epsilon.uml.dt.feature</module>
     <module>org.eclipse.epsilon.uml.feature</module>
   </modules>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index ccd150b..5b6c158 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -113,6 +113,7 @@
     <module>org.eclipse.epsilon.pinset.dt</module>

     <module>org.eclipse.epsilon.profiling</module>

     <module>org.eclipse.epsilon.profiling.dt</module>

+    <module>org.eclipse.epsilon.sirius.widget</module>

     <module>org.eclipse.epsilon.workflow</module>

     <module>org.eclipse.epsilon.workflow.csv</module>

     <module>org.eclipse.epsilon.workflow.emf</module>

diff --git a/releng/org.eclipse.epsilon.target/org.eclipse.epsilon.target.target b/releng/org.eclipse.epsilon.target/org.eclipse.epsilon.target.target
index d168be9..1b69d80 100644
--- a/releng/org.eclipse.epsilon.target/org.eclipse.epsilon.target.target
+++ b/releng/org.eclipse.epsilon.target/org.eclipse.epsilon.target.target
@@ -1,93 +1,101 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?>
-<target name="Epsilon Target Platform" sequenceNumber="123">
-<locations>
-	<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
-		<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
-		<repository location="http://download.eclipse.org/cbi/updates/license"/>
-	</location>
-	<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-		<unit id="org.eclipse.emf.sdk.feature.group" version="2.22.0.v20200519-1135"/>
-		<unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.12.1.201812070911"/>
-		<unit id="org.eclipse.equinox.sdk.feature.group" version="3.20.200.v20200528-0603"/>
-		<unit id="org.eclipse.gef.sdk.feature.group" version="3.11.0.201606061308"/>
-		<unit id="org.eclipse.gmf.feature.group" version="1.13.0.202004160913"/>
-		<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.13.0.202004160913"/>
-		<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.13.0.202004160913"/>
-		<unit id="org.eclipse.jdt.feature.group" version="3.18.400.v20200604-0540"/>
-		<unit id="org.eclipse.pde.feature.group" version="3.14.400.v20200604-0540"/>
-		<unit id="org.eclipse.egit.feature.group" version="5.8.0.202006091008-r"/>
-		<unit id="org.eclipse.ocl.all.sdk.feature.group" version="5.12.0.v20200608-1555"/>
-		<unit id="org.eclipse.xsd.sdk.feature.group" version="2.22.0.v20200324-0723"/>
-		<unit id="org.eclipse.xtext.sdk.feature.group" version="2.22.0.v20200602-1533"/>
-		<unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="3.10.2.v20200609-1812"/>
-		<repository location="http://download.eclipse.org/releases/2020-06"/>
-		<unit id="org.eclipse.sirius.specifier.feature.group" version="6.3.1.202006101101"/>
-	</location>
-	<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
-		<unit id="org.eclipse.emf.emfatic.feature.group" version="0.0.0"/>
-		<repository location="http://download.eclipse.org/emfatic/update"/>
-	</location>
-	<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-		<unit id="org.eclipse.emf.compare.feature.group" version="0.0.0"/>
-		<unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/>
-		<unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="0.0.0"/>
-		<unit id="org.eclipse.emf.compare.uml2.feature.group" version="0.0.0"/>
-		<repository location="http://download.eclipse.org/modeling/emf/compare/updates/releases/3.3/R201911051515"/>
-	</location>
-	<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
-		<unit id="org.eclipse.gmf.sdk.feature.group" version="3.2.1.201409171321"/>
-		<unit id="org.eclipse.gmf.tooling.codegen.xtend2.feature.group" version="3.2.1.201409171321"/>
-		<unit id="org.eclipse.gmf.tooling.feature.group" version="3.2.1.201409171321"/>
-		<unit id="org.eclipse.gmf.tooling.runtime.feature.group" version="3.2.1.201409171321"/>
-		<repository location="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases"/>
-	</location>
-		<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-		<unit id="com.atlassian.commonmark" version="0.15.1.v20200707-1444"/>
-		<unit id="com.atlassian.commonmark-gfm-strikethrough" version="0.15.1.v20200707-1444"/>
-		<unit id="com.atlassian.commonmark-gfm-tables" version="0.15.1.v20200707-1444"/>
-		<unit id="com.atlassian.commonmark-heading-anchor" version="0.15.1.v20200707-1444"/>
-		<unit id="com.atlassian.commonmark-image-attributes" version="0.15.1.v20200707-1444"/>
-		<unit id="com.atlassian.commonmark-ins" version="0.15.1.v20200707-1444"/>
-		<unit id="com.atlassian.commonmark-task-list-items" version="0.15.1.v20200707-1444"/>
-		<unit id="com.atlassian.commonmark-yaml" version="0.15.1.v20200707-1444"/>
-		<unit id="com.github.virtuald.curvesapi" version="1.6.0.v20200807-0931"/>
-		<unit id="com.google.gdata" version="1.47.1.v20200819-2030"/>
-		<unit id="net.bytebuddy.byte-buddy" version="1.7.9.v20180420-1519"/>
-		<unit id="net.bytebuddy.byte-buddy-agent" version="1.7.9.v20180420-1519"/>
-		<unit id="net.sourceforge.plantuml" version="1.2019.0.v20200820-1243"/>
-		<unit id="org.antlr.runtime" version="3.5.2.v20200724-1452"/>
-		<unit id="org.apache.commons.cli" version="1.4.0.v20200417-1444"/>
-		<unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
-		<unit id="org.apache.commons.collections" version="3.2.2.v201511171945"/>
-		<unit id="org.apache.commons.collections4" version="4.4.0.v20200420-1700"/>
-		<unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
-		<unit id="org.apache.commons.csv" version="1.8.0.v20200804-1438"/>
-		<unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/>
-		<unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
-		<unit id="org.apache.commons.math3" version="3.6.1.v20200817-1830"/>
-		<unit id="org.apache.logging.log4j" version="2.8.2.v20200818-1118"/>
-		<unit id="org.apache.poi" version="4.1.1.v20200604-1524"/>
-		<unit id="org.apache.poi.ooxml" version="4.1.1.v20200820-1148"/>
-		<unit id="org.apache.poi.ooxml.schemas" version="4.1.1.v20200922-2105"/>
-		<unit id="org.apache.santuario.xmlsec" version="2.2.0.v20200818-1422"/>
-		<unit id="org.apache.xmlbeans" version="3.1.0.v20200922-1359"/>
-		<unit id="javax.xml.stream" version="1.0.1.v201004272200"/>
-		<unit id="org.jdom" version="1.1.1.v201101151400"/>
-		<unit id="org.mockito" version="2.23.0.v20200310-1642"/>
-		<unit id="org.objenesis" version="2.6.0.v20180420-1519"/>
-		<unit id="org.yaml.snakeyaml" version="0.0.0"/>
-		<unit id="org.jsoup" version="1.7.2.v201411291515"/>
-		<unit id="org.jsoup.source" version="1.7.2.v201411291515"/>
-		<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository"/>
-	</location>
-	<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-		<repository location="https://download.eclipse.org/acceleo/updates/releases/3.7/"/>
-		<unit id="org.eclipse.acceleo.ui.interpreter.feature.group" version="0.0.0"/>
-	</location>
-</locations>
-<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-<launcherArgs>
-	<vmArgs>-Dosgi.requiredJavaVersion=1.8</vmArgs>
-</launcherArgs>
-</target>
\ No newline at end of file
+<?pde?>
+<!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
+<target name="Epsilon Target Platform" sequenceNumber="1627992606">
+  <locations>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
+      <unit id="org.eclipse.license.feature.group" version="0.0.0"/>
+      <repository location="http://download.eclipse.org/cbi/updates/license"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
+      <unit id="org.eclipse.e4.core.tools.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.validation.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.gef.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.gmf.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.platform.sdk" version="0.0.0"/>
+      <unit id="org.eclipse.rcp.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sdk.ide" version="0.0.0"/>
+      <unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.ocl.all.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.runtime.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.runtime.ide.ui.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.runtime.ide.eef.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.sirius.properties.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.eef.sdk.feature.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.xsd.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.xtext.runtime.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.m2m.qvt.oml.sdk.feature.group" version="0.0.0"/>
+      <repository location="http://download.eclipse.org/releases/2020-06"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
+      <unit id="org.eclipse.emf.emfatic.feature.group" version="0.0.0"/>
+      <repository location="http://download.eclipse.org/emfatic/update"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
+      <unit id="org.eclipse.emf.compare.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.compare.ide.ui.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.compare.rcp.ui.feature.group" version="0.0.0"/>
+      <unit id="org.eclipse.emf.compare.uml2.feature.group" version="0.0.0"/>
+      <repository location="http://download.eclipse.org/modeling/emf/compare/updates/releases/3.3/R201911051515"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
+      <unit id="org.eclipse.gmf.sdk.feature.group" version="3.2.1.201409171321"/>
+      <unit id="org.eclipse.gmf.tooling.codegen.xtend2.feature.group" version="3.2.1.201409171321"/>
+      <unit id="org.eclipse.gmf.tooling.feature.group" version="3.2.1.201409171321"/>
+      <unit id="org.eclipse.gmf.tooling.runtime.feature.group" version="3.2.1.201409171321"/>
+      <repository location="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
+      <unit id="com.atlassian.commonmark" version="0.15.1.v20200707-1444"/>
+      <unit id="com.atlassian.commonmark-gfm-strikethrough" version="0.15.1.v20200707-1444"/>
+      <unit id="com.atlassian.commonmark-gfm-tables" version="0.15.1.v20200707-1444"/>
+      <unit id="com.atlassian.commonmark-heading-anchor" version="0.15.1.v20200707-1444"/>
+      <unit id="com.atlassian.commonmark-image-attributes" version="0.15.1.v20200707-1444"/>
+      <unit id="com.atlassian.commonmark-ins" version="0.15.1.v20200707-1444"/>
+      <unit id="com.atlassian.commonmark-task-list-items" version="0.15.1.v20200707-1444"/>
+      <unit id="com.atlassian.commonmark-yaml" version="0.15.1.v20200707-1444"/>
+      <unit id="com.github.virtuald.curvesapi" version="1.6.0.v20200807-0931"/>
+      <unit id="com.google.gdata" version="1.47.1.v20200819-2030"/>
+      <unit id="javax.xml.stream" version="1.0.1.v201004272200"/>
+      <unit id="net.bytebuddy.byte-buddy" version="1.7.9.v20180420-1519"/>
+      <unit id="net.bytebuddy.byte-buddy-agent" version="1.7.9.v20180420-1519"/>
+      <unit id="net.sourceforge.plantuml" version="1.2019.0.v20200820-1243"/>
+      <unit id="org.antlr.runtime" version="3.5.2.v20200724-1452"/>
+      <unit id="org.apache.commons.cli" version="1.4.0.v20200417-1444"/>
+      <unit id="org.apache.commons.codec" version="1.14.0.v20200818-1422"/>
+      <unit id="org.apache.commons.collections" version="3.2.2.v201511171945"/>
+      <unit id="org.apache.commons.collections4" version="4.4.0.v20200420-1700"/>
+      <unit id="org.apache.commons.compress" version="1.19.0.v20200106-2343"/>
+      <unit id="org.apache.commons.csv" version="1.8.0.v20200804-1438"/>
+      <unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/>
+      <unit id="org.apache.commons.logging" version="1.2.0.v20180409-1502"/>
+      <unit id="org.apache.commons.math3" version="3.6.1.v20200817-1830"/>
+      <unit id="org.apache.logging.log4j" version="2.8.2.v20200818-1118"/>
+      <unit id="org.apache.poi" version="4.1.1.v20200604-1524"/>
+      <unit id="org.apache.poi.ooxml" version="4.1.1.v20200820-1148"/>
+      <unit id="org.apache.poi.ooxml.schemas" version="4.1.1.v20200922-2105"/>
+      <unit id="org.apache.santuario.xmlsec" version="2.2.0.v20200818-1422"/>
+      <unit id="org.apache.xmlbeans" version="3.1.0.v20200922-1359"/>
+      <unit id="org.jdom" version="1.1.1.v201101151400"/>
+      <unit id="org.jsoup" version="1.7.2.v201411291515"/>
+      <unit id="org.jsoup.source" version="1.7.2.v201411291515"/>
+      <unit id="org.mockito" version="2.23.0.v20200310-1642"/>
+      <unit id="org.objenesis" version="2.6.0.v20180420-1519"/>
+      <unit id="org.yaml.snakeyaml" version="1.27.0.v20201111-1638"/>
+      <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
+      <unit id="org.eclipse.acceleo.ui.interpreter.feature.group" version="0.0.0"/>
+      <repository location="https://download.eclipse.org/acceleo/updates/releases/3.7/"/>
+    </location>
+  </locations>
+  <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+</target>
diff --git a/releng/org.eclipse.epsilon.target/org.eclipse.epsilon.target.tpd b/releng/org.eclipse.epsilon.target/org.eclipse.epsilon.target.tpd
index e5f7edd..9236394 100644
--- a/releng/org.eclipse.epsilon.target/org.eclipse.epsilon.target.tpd
+++ b/releng/org.eclipse.epsilon.target/org.eclipse.epsilon.target.tpd
@@ -23,6 +23,9 @@
 	org.eclipse.ocl.all.sdk.feature.group lazy
 	org.eclipse.sirius.runtime.feature.group lazy
 	org.eclipse.sirius.runtime.ide.ui.feature.group lazy
+	org.eclipse.sirius.runtime.ide.eef.feature.group lazy
+	org.eclipse.sirius.properties.feature.feature.group lazy
+	org.eclipse.eef.sdk.feature.feature.group lazy
 	org.eclipse.xsd.sdk.feature.group lazy
 	org.eclipse.xtext.sdk.feature.group lazy
 	org.eclipse.xtext.runtime.feature.group lazy
diff --git a/releng/org.eclipse.epsilon.updatesite/category.xml b/releng/org.eclipse.epsilon.updatesite/category.xml
index 1229911..02bd07c 100644
--- a/releng/org.eclipse.epsilon.updatesite/category.xml
+++ b/releng/org.eclipse.epsilon.updatesite/category.xml
@@ -87,6 +87,9 @@
    <feature id="org.eclipse.epsilon.emc.html.feature">
       <category name="Epsilon HTML Integration"/>
    </feature>
+   <feature id="org.eclipse.epsilon.sirius.widget.feature">
+      <category name="Epsilon Sirius Integration"/>
+   </feature>
    <category-def name="Epsilon Core" label="Epsilon Core">
       <description>
          Parsers, execution engines, development tools (editors, launch configurations, debuggers etc.) for languages of the Epsilon platform.
@@ -132,6 +135,11 @@
          Support for managing HTML models with languages of the Epsilon platform.
       </description>
    </category-def>
+   <category-def name="Epsilon Sirius Integration" label="Epsilon Sirius Integration">
+      <description>
+         Support for embedding Epsilon based editors into Sirius properties views.
+      </description>
+   </category-def>
    <repository-reference location="http://download.eclipse.org/emfatic/update" enabled="true" />
    <repository-reference location="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/releases" enabled="true" />
    <repository-reference location="http://download.eclipse.org/releases/2021-03" enabled="true" />
diff --git a/tests/org.eclipse.epsilon.test.dependencies/META-INF/MANIFEST.MF b/tests/org.eclipse.epsilon.test.dependencies/META-INF/MANIFEST.MF
index e20064e..99ec1a8 100644
--- a/tests/org.eclipse.epsilon.test.dependencies/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.epsilon.test.dependencies/META-INF/MANIFEST.MF
@@ -4,7 +4,8 @@
 Bundle-Name: Epsilon Test Dependencies (Incubation)
 Bundle-SymbolicName: org.eclipse.epsilon.test.dependencies
 Bundle-Version: 2.4.0.qualifier
-Require-Bundle: org.junit;bundle-version="4.12.0";visibility:=reexport,
+Require-Bundle: javax.annotation;visibility:=reexport,
+ org.junit;bundle-version="4.12.0";visibility:=reexport,
  org.mockito;bundle-version="2.1.3";visibility:=reexport,
  net.bytebuddy.byte-buddy;bundle-version="1.7.9",
  net.bytebuddy.byte-buddy-agent;bundle-version="1.7.9",