diff --git a/interface-definitions/include/bgp/afi-common-flowspec.xml.i b/interface-definitions/include/bgp/afi-common-flowspec.xml.i
index 9582274d1..819e5cbb5 100644
--- a/interface-definitions/include/bgp/afi-common-flowspec.xml.i
+++ b/interface-definitions/include/bgp/afi-common-flowspec.xml.i
@@ -1,29 +1,7 @@
-<!-- included start from bgp-afi-common-flowspec.xml.i -->
-<node name="filter-list">
-  <properties>
-    <help>as-path-list to filter route updates to/from this peer</help>
-  </properties>
-  <children>
-    <leafNode name="export">
-      <properties>
-        <help>As-path-list to filter outgoing route updates to this peer</help>
-        <completionHelp>
-          <path>policy as-path-list</path>
-        </completionHelp>
-      </properties>
-    </leafNode>
-    <leafNode name="import">
-      <properties>
-        <help>As-path-list to filter incoming route updates from this peer</help>
-        <completionHelp>
-          <path>policy as-path-list</path>
-        </completionHelp>
-      </properties>
-    </leafNode>
-  </children>
-</node>
+<!-- include start from bgp/afi-common-flowspec.xml.i -->
+#include <include/bgp/afi-filter-list.xml.i>
 #include <include/bgp/afi-route-map.xml.i>
 #include <include/bgp/afi-route-reflector-client.xml.i>
 #include <include/bgp/afi-route-server-client.xml.i>
 #include <include/bgp/afi-soft-reconfiguration.xml.i>
 <!-- included end -->
diff --git a/interface-definitions/include/bgp/afi-common.xml.i b/interface-definitions/include/bgp/afi-common.xml.i
index ac4a3fca0..20b0dda66 100644
--- a/interface-definitions/include/bgp/afi-common.xml.i
+++ b/interface-definitions/include/bgp/afi-common.xml.i
@@ -1,152 +1,130 @@
 <!-- include start from bgp/afi-common.xml.i -->
 <leafNode name="addpath-tx-all">
   <properties>
     <help>Use addpath to advertise all paths to a neighbor</help>
     <valueless/>
   </properties>
 </leafNode>
 <leafNode name="addpath-tx-per-as">
   <properties>
     <help>Use addpath to advertise the bestpath per each neighboring AS</help>
     <valueless/>
   </properties>
 </leafNode>
 #include <include/bgp/afi-allowas-in.xml.i>
 <leafNode name="as-override">
   <properties>
     <help>AS for routes sent to this peer to be the local AS</help>
     <valueless/>
   </properties>
 </leafNode>
 #include <include/bgp/afi-attribute-unchanged.xml.i>
 <node name="disable-send-community">
   <properties>
     <help>Disable sending community attributes to this peer</help>
   </properties>
   <children>
     <leafNode name="extended">
       <properties>
         <help>Disable sending extended community attributes to this peer</help>
         <valueless/>
       </properties>
     </leafNode>
     <leafNode name="standard">
       <properties>
         <help>Disable sending standard community attributes to this peer</help>
         <valueless/>
       </properties>
     </leafNode>
   </children>
 </node>
 <node name="distribute-list">
   <properties>
     <help>Access-list to filter route updates to/from this peer-group</help>
   </properties>
   <children>
     <leafNode name="export">
       <properties>
         <help>Access-list to filter outgoing route updates to this peer-group</help>
         <completionHelp>
           <path>policy access-list</path>
         </completionHelp>
         <valueHelp>
           <format>u32:1-65535</format>
           <description>Access-list to filter outgoing route updates to this peer-group</description>
         </valueHelp>
         <constraint>
           <validator name="numeric" argument="--range 1-65535"/>
         </constraint>
       </properties>
     </leafNode>
     <leafNode name="import">
       <properties>
         <help>Access-list to filter incoming route updates from this peer-group</help>
         <completionHelp>
           <path>policy access-list</path>
         </completionHelp>
         <valueHelp>
           <format>u32:1-65535</format>
           <description>Access-list to filter incoming route updates from this peer-group</description>
         </valueHelp>
         <constraint>
           <validator name="numeric" argument="--range 1-65535"/>
         </constraint>
       </properties>
     </leafNode>
   </children>
 </node>
-<node name="filter-list">
-  <properties>
-    <help>as-path-list to filter route updates to/from this peer</help>
-  </properties>
-  <children>
-    <leafNode name="export">
-      <properties>
-        <help>As-path-list to filter outgoing route updates to this peer</help>
-        <completionHelp>
-          <path>policy as-path-list</path>
-        </completionHelp>
-      </properties>
-    </leafNode>
-    <leafNode name="import">
-      <properties>
-        <help>As-path-list to filter incoming route updates from this peer</help>
-        <completionHelp>
-          <path>policy as-path-list</path>
-        </completionHelp>
-      </properties>
-    </leafNode>
-  </children>
-</node>
+#include <include/bgp/afi-filter-list.xml.i>
 <leafNode name="maximum-prefix">
   <properties>
     <help>Maximum number of prefixes to accept from this peer</help>
     <valueHelp>
       <format>u32:1-4294967295</format>
       <description>Prefix limit</description>
     </valueHelp>
     <constraint>
       <validator name="numeric" argument="--range 1-4294967295"/>
     </constraint>
   </properties>
 </leafNode>
 #include <include/bgp/afi-nexthop-self.xml.i>
 <leafNode name="remove-private-as">
   <properties>
     <help>Remove private AS numbers from AS path in outbound route updates</help>
     <valueless/>
   </properties>
 </leafNode>
 #include <include/bgp/afi-route-map.xml.i>
 #include <include/bgp/afi-route-reflector-client.xml.i>
 #include <include/bgp/afi-route-server-client.xml.i>
 #include <include/bgp/afi-soft-reconfiguration.xml.i>
 <leafNode name="unsuppress-map">
   <properties>
     <help>Route-map to selectively unsuppress suppressed routes</help>
     <completionHelp>
       <path>policy route-map</path>
     </completionHelp>
     <valueHelp>
       <format>txt</format>
       <description>Route map name</description>
     </valueHelp>
     <constraint>
       <regex>^[-_a-zA-Z0-9.]+$</regex>
     </constraint>
     <constraintErrorMessage>Name of route-map can only contain alpha-numeric letters, hyphen and underscores</constraintErrorMessage>
   </properties>
 </leafNode>
 <leafNode name="weight">
   <properties>
     <help>Default weight for routes from this peer</help>
     <valueHelp>
       <format>u32:1-65535</format>
       <description>Default weight</description>
     </valueHelp>
     <constraint>
       <validator name="numeric" argument="--range 1-65535"/>
     </constraint>
   </properties>
 </leafNode>
 <!-- include end -->
diff --git a/interface-definitions/include/bgp/afi-common-flowspec.xml.i b/interface-definitions/include/bgp/afi-filter-list.xml.i
similarity index 70%
copy from interface-definitions/include/bgp/afi-common-flowspec.xml.i
copy to interface-definitions/include/bgp/afi-filter-list.xml.i
index 9582274d1..df7619a1a 100644
--- a/interface-definitions/include/bgp/afi-common-flowspec.xml.i
+++ b/interface-definitions/include/bgp/afi-filter-list.xml.i
@@ -1,29 +1,25 @@
-<!-- included start from bgp-afi-common-flowspec.xml.i -->
+<!-- include start from bgp/afi-filter-list.xml.i -->
 <node name="filter-list">
   <properties>
     <help>as-path-list to filter route updates to/from this peer</help>
   </properties>
   <children>
     <leafNode name="export">
       <properties>
         <help>As-path-list to filter outgoing route updates to this peer</help>
         <completionHelp>
           <path>policy as-path-list</path>
         </completionHelp>
       </properties>
     </leafNode>
     <leafNode name="import">
       <properties>
         <help>As-path-list to filter incoming route updates from this peer</help>
         <completionHelp>
           <path>policy as-path-list</path>
         </completionHelp>
       </properties>
     </leafNode>
   </children>
 </node>
-#include <include/bgp/afi-route-map.xml.i>
-#include <include/bgp/afi-route-reflector-client.xml.i>
-#include <include/bgp/afi-route-server-client.xml.i>
-#include <include/bgp/afi-soft-reconfiguration.xml.i>
-<!-- included end -->
+<!-- include end -->