diff --git a/plugins/gui/org.eclipse.papyrus.sysml16.architecture/META-INF/MANIFEST.MF b/plugins/gui/org.eclipse.papyrus.sysml16.architecture/META-INF/MANIFEST.MF
index 9cef8d0..b41b092 100644
--- a/plugins/gui/org.eclipse.papyrus.sysml16.architecture/META-INF/MANIFEST.MF
+++ b/plugins/gui/org.eclipse.papyrus.sysml16.architecture/META-INF/MANIFEST.MF
@@ -66,7 +66,8 @@
  org.eclipse.papyrus.sysml16.modelexplorer;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.papyrus.uml.modelexplorer;bundle-version="[3.1.0,4.0.0)",
  org.eclipse.papyrus.infra.nattable.modelexplorer;bundle-version="[5.0.0,6.0.0)",
- org.eclipse.papyrus.infra.gmfdiag.modelexplorer;bundle-version="[2.0.0,3.0.0)"
+ org.eclipse.papyrus.infra.gmfdiag.modelexplorer;bundle-version="[2.0.0,3.0.0)",
+ org.apache.xerces;bundle-version="[2.9.0,3.0.0)"
 Export-Package: org.eclipse.papyrus.sysml16.architecture,
  org.eclipse.papyrus.sysml16.architecture.internal;x-internal:=true,
  org.eclipse.papyrus.sysml16.architecture.util
diff --git a/releng/org.eclipse.papyrus.sysml16.product/papyrusSysml.product b/releng/org.eclipse.papyrus.sysml16.product/papyrusSysml.product
index 1315aa1..77499d5 100644
--- a/releng/org.eclipse.papyrus.sysml16.product/papyrusSysml.product
+++ b/releng/org.eclipse.papyrus.sysml16.product/papyrusSysml.product
@@ -44,7 +44,6 @@
       </win>
    </launcher>
 
-
    <vm>
       <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</windows>
    </vm>
@@ -108,19 +107,9 @@
       <feature id="org.eclipse.platform"/>
       <feature id="org.eclipse.rcp"/>
       <feature id="org.eclipse.equinox.p2.user.ui"/>
-      <feature id="org.eclipse.help"/>
-      <feature id="org.eclipse.equinox.p2.core.feature"/>
-      <feature id="org.eclipse.ecf.core.ssl.feature"/>
-      <feature id="org.eclipse.ecf.filetransfer.ssl.feature"/>
-      <feature id="org.eclipse.equinox.p2.rcp.feature"/>
-      <feature id="org.eclipse.emf.common"/>
-      <feature id="org.eclipse.emf.ecore"/>
-      <feature id="org.eclipse.equinox.p2.extras.feature"/>
-      <feature id="org.eclipse.ecf.core.feature"/>
-      <feature id="org.eclipse.e4.rcp"/>
+      <feature id="org.eclipse.papyrus.sdk.feature"/>
       <feature id="org.eclipse.papyrus.sysml16.feature"/>
       <feature id="org.eclipse.papyrus.sysml16.rcp.feature"/>
-      <feature id="org.eclipse.papyrus.sdk.feature"/>
    </features>
 
    <configurations>
@@ -131,10 +120,10 @@
       <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
       <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
       <plugin id="org.eclipse.update.configurator" autoStart="true" startLevel="3" />
-      <property name="osgi.requiredJavaVersion" value="11" />
-      <property name="osgi.instance.area.default" value="@user.home/workspace-papyrus-sysml" />
-      <property name="org.eclipse.update.reconcile" value="false" />
       <property name="osgi.bundles.defaultStartLevel" value="4" />
+      <property name="osgi.instance.area.default" value="@user.home/workspace-papyrus-sysml" />
+      <property name="osgi.requiredJavaVersion" value="11" />
+      <property name="org.eclipse.update.reconcile" value="false" />
    </configurations>
 
    <repositories>
diff --git a/releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.target b/releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.target
index ab3dcc9..b6bca30 100755
--- a/releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.target
+++ b/releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.target
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="SysML 1.6 - 2021-03" sequenceNumber="1622626795">
+<target name="SysML 1.6 - 2021-03" sequenceNumber="1627050618">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
@@ -22,5 +22,9 @@
       <unit id="org.eclipse.papyrus.toolsmiths.feature.feature.group" version="0.0.0"/>
       <repository id="Papyrus-2021-03" location="https://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2021-03/"/>
     </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
+      <unit id="org.apache.xerces" version="2.9.0.v201101211617"/>
+      <repository id="orbit" location="https://download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository/"/>
+    </location>
   </locations>
 </target>
diff --git a/releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.tpd b/releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.tpd
index b1b25bd..a902a0e 100644
--- a/releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.tpd
+++ b/releng/targetplatform/org.eclipse.papyrus.sysml16.targetplatform.tpd
@@ -18,3 +18,7 @@
  org.eclipse.papyrus.sdk.feature.feature.group lazy
  org.eclipse.papyrus.toolsmiths.feature.feature.group lazy
 }
+
+location orbit "https://download.eclipse.org/tools/orbit/downloads/drops/R20210223232630/repository/" {
+ org.apache.xerces [2.9.0, 2.10.0)
+}