diff --git a/plugins/org.eclipse.graphiti.pattern/.settings/.api_filters b/plugins/org.eclipse.graphiti.pattern/.settings/.api_filters
index c6e8ac4..a721b87 100644
--- a/plugins/org.eclipse.graphiti.pattern/.settings/.api_filters
+++ b/plugins/org.eclipse.graphiti.pattern/.settings/.api_filters
@@ -13,6 +13,12 @@
                 <message_argument value="0.15.0"/>
             </message_arguments>
         </filter>
+        <filter id="923795461">
+            <message_arguments>
+                <message_argument value="0.18.0"/>
+                <message_argument value="0.15.0"/>
+            </message_arguments>
+        </filter>
     </resource>
     <resource path="META-INF/MANIFEST.MF" type="org.eclipse.graphiti.pattern.ICustomUndoablePattern">
         <filter comment="Removal of deprecated ICustomUndoableFeature" id="305324134">
@@ -27,6 +33,12 @@
                 <message_argument value="org.eclipse.graphiti.pattern_0.17.0"/>
             </message_arguments>
         </filter>
+        <filter id="305324134">
+            <message_arguments>
+                <message_argument value="org.eclipse.graphiti.pattern.ICustomUndoablePattern"/>
+                <message_argument value="org.eclipse.graphiti.pattern_0.18.0"/>
+            </message_arguments>
+        </filter>
     </resource>
     <resource path="src/org/eclipse/graphiti/pattern/AbstractBasePattern.java" type="org.eclipse.graphiti.pattern.AbstractBasePattern">
         <filter id="574619656">
@@ -60,6 +72,12 @@
                 <message_argument value="org.eclipse.graphiti.pattern.AddFeatureForPattern"/>
             </message_arguments>
         </filter>
+        <filter id="337682486">
+            <message_arguments>
+                <message_argument value="org.eclipse.graphiti.pattern.AddFeatureForPattern"/>
+                <message_argument value="org.eclipse.graphiti.features.ICustomUndoableFeature"/>
+            </message_arguments>
+        </filter>
         <filter comment="Removal of deprecated ICustomUndoableFeature" id="338792546">
             <message_arguments>
                 <message_argument value="org.eclipse.graphiti.pattern.AddFeatureForPattern"/>
@@ -79,6 +97,12 @@
                 <message_argument value="org.eclipse.graphiti.pattern.CreateConnectionFeatureForPattern"/>
             </message_arguments>
         </filter>
+        <filter id="337682486">
+            <message_arguments>
+                <message_argument value="org.eclipse.graphiti.pattern.CreateConnectionFeatureForPattern"/>
+                <message_argument value="org.eclipse.graphiti.features.ICustomUndoableFeature"/>
+            </message_arguments>
+        </filter>
         <filter comment="Removal of deprecated ICustomUndoableFeature" id="338792546">
             <message_arguments>
                 <message_argument value="org.eclipse.graphiti.pattern.CreateConnectionFeatureForPattern"/>
@@ -98,6 +122,12 @@
                 <message_argument value="org.eclipse.graphiti.pattern.CreateFeatureForPattern"/>
             </message_arguments>
         </filter>
+        <filter id="337682486">
+            <message_arguments>
+                <message_argument value="org.eclipse.graphiti.pattern.CreateFeatureForPattern"/>
+                <message_argument value="org.eclipse.graphiti.features.ICustomUndoableFeature"/>
+            </message_arguments>
+        </filter>
         <filter comment="Removal of deprecated ICustomUndoableFeature" id="338792546">
             <message_arguments>
                 <message_argument value="org.eclipse.graphiti.pattern.CreateFeatureForPattern"/>
@@ -117,6 +147,12 @@
                 <message_argument value="org.eclipse.graphiti.pattern.DeleteFeatureForPattern"/>
             </message_arguments>
         </filter>
+        <filter id="337682486">
+            <message_arguments>
+                <message_argument value="org.eclipse.graphiti.pattern.DeleteFeatureForPattern"/>
+                <message_argument value="org.eclipse.graphiti.features.ICustomUndoableFeature"/>
+            </message_arguments>
+        </filter>
         <filter comment="Removal of deprecated ICustomUndoableFeature" id="338792546">
             <message_arguments>
                 <message_argument value="org.eclipse.graphiti.pattern.DeleteFeatureForPattern"/>
@@ -136,6 +172,12 @@
                 <message_argument value="org.eclipse.graphiti.pattern.DirectEditingFeatureForPattern"/>
             </message_arguments>
         </filter>
+        <filter id="337682486">
+            <message_arguments>
+                <message_argument value="org.eclipse.graphiti.pattern.DirectEditingFeatureForPattern"/>
+                <message_argument value="org.eclipse.graphiti.features.ICustomUndoableFeature"/>
+            </message_arguments>
+        </filter>
         <filter comment="Removal of deprecated ICustomUndoableFeature" id="338792546">
             <message_arguments>
                 <message_argument value="org.eclipse.graphiti.pattern.DirectEditingFeatureForPattern"/>
@@ -225,6 +267,12 @@
                 <message_argument value="org.eclipse.graphiti.pattern.LayoutFeatureForPattern"/>
             </message_arguments>
         </filter>
+        <filter id="337682486">
+            <message_arguments>
+                <message_argument value="org.eclipse.graphiti.pattern.LayoutFeatureForPattern"/>
+                <message_argument value="org.eclipse.graphiti.features.ICustomUndoableFeature"/>
+            </message_arguments>
+        </filter>
         <filter comment="Removal of deprecated ICustomUndoableFeature" id="338792546">
             <message_arguments>
                 <message_argument value="org.eclipse.graphiti.pattern.LayoutFeatureForPattern"/>
@@ -244,6 +292,12 @@
                 <message_argument value="org.eclipse.graphiti.pattern.MoveShapeFeatureForPattern"/>
             </message_arguments>
         </filter>
+        <filter id="337682486">
+            <message_arguments>
+                <message_argument value="org.eclipse.graphiti.pattern.MoveShapeFeatureForPattern"/>
+                <message_argument value="org.eclipse.graphiti.features.ICustomUndoableFeature"/>
+            </message_arguments>
+        </filter>
         <filter comment="Removal of deprecated ICustomUndoableFeature" id="338792546">
             <message_arguments>
                 <message_argument value="org.eclipse.graphiti.pattern.MoveShapeFeatureForPattern"/>
@@ -263,6 +317,12 @@
                 <message_argument value="org.eclipse.graphiti.pattern.ReconnectionFeatureForPattern"/>
             </message_arguments>
         </filter>
+        <filter id="337682486">
+            <message_arguments>
+                <message_argument value="org.eclipse.graphiti.pattern.ReconnectionFeatureForPattern"/>
+                <message_argument value="org.eclipse.graphiti.features.ICustomUndoableFeature"/>
+            </message_arguments>
+        </filter>
         <filter comment="Removal of deprecated ICustomUndoableFeature" id="338792546">
             <message_arguments>
                 <message_argument value="org.eclipse.graphiti.pattern.ReconnectionFeatureForPattern"/>
@@ -288,6 +348,12 @@
                 <message_argument value="org.eclipse.graphiti.pattern.RemoveFeatureForPattern"/>
             </message_arguments>
         </filter>
+        <filter id="337682486">
+            <message_arguments>
+                <message_argument value="org.eclipse.graphiti.pattern.RemoveFeatureForPattern"/>
+                <message_argument value="org.eclipse.graphiti.features.ICustomUndoableFeature"/>
+            </message_arguments>
+        </filter>
         <filter comment="Removal of deprecated ICustomUndoableFeature" id="338792546">
             <message_arguments>
                 <message_argument value="org.eclipse.graphiti.pattern.RemoveFeatureForPattern"/>
@@ -307,6 +373,12 @@
                 <message_argument value="org.eclipse.graphiti.pattern.ResizeShapeFeatureForPattern"/>
             </message_arguments>
         </filter>
+        <filter id="337682486">
+            <message_arguments>
+                <message_argument value="org.eclipse.graphiti.pattern.ResizeShapeFeatureForPattern"/>
+                <message_argument value="org.eclipse.graphiti.features.ICustomUndoableFeature"/>
+            </message_arguments>
+        </filter>
         <filter comment="Removal of deprecated ICustomUndoableFeature" id="338792546">
             <message_arguments>
                 <message_argument value="org.eclipse.graphiti.pattern.ResizeShapeFeatureForPattern"/>
@@ -326,6 +398,12 @@
                 <message_argument value="org.eclipse.graphiti.pattern.UpdateFeatureForPattern"/>
             </message_arguments>
         </filter>
+        <filter id="337682486">
+            <message_arguments>
+                <message_argument value="org.eclipse.graphiti.pattern.UpdateFeatureForPattern"/>
+                <message_argument value="org.eclipse.graphiti.features.ICustomUndoableFeature"/>
+            </message_arguments>
+        </filter>
         <filter comment="Removal of deprecated ICustomUndoableFeature" id="338792546">
             <message_arguments>
                 <message_argument value="org.eclipse.graphiti.pattern.UpdateFeatureForPattern"/>
diff --git a/plugins/org.eclipse.graphiti/.settings/.api_filters b/plugins/org.eclipse.graphiti/.settings/.api_filters
index 72b2ebe..f14ff69 100644
--- a/plugins/org.eclipse.graphiti/.settings/.api_filters
+++ b/plugins/org.eclipse.graphiti/.settings/.api_filters
@@ -21,6 +21,12 @@
                 <message_argument value="org.eclipse.graphiti_0.17.0"/>
             </message_arguments>
         </filter>
+        <filter id="305324134">
+            <message_arguments>
+                <message_argument value="org.eclipse.graphiti.features.ICustomUndoableFeature"/>
+                <message_argument value="org.eclipse.graphiti_0.18.0"/>
+            </message_arguments>
+        </filter>
     </resource>
     <resource path="src/org/eclipse/graphiti/features/context/impl/DeleteContext.java" type="org.eclipse.graphiti.features.context.impl.DeleteContext">
         <filter id="576720909">
@@ -78,5 +84,12 @@
                 <message_argument value="getSelections(PictogramElement)"/>
             </message_arguments>
         </filter>
+        <filter id="1209008130">
+            <message_arguments>
+                <message_argument value="0.16"/>
+                <message_argument value="0.18"/>
+                <message_argument value="getSelections(PictogramElement)"/>
+            </message_arguments>
+        </filter>
     </resource>
 </component>