diff --git a/bundles/org.eclipse.emf.ecp.graphiti.integration/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.ecp.graphiti.integration/META-INF/MANIFEST.MF
index 6fd7377..c116078 100644
--- a/bundles/org.eclipse.emf.ecp.graphiti.integration/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.ecp.graphiti.integration/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@
  org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.300",
  org.eclipse.emf.edit.ui;bundle-version="2.8.0",
  org.eclipse.emf.databinding.edit;bundle-version="1.2.0",
- org.eclipse.emf.ecp.graphiti.core;bundle-version="[1.23.0,1.24.0)",
+ org.eclipse.emf.ecp.graphiti.core;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.emf.ecp.ui;bundle-version="[1.23.0,1.24.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: org.eclipse.emf.ecp.graphiti.integration
diff --git a/bundles/org.eclipse.emf.ecp.view.template.model/.settings/.api_filters b/bundles/org.eclipse.emf.ecp.view.template.model/.settings/.api_filters
index c5eb0d1..9e5abcc 100644
--- a/bundles/org.eclipse.emf.ecp.view.template.model/.settings/.api_filters
+++ b/bundles/org.eclipse.emf.ecp.view.template.model/.settings/.api_filters
@@ -43,6 +43,12 @@
                 <message_argument value="org.eclipse.emf.ecore.xmi"/>
             </message_arguments>
         </filter>
+        <filter id="927989779">
+            <message_arguments>
+                <message_argument value="1.23.0"/>
+                <message_argument value="org.eclipse.emf.ecore.xmi"/>
+            </message_arguments>
+        </filter>
     </resource>
     <resource path="META-INF/MANIFEST.MF" type="org.eclipse.emf.ecp.view.spi.model.reporting.AbstractReport">
         <filter comment="SPI Change in 1.6" id="305422471">
diff --git a/bundles/org.eclipse.emfforms.swt.reference.table/.settings/.api_filters b/bundles/org.eclipse.emfforms.swt.reference.table/.settings/.api_filters
new file mode 100644
index 0000000..fbb74bb
--- /dev/null
+++ b/bundles/org.eclipse.emfforms.swt.reference.table/.settings/.api_filters
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.emfforms.swt.reference.table" version="2">
+    <resource path="src/org/eclipse/emfforms/swt/internal/reference/table/DummyDomainExpander.java" type="org.eclipse.emfforms.swt.internal.reference.table.DummyDomainExpander">
+        <filter comment="Fixed since tags that were missing" id="1108344834">
+            <message_arguments>
+                <message_argument value="1.22"/>
+                <message_argument value="1.23"/>
+                <message_argument value="org.eclipse.emfforms.swt.internal.reference.table.DummyDomainExpander"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/emfforms/swt/internal/reference/table/SelectionTableCompositeStrategyProvider.java" type="org.eclipse.emfforms.swt.internal.reference.table.SelectionTableCompositeStrategyProvider">
+        <filter comment="Fixed since tags that were missing" id="1108344834">
+            <message_arguments>
+                <message_argument value="1.22"/>
+                <message_argument value="1.23"/>
+                <message_argument value="org.eclipse.emfforms.swt.internal.reference.table.SelectionTableCompositeStrategyProvider"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/emfforms/swt/internal/reference/table/TableSelectionCompositeImpl.java" type="org.eclipse.emfforms.swt.internal.reference.table.TableSelectionCompositeImpl">
+        <filter comment="Fixed since tags that were missing" id="1108344834">
+            <message_arguments>
+                <message_argument value="1.22"/>
+                <message_argument value="1.23"/>
+                <message_argument value="org.eclipse.emfforms.swt.internal.reference.table.TableSelectionCompositeImpl"/>
+            </message_arguments>
+        </filter>
+    </resource>
+</component>
diff --git a/bundles/org.eclipse.emfforms.swt.reference.table/src/org/eclipse/emfforms/swt/internal/reference/table/DummyDomainExpander.java b/bundles/org.eclipse.emfforms.swt.reference.table/src/org/eclipse/emfforms/swt/internal/reference/table/DummyDomainExpander.java
index a0c4839..3d002c4 100644
--- a/bundles/org.eclipse.emfforms.swt.reference.table/src/org/eclipse/emfforms/swt/internal/reference/table/DummyDomainExpander.java
+++ b/bundles/org.eclipse.emfforms.swt.reference.table/src/org/eclipse/emfforms/swt/internal/reference/table/DummyDomainExpander.java
@@ -22,8 +22,9 @@
 
 /**
  * Dummy Domain expander doing nothing because we do not need to expand the extent segments.
- * 
+ *
  * @author Lucas Koehler
+ * @since 1.22
  *
  */
 public class DummyDomainExpander implements EMFFormsDMRSegmentExpander {
diff --git a/bundles/org.eclipse.emfforms.swt.reference.table/src/org/eclipse/emfforms/swt/internal/reference/table/SelectionTableCompositeStrategyProvider.java b/bundles/org.eclipse.emfforms.swt.reference.table/src/org/eclipse/emfforms/swt/internal/reference/table/SelectionTableCompositeStrategyProvider.java
index 0c902e6..e64fac3 100644
--- a/bundles/org.eclipse.emfforms.swt.reference.table/src/org/eclipse/emfforms/swt/internal/reference/table/SelectionTableCompositeStrategyProvider.java
+++ b/bundles/org.eclipse.emfforms.swt.reference.table/src/org/eclipse/emfforms/swt/internal/reference/table/SelectionTableCompositeStrategyProvider.java
@@ -46,6 +46,8 @@
 /**
  * Provider of a selection composite strategy that builds a selection table viewer
  * from a {@linkplain VTableControl table control model}.
+ * 
+ * @since 1.22
  */
 @Component(name = "selectionTableCompositeStrategyProvider")
 public class SelectionTableCompositeStrategyProvider implements SelectionCompositeStrategy.Provider {
diff --git a/bundles/org.eclipse.emfforms.swt.reference.table/src/org/eclipse/emfforms/swt/internal/reference/table/TableSelectionCompositeImpl.java b/bundles/org.eclipse.emfforms.swt.reference.table/src/org/eclipse/emfforms/swt/internal/reference/table/TableSelectionCompositeImpl.java
index 114cf07..e98d8e2 100644
--- a/bundles/org.eclipse.emfforms.swt.reference.table/src/org/eclipse/emfforms/swt/internal/reference/table/TableSelectionCompositeImpl.java
+++ b/bundles/org.eclipse.emfforms.swt.reference.table/src/org/eclipse/emfforms/swt/internal/reference/table/TableSelectionCompositeImpl.java
@@ -81,6 +81,8 @@
 
 /**
  * Implementation of a table selection composite that is described by a view model.
+ * 
+ * @since 1.22
  */
 public class TableSelectionCompositeImpl extends SelectModelElementCompositeImpl {