diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricConstants.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricConstants.java
index 5b29faa..0c0b380 100644
--- a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricConstants.java
+++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricConstants.java
@@ -78,52 +78,48 @@
     public static final PiMatchFieldId HDR_ETHERNET_DST_ADDR =
             PiMatchFieldId.of("hdr.ethernet.dst_addr");
     // Table IDs
+    public static final PiTableId FABRIC_INGRESS_FORWARDING_ACL =
+            PiTableId.of("FabricIngress.forwarding.acl");
     public static final PiTableId FABRIC_INGRESS_NEXT_HASHED =
             PiTableId.of("FabricIngress.next.hashed");
-    public static final PiTableId FABRIC_INGRESS_FORWARDING_MULTICAST_V4 =
-            PiTableId.of("FabricIngress.forwarding.multicast_v4");
-    public static final PiTableId FABRIC_INGRESS_FORWARDING_MULTICAST_V6 =
-            PiTableId.of("FabricIngress.forwarding.multicast_v6");
-    public static final PiTableId FABRIC_EGRESS_PROCESS_INT_SOURCE_TB_INT_SOURCE =
-            PiTableId.of("FabricEgress.process_int_source.tb_int_source");
-    public static final PiTableId FABRIC_INGRESS_FILTERING_FWD_CLASSIFIER =
-            PiTableId.of("FabricIngress.filtering.fwd_classifier");
-    public static final PiTableId FABRIC_INGRESS_FORWARDING_UNICAST_V4 =
-            PiTableId.of("FabricIngress.forwarding.unicast_v4");
-    public static final PiTableId FABRIC_INGRESS_FORWARDING_UNICAST_V6 =
-            PiTableId.of("FabricIngress.forwarding.unicast_v6");
-    public static final PiTableId FABRIC_INGRESS_NEXT_SIMPLE =
-            PiTableId.of("FabricIngress.next.simple");
-    public static final PiTableId FABRIC_INGRESS_NEXT_MULTICAST =
-            PiTableId.of("FabricIngress.next.multicast");
     public static final PiTableId FABRIC_INGRESS_FORWARDING_MPLS =
             PiTableId.of("FabricIngress.forwarding.mpls");
+    public static final PiTableId FABRIC_INGRESS_PROCESS_SET_SOURCE_SINK_TB_SET_SINK =
+            PiTableId.of("FabricIngress.process_set_source_sink.tb_set_sink");
+    public static final PiTableId FABRIC_INGRESS_FORWARDING_ROUTING_V4 =
+            PiTableId.of("FabricIngress.forwarding.routing_v4");
+    public static final PiTableId FABRIC_INGRESS_NEXT_SIMPLE =
+            PiTableId.of("FabricIngress.next.simple");
+    public static final PiTableId FABRIC_EGRESS_PROCESS_INT_SOURCE_TB_INT_SOURCE =
+            PiTableId.of("FabricEgress.process_int_source.tb_int_source");
     public static final PiTableId FABRIC_EGRESS_PROCESS_INT_TRANSIT_TB_INT_INST_0003 =
             PiTableId.of("FabricEgress.process_int_transit.tb_int_inst_0003");
+    public static final PiTableId FABRIC_EGRESS_PROCESS_INT_TRANSIT_TB_INT_INSERT =
+            PiTableId.of("FabricEgress.process_int_transit.tb_int_insert");
+    public static final PiTableId FABRIC_INGRESS_FILTERING_FWD_CLASSIFIER =
+            PiTableId.of("FabricIngress.filtering.fwd_classifier");
+    public static final PiTableId FABRIC_INGRESS_PROCESS_SET_SOURCE_SINK_TB_SET_SOURCE =
+            PiTableId.of("FabricIngress.process_set_source_sink.tb_set_source");
+    public static final PiTableId FABRIC_EGRESS_PROCESS_INT_REPORT_TB_GENERATE_REPORT =
+            PiTableId.of("FabricEgress.process_int_report.tb_generate_report");
+    public static final PiTableId FABRIC_INGRESS_FORWARDING_BRIDGING =
+            PiTableId.of("FabricIngress.forwarding.bridging");
     public static final PiTableId FABRIC_INGRESS_SPGW_INGRESS_S1U_FILTER_TABLE =
             PiTableId.of("FabricIngress.spgw_ingress.s1u_filter_table");
     public static final PiTableId FABRIC_INGRESS_FILTERING_INGRESS_PORT_VLAN =
             PiTableId.of("FabricIngress.filtering.ingress_port_vlan");
-    public static final PiTableId FABRIC_INGRESS_FORWARDING_ACL =
-            PiTableId.of("FabricIngress.forwarding.acl");
-    public static final PiTableId FABRIC_EGRESS_PROCESS_INT_REPORT_TB_GENERATE_REPORT =
-            PiTableId.of("FabricEgress.process_int_report.tb_generate_report");
-    public static final PiTableId FABRIC_EGRESS_PROCESS_INT_TRANSIT_TB_INT_INST_0407 =
-            PiTableId.of("FabricEgress.process_int_transit.tb_int_inst_0407");
-    public static final PiTableId FABRIC_INGRESS_FORWARDING_BRIDGING =
-            PiTableId.of("FabricIngress.forwarding.bridging");
     public static final PiTableId FABRIC_INGRESS_SPGW_INGRESS_DL_SESS_LOOKUP =
             PiTableId.of("FabricIngress.spgw_ingress.dl_sess_lookup");
-    public static final PiTableId FABRIC_EGRESS_PROCESS_INT_TRANSIT_TB_INT_INSERT =
-            PiTableId.of("FabricEgress.process_int_transit.tb_int_insert");
-    public static final PiTableId FABRIC_INGRESS_NEXT_VLAN_META =
-            PiTableId.of("FabricIngress.next.vlan_meta");
+    public static final PiTableId FABRIC_EGRESS_PROCESS_INT_TRANSIT_TB_INT_INST_0407 =
+            PiTableId.of("FabricEgress.process_int_transit.tb_int_inst_0407");
     public static final PiTableId FABRIC_EGRESS_EGRESS_NEXT_EGRESS_VLAN =
             PiTableId.of("FabricEgress.egress_next.egress_vlan");
-    public static final PiTableId FABRIC_INGRESS_PROCESS_SET_SOURCE_SINK_TB_SET_SINK =
-            PiTableId.of("FabricIngress.process_set_source_sink.tb_set_sink");
-    public static final PiTableId FABRIC_INGRESS_PROCESS_SET_SOURCE_SINK_TB_SET_SOURCE =
-            PiTableId.of("FabricIngress.process_set_source_sink.tb_set_source");
+    public static final PiTableId FABRIC_INGRESS_NEXT_MULTICAST =
+            PiTableId.of("FabricIngress.next.multicast");
+    public static final PiTableId FABRIC_INGRESS_NEXT_VLAN_META =
+            PiTableId.of("FabricIngress.next.vlan_meta");
+    public static final PiTableId FABRIC_INGRESS_FORWARDING_ROUTING_V6 =
+            PiTableId.of("FabricIngress.forwarding.routing_v6");
     // Indirect Counter IDs
     public static final PiCounterId FABRIC_INGRESS_PORT_COUNTERS_CONTROL_EGRESS_PORT_COUNTER =
             PiCounterId.of("FabricIngress.port_counters_control.egress_port_counter");
@@ -134,40 +130,36 @@
             PiCounterId.of("FabricIngress.forwarding.acl_counter");
     public static final PiCounterId FABRIC_INGRESS_NEXT_MULTICAST_COUNTER =
             PiCounterId.of("FabricIngress.next.multicast_counter");
-    public static final PiCounterId FABRIC_EGRESS_PROCESS_INT_TRANSIT_COUNTER_INT_INST_0407 =
-            PiCounterId.of("FabricEgress.process_int_transit.counter_int_inst_0407");
-    public static final PiCounterId FABRIC_INGRESS_FORWARDING_UNICAST_V6_COUNTER =
-            PiCounterId.of("FabricIngress.forwarding.unicast_v6_counter");
+    public static final PiCounterId FABRIC_INGRESS_NEXT_VLAN_META_COUNTER =
+            PiCounterId.of("FabricIngress.next.vlan_meta_counter");
     public static final PiCounterId FABRIC_INGRESS_FILTERING_FWD_CLASSIFIER_COUNTER =
             PiCounterId.of("FabricIngress.filtering.fwd_classifier_counter");
     public static final PiCounterId FABRIC_INGRESS_FORWARDING_BRIDGING_COUNTER =
             PiCounterId.of("FabricIngress.forwarding.bridging_counter");
-    public static final PiCounterId FABRIC_INGRESS_FORWARDING_MULTICAST_V6_COUNTER =
-            PiCounterId.of("FabricIngress.forwarding.multicast_v6_counter");
+    public static final PiCounterId FABRIC_INGRESS_FORWARDING_ROUTING_V4_COUNTER =
+            PiCounterId.of("FabricIngress.forwarding.routing_v4_counter");
     public static final PiCounterId FABRIC_INGRESS_PROCESS_SET_SOURCE_SINK_COUNTER_SET_SOURCE =
             PiCounterId.of("FabricIngress.process_set_source_sink.counter_set_source");
-    public static final PiCounterId FABRIC_INGRESS_FORWARDING_MULTICAST_V4_COUNTER =
-            PiCounterId.of("FabricIngress.forwarding.multicast_v4_counter");
+    public static final PiCounterId FABRIC_EGRESS_PROCESS_INT_TRANSIT_COUNTER_INT_INST_0407 =
+            PiCounterId.of("FabricEgress.process_int_transit.counter_int_inst_0407");
     public static final PiCounterId FABRIC_INGRESS_SPGW_INGRESS_UE_COUNTER =
             PiCounterId.of("FabricIngress.spgw_ingress.ue_counter");
     public static final PiCounterId FABRIC_EGRESS_EGRESS_NEXT_EGRESS_VLAN_COUNTER =
             PiCounterId.of("FabricEgress.egress_next.egress_vlan_counter");
-    public static final PiCounterId FABRIC_EGRESS_PROCESS_INT_TRANSIT_COUNTER_INT_INSERT =
-            PiCounterId.of("FabricEgress.process_int_transit.counter_int_insert");
-    public static final PiCounterId FABRIC_INGRESS_PROCESS_SET_SOURCE_SINK_COUNTER_SET_SINK =
-            PiCounterId.of("FabricIngress.process_set_source_sink.counter_set_sink");
-    public static final PiCounterId FABRIC_INGRESS_NEXT_VLAN_META_COUNTER =
-            PiCounterId.of("FabricIngress.next.vlan_meta_counter");
-    public static final PiCounterId FABRIC_EGRESS_PROCESS_INT_SOURCE_COUNTER_INT_SOURCE =
-            PiCounterId.of("FabricEgress.process_int_source.counter_int_source");
-    public static final PiCounterId FABRIC_INGRESS_FORWARDING_UNICAST_V4_COUNTER =
-            PiCounterId.of("FabricIngress.forwarding.unicast_v4_counter");
     public static final PiCounterId FABRIC_INGRESS_NEXT_SIMPLE_COUNTER =
             PiCounterId.of("FabricIngress.next.simple_counter");
-    public static final PiCounterId FABRIC_INGRESS_FILTERING_INGRESS_PORT_VLAN_COUNTER =
-            PiCounterId.of("FabricIngress.filtering.ingress_port_vlan_counter");
+    public static final PiCounterId FABRIC_INGRESS_PROCESS_SET_SOURCE_SINK_COUNTER_SET_SINK =
+            PiCounterId.of("FabricIngress.process_set_source_sink.counter_set_sink");
+    public static final PiCounterId FABRIC_EGRESS_PROCESS_INT_TRANSIT_COUNTER_INT_INSERT =
+            PiCounterId.of("FabricEgress.process_int_transit.counter_int_insert");
+    public static final PiCounterId FABRIC_EGRESS_PROCESS_INT_SOURCE_COUNTER_INT_SOURCE =
+            PiCounterId.of("FabricEgress.process_int_source.counter_int_source");
     public static final PiCounterId FABRIC_EGRESS_PROCESS_INT_TRANSIT_COUNTER_INT_INST_0003 =
             PiCounterId.of("FabricEgress.process_int_transit.counter_int_inst_0003");
+    public static final PiCounterId FABRIC_INGRESS_FORWARDING_ROUTING_V6_COUNTER =
+            PiCounterId.of("FabricIngress.forwarding.routing_v6_counter");
+    public static final PiCounterId FABRIC_INGRESS_FILTERING_INGRESS_PORT_VLAN_COUNTER =
+            PiCounterId.of("FabricIngress.filtering.ingress_port_vlan_counter");
     public static final PiCounterId FABRIC_INGRESS_FORWARDING_MPLS_COUNTER =
             PiCounterId.of("FabricIngress.forwarding.mpls_counter");
     public static final PiCounterId FABRIC_INGRESS_NEXT_HASHED_COUNTER =
@@ -237,8 +229,12 @@
             PiActionId.of("FabricEgress.process_int_transit.int_set_header_0407_i3");
     public static final PiActionId FABRIC_INGRESS_NEXT_SET_MCAST_GROUP =
             PiActionId.of("FabricIngress.next.set_mcast_group");
+    public static final PiActionId FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_ROUTING_V4 =
+            PiActionId.of("FabricIngress.forwarding.set_next_id_routing_v4");
     public static final PiActionId FABRIC_EGRESS_PROCESS_INT_OUTER_ENCAP_INT_UPDATE_UDP =
             PiActionId.of("FabricEgress.process_int_outer_encap.int_update_udp");
+    public static final PiActionId FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_ROUTING_V6 =
+            PiActionId.of("FabricIngress.forwarding.set_next_id_routing_v6");
     public static final PiActionId FABRIC_INGRESS_SPGW_INGRESS_SET_DL_SESS_INFO =
             PiActionId.of("FabricIngress.spgw_ingress.set_dl_sess_info");
     public static final PiActionId FABRIC_INGRESS_FILTERING_PUSH_INTERNAL_VLAN =
@@ -272,12 +268,8 @@
             PiActionId.of("FabricEgress.process_int_outer_encap.int_update_shim");
     public static final PiActionId FABRIC_INGRESS_NEXT_MPLS_ROUTING_V4_HASHED =
             PiActionId.of("FabricIngress.next.mpls_routing_v4_hashed");
-    public static final PiActionId FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_UNICAST_V6 =
-            PiActionId.of("FabricIngress.forwarding.set_next_id_unicast_v6");
     public static final PiActionId FABRIC_INGRESS_PROCESS_SET_SOURCE_SINK_INT_SET_SOURCE =
             PiActionId.of("FabricIngress.process_set_source_sink.int_set_source");
-    public static final PiActionId FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_UNICAST_V4 =
-            PiActionId.of("FabricIngress.forwarding.set_next_id_unicast_v4");
     public static final PiActionId NOP = PiActionId.of("nop");
     public static final PiActionId FABRIC_INGRESS_FORWARDING_DROP =
             PiActionId.of("FabricIngress.forwarding.drop");
@@ -308,12 +300,8 @@
     public static final PiActionId FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_SET_HEADER_0003_I2 =
             PiActionId.of("FabricEgress.process_int_transit.int_set_header_0003_i2");
     public static final PiActionId NO_ACTION = PiActionId.of("NoAction");
-    public static final PiActionId FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_MULTICAST_V6 =
-            PiActionId.of("FabricIngress.forwarding.set_next_id_multicast_v6");
     public static final PiActionId FABRIC_EGRESS_PROCESS_INT_TRANSIT_INT_TRANSIT =
             PiActionId.of("FabricEgress.process_int_transit.int_transit");
-    public static final PiActionId FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_MULTICAST_V4 =
-            PiActionId.of("FabricIngress.forwarding.set_next_id_multicast_v4");
     public static final PiActionId FABRIC_INGRESS_NEXT_MPLS_ROUTING_V4_SIMPLE =
             PiActionId.of("FabricIngress.next.mpls_routing_v4_simple");
     public static final PiActionId FABRIC_INGRESS_FORWARDING_NOP_ACL =
diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricInterpreter.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricInterpreter.java
index 6031afd..b3f996d 100644
--- a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricInterpreter.java
+++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/FabricInterpreter.java
@@ -70,18 +70,16 @@
                     .put(1, FabricConstants.FABRIC_INGRESS_FILTERING_FWD_CLASSIFIER)
                     // Forwarding
                     .put(2, FabricConstants.FABRIC_INGRESS_FORWARDING_MPLS)
-                    .put(3, FabricConstants.FABRIC_INGRESS_FORWARDING_UNICAST_V4)
-                    .put(4, FabricConstants.FABRIC_INGRESS_FORWARDING_UNICAST_V6)
-                    .put(5, FabricConstants.FABRIC_INGRESS_FORWARDING_MULTICAST_V4)
-                    .put(6, FabricConstants.FABRIC_INGRESS_FORWARDING_MULTICAST_V6)
-                    .put(7, FabricConstants.FABRIC_INGRESS_FORWARDING_BRIDGING)
-                    .put(8, FabricConstants.FABRIC_INGRESS_FORWARDING_ACL)
+                    .put(3, FabricConstants.FABRIC_INGRESS_FORWARDING_ROUTING_V4)
+                    .put(4, FabricConstants.FABRIC_INGRESS_FORWARDING_ROUTING_V6)
+                    .put(5, FabricConstants.FABRIC_INGRESS_FORWARDING_BRIDGING)
+                    .put(6, FabricConstants.FABRIC_INGRESS_FORWARDING_ACL)
                     // Next
-                    .put(9, FabricConstants.FABRIC_INGRESS_NEXT_VLAN_META)
-                    .put(10, FabricConstants.FABRIC_INGRESS_NEXT_SIMPLE)
-                    .put(11, FabricConstants.FABRIC_INGRESS_NEXT_HASHED)
-                    .put(12, FabricConstants.FABRIC_INGRESS_NEXT_MULTICAST)
-                    .put(13, FabricConstants.FABRIC_EGRESS_EGRESS_NEXT_EGRESS_VLAN)
+                    .put(7, FabricConstants.FABRIC_INGRESS_NEXT_VLAN_META)
+                    .put(8, FabricConstants.FABRIC_INGRESS_NEXT_SIMPLE)
+                    .put(9, FabricConstants.FABRIC_INGRESS_NEXT_HASHED)
+                    .put(10, FabricConstants.FABRIC_INGRESS_NEXT_MULTICAST)
+                    .put(11, FabricConstants.FABRIC_EGRESS_EGRESS_NEXT_EGRESS_VLAN)
                     .build();
 
     private static final Set<PiTableId> FILTERING_CTRL_TBLS =
@@ -89,10 +87,8 @@
                             FabricConstants.FABRIC_INGRESS_FILTERING_FWD_CLASSIFIER);
     private static final Set<PiTableId> FORWARDING_CTRL_TBLS =
             ImmutableSet.of(FabricConstants.FABRIC_INGRESS_FORWARDING_MPLS,
-                            FabricConstants.FABRIC_INGRESS_FORWARDING_UNICAST_V4,
-                            FabricConstants.FABRIC_INGRESS_FORWARDING_UNICAST_V6,
-                            FabricConstants.FABRIC_INGRESS_FORWARDING_MULTICAST_V4,
-                            FabricConstants.FABRIC_INGRESS_FORWARDING_MULTICAST_V6,
+                            FabricConstants.FABRIC_INGRESS_FORWARDING_ROUTING_V4,
+                            FabricConstants.FABRIC_INGRESS_FORWARDING_ROUTING_V6,
                             FabricConstants.FABRIC_INGRESS_FORWARDING_BRIDGING,
                             FabricConstants.FABRIC_INGRESS_FORWARDING_ACL);
     private static final Set<PiTableId> NEXT_CTRL_TBLS =
@@ -106,8 +102,8 @@
     private static final ImmutableMap<Criterion.Type, PiMatchFieldId> CRITERION_MAP =
             ImmutableMap.<Criterion.Type, PiMatchFieldId>builder()
                     .put(Criterion.Type.IN_PORT, FabricConstants.STANDARD_METADATA_INGRESS_PORT)
-                    .put(Criterion.Type.ETH_DST, FabricConstants.HDR_ETHERNET_DST_ADDR)
-                    .put(Criterion.Type.ETH_SRC, FabricConstants.HDR_ETHERNET_SRC_ADDR)
+                    .put(Criterion.Type.ETH_DST_MASKED, FabricConstants.HDR_ETHERNET_DST_ADDR)
+                    .put(Criterion.Type.ETH_SRC_MASKED, FabricConstants.HDR_ETHERNET_SRC_ADDR)
                     .put(Criterion.Type.ETH_TYPE, FabricConstants.HDR_VLAN_TAG_ETHER_TYPE)
                     .put(Criterion.Type.MPLS_LABEL, FabricConstants.HDR_MPLS_LABEL)
                     .put(Criterion.Type.VLAN_VID, FabricConstants.HDR_VLAN_TAG_VLAN_ID)
@@ -122,8 +118,8 @@
     private static final ImmutableMap<PiMatchFieldId, Criterion.Type> INVERSE_CRITERION_MAP =
             ImmutableMap.<PiMatchFieldId, Criterion.Type>builder()
                     .put(FabricConstants.STANDARD_METADATA_INGRESS_PORT, Criterion.Type.IN_PORT)
-                    .put(FabricConstants.HDR_ETHERNET_DST_ADDR, Criterion.Type.ETH_DST)
-                    .put(FabricConstants.HDR_ETHERNET_SRC_ADDR, Criterion.Type.ETH_SRC)
+                    .put(FabricConstants.HDR_ETHERNET_DST_ADDR, Criterion.Type.ETH_DST_MASKED)
+                    .put(FabricConstants.HDR_ETHERNET_SRC_ADDR, Criterion.Type.ETH_SRC_MASKED)
                     .put(FabricConstants.HDR_VLAN_TAG_ETHER_TYPE, Criterion.Type.ETH_TYPE)
                     .put(FabricConstants.HDR_MPLS_LABEL, Criterion.Type.MPLS_LABEL)
                     .put(FabricConstants.HDR_VLAN_TAG_VLAN_ID, Criterion.Type.VLAN_VID)
diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricFilteringPipeliner.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricFilteringPipeliner.java
index a8515e5..7d6ad40 100644
--- a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricFilteringPipeliner.java
+++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricFilteringPipeliner.java
@@ -51,12 +51,10 @@
 public class FabricFilteringPipeliner {
     private static final Logger log = getLogger(FabricFilteringPipeliner.class);
     // Forwarding types
-    private static final byte FWD_BRIDGING = 0;
-    private static final byte FWD_MPLS = 1;
-    private static final byte FWD_IPV4_UNICAST = 2;
-    private static final byte FWD_IPV4_MULTICAST = 3;
-    private static final byte FWD_IPV6_UNICAST = 4;
-    private static final byte FWD_IPV6_MULTICAST = 5;
+    static final byte FWD_BRIDGING = 0;
+    static final byte FWD_MPLS = 1;
+    static final byte FWD_IPV4_ROUTING = 2;
+    static final byte FWD_IPV6_ROUTING = 3;
     private static final PiCriterion VLAN_VALID = PiCriterion.builder()
             .matchExact(FabricConstants.HDR_VLAN_TAG_IS_VALID, new byte[]{1})
             .build();
@@ -104,11 +102,16 @@
                 .map(criterion -> (EthCriterion) criterion)
                 .findFirst()
                 .orElse(null);
+        EthCriterion ethDstMaskedCriterion = filterObjective.conditions().stream()
+                .filter(criterion -> criterion.type() == Criterion.Type.ETH_DST_MASKED)
+                .map(criterion -> (EthCriterion) criterion)
+                .findFirst()
+                .orElse(null);
 
         FlowRule inPortVlanTableRule = createInPortVlanTable(inPortCriterion, vlanCriterion,
                                                              filterObjective);
         Collection<FlowRule> fwdClassifierRules = createFwdClassifierRules(inPortCriterion, ethDstCriterion,
-                                                                           filterObjective);
+                                                                           ethDstMaskedCriterion, filterObjective);
 
         resultBuilder.addFlowRule(inPortVlanTableRule);
         fwdClassifierRules.forEach(resultBuilder::addFlowRule);
@@ -155,38 +158,46 @@
 
     private Collection<FlowRule> createFwdClassifierRules(PortCriterion inPortCriterion,
                                                           EthCriterion ethDstCriterion,
+                                                          EthCriterion ethDstMaskedCriterion,
                                                           FilteringObjective filterObjective) {
+        PortNumber port = inPortCriterion.port();
+
         Collection<FlowRule> flowRules = Lists.newArrayList();
         if (ethDstCriterion == null) {
-            // Bridging table, do nothing
+            if (ethDstMaskedCriterion == null) {
+                // Bridging table, do nothing
+                return flowRules;
+            }
+            // Masked fwd classifier rule
+            MacAddress dstMac = ethDstMaskedCriterion.mac();
+            MacAddress dstMacMask = ethDstMaskedCriterion.mask();
+            FlowRule flow = createMaskedFwdClassifierRule(port, dstMac, dstMacMask, filterObjective);
+            if (flow != null) {
+                flowRules.add(flow);
+            }
             return flowRules;
         }
-        PortNumber port = inPortCriterion.port();
         MacAddress dstMac = ethDstCriterion.mac();
-        if (dstMac.isMulticast()) {
-            flowRules.add(createMulticastFwdClassifierRule(port, dstMac, filterObjective));
-            return flowRules;
-        }
-
         flowRules.addAll(createIpFwdClassifierRules(port, dstMac, filterObjective));
         flowRules.add(createMplsFwdClassifierRule(port, dstMac, filterObjective));
         return flowRules;
     }
 
-    private FlowRule createMulticastFwdClassifierRule(PortNumber inPort, MacAddress dstMac,
-                                                      FilteringObjective filterObjective) {
+    private FlowRule createMaskedFwdClassifierRule(PortNumber inPort, MacAddress dstMac, MacAddress dstMacMask,
+                                                   FilteringObjective filterObjective) {
         TrafficTreatment treatment;
         short ethType;
-        if (dstMac.equals(MacAddress.IPV4_MULTICAST)) {
-            // Ipv4 multicast
-            treatment = createFwdClassifierTreatment(FWD_IPV4_MULTICAST);
+        if (dstMac.equals(MacAddress.IPV4_MULTICAST) && dstMacMask.equals(MacAddress.IPV4_MULTICAST_MASK)) {
+            treatment = createFwdClassifierTreatment(FWD_IPV4_ROUTING);
             ethType = Ethernet.TYPE_IPV4;
-        } else {
-            // IPv6 multicast
-            treatment = createFwdClassifierTreatment(FWD_IPV6_MULTICAST);
+        } else if (dstMac.equals(MacAddress.IPV6_MULTICAST) && dstMacMask.equals(MacAddress.IPV6_MULTICAST_MASK)) {
+            treatment = createFwdClassifierTreatment(FWD_IPV6_ROUTING);
             ethType = Ethernet.TYPE_IPV6;
+        } else {
+            log.warn("Unsupported masked fwd classifier rule. mac={}. mask={}", dstMac, dstMacMask);
+            return null;
         }
-        return createFwdClassifierRule(inPort, ethType, dstMac, treatment, filterObjective);
+        return createFwdClassifierRule(inPort, ethType, dstMac, dstMacMask, treatment, filterObjective);
     }
 
     private Collection<FlowRule> createIpFwdClassifierRules(PortNumber inPort,
@@ -194,10 +205,10 @@
                                                             FilteringObjective filterObjective) {
         Collection<FlowRule> flowRules = Lists.newArrayList();
         TrafficTreatment treatment;
-        treatment = createFwdClassifierTreatment(FWD_IPV4_UNICAST);
-        flowRules.add(createFwdClassifierRule(inPort, Ethernet.TYPE_IPV4, dstMac, treatment, filterObjective));
-        treatment = createFwdClassifierTreatment(FWD_IPV6_UNICAST);
-        flowRules.add(createFwdClassifierRule(inPort, Ethernet.TYPE_IPV6, dstMac, treatment, filterObjective));
+        treatment = createFwdClassifierTreatment(FWD_IPV4_ROUTING);
+        flowRules.add(createFwdClassifierRule(inPort, Ethernet.TYPE_IPV4, dstMac, null, treatment, filterObjective));
+        treatment = createFwdClassifierTreatment(FWD_IPV6_ROUTING);
+        flowRules.add(createFwdClassifierRule(inPort, Ethernet.TYPE_IPV6, dstMac, null, treatment, filterObjective));
         return flowRules;
     }
 
@@ -205,18 +216,23 @@
                                                  MacAddress dstMac,
                                                  FilteringObjective filterObjective) {
         TrafficTreatment treatment = createFwdClassifierTreatment(FWD_MPLS);
-        return createFwdClassifierRule(inPort, Ethernet.MPLS_UNICAST, dstMac, treatment, filterObjective);
+        return createFwdClassifierRule(inPort, Ethernet.MPLS_UNICAST, dstMac, null, treatment, filterObjective);
     }
 
     private FlowRule createFwdClassifierRule(PortNumber inPort,
                                              short ethType,
                                              MacAddress dstMac,
+                                             MacAddress dstMacMask,
                                              TrafficTreatment treatment,
                                              FilteringObjective filterObjective) {
         TrafficSelector.Builder selector = DefaultTrafficSelector.builder()
                 .matchInPort(inPort)
-                .matchEthDst(dstMac)
                 .matchEthType(ethType);
+        if (dstMacMask != null) {
+            selector.matchEthDstMasked(dstMac, dstMacMask);
+        } else {
+            selector.matchEthDstMasked(dstMac, MacAddress.EXACT_MASK);
+        }
 
         return DefaultFlowRule.builder()
                 .withSelector(selector.build())
diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricForwardingPipeliner.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricForwardingPipeliner.java
index bdc6d5e..580d398 100644
--- a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricForwardingPipeliner.java
+++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricForwardingPipeliner.java
@@ -145,15 +145,13 @@
             case L2_BROADCAST:
                 processL2BroadcastRule(vlanIdCriterion, fwd, resultBuilder);
                 break;
-            case IPV4_UNICAST:
-                processIpv4UnicastRule(ipDstCriterion, fwd, resultBuilder);
+            case IPV4_ROUTING:
+                processIpv4RoutingRule(ipDstCriterion, fwd, resultBuilder);
                 break;
             case MPLS:
                 processMplsRule(mplsCriterion, fwd, resultBuilder);
                 break;
-            case IPV4_MULTICAST:
-            case IPV6_UNICAST:
-            case IPV6_MULTICAST:
+            case IPV6_ROUTING:
             default:
                 log.warn("Unsupported forwarding function type {}", criteria);
                 resultBuilder.setError(ObjectiveError.UNSUPPORTED);
@@ -174,7 +172,7 @@
 
         TrafficSelector selector = DefaultTrafficSelector.builder()
                 .matchVlanId(vlanId)
-                .matchEthDst(ethDst)
+                .matchEthDstMasked(ethDst, MacAddress.EXACT_MASK)
                 .build();
         TrafficTreatment treatment = fwd.treatment();
         if (fwd.nextId() != null) {
@@ -223,7 +221,7 @@
         resultBuilder.addFlowRule(flowRule);
     }
 
-    private void processIpv4UnicastRule(IPCriterion ipDstCriterion, ForwardingObjective fwd,
+    private void processIpv4RoutingRule(IPCriterion ipDstCriterion, ForwardingObjective fwd,
                                         PipelinerTranslationResult.Builder resultBuilder) {
         checkNotNull(ipDstCriterion, "IP dst criterion should not be null");
         TrafficSelector selector = DefaultTrafficSelector.builder()
@@ -232,7 +230,7 @@
         TrafficTreatment treatment = fwd.treatment();
         if (fwd.nextId() != null) {
             treatment = buildSetNextIdTreatment(fwd.nextId(),
-                                                FabricConstants.FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_UNICAST_V4);
+                                                FabricConstants.FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_ROUTING_V4);
         }
         FlowRule flowRule = DefaultFlowRule.builder()
                 .withSelector(selector)
@@ -241,7 +239,7 @@
                 .withPriority(fwd.priority())
                 .makePermanent()
                 .forDevice(deviceId)
-                .forTable(FabricConstants.FABRIC_INGRESS_FORWARDING_UNICAST_V4)
+                .forTable(FabricConstants.FABRIC_INGRESS_FORWARDING_ROUTING_V4)
                 .build();
 
         resultBuilder.addFlowRule(flowRule);
diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/ForwardingFunctionType.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/ForwardingFunctionType.java
index 0349cc7..65e3a25 100644
--- a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/ForwardingFunctionType.java
+++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/ForwardingFunctionType.java
@@ -49,22 +49,12 @@
     /**
      * IPv4 unicast, with EtherType and IPv4 unicast destination address.
      */
-    IPV4_UNICAST,
-
-    /**
-     * IPv4 multicast, with EtherType and IPv4 multicast destination address.
-     */
-    IPV4_MULTICAST,
+    IPV4_ROUTING,
 
     /**
      * IPv6 unicast, with EtherType and IPv6 unicast destination address.
      */
-    IPV6_UNICAST,
-
-    /**
-     * IPv6 multicast, with EtherType and IPv6 multicast destination address.
-     */
-    IPV6_MULTICAST,
+    IPV6_ROUTING,
 
     /**
      * MPLS, with EtherType, MPLS label and MPLS BOS(true) criterion.
@@ -101,10 +91,10 @@
             ImmutableMap.<Set<Criterion.Type>, ForwardingFunctionType>builder()
                     .put(L2_UNI_CRITERIA_TYPE, L2_UNICAST)
                     .put(L2_BRC_CRITERIA_TYPE, L2_BROADCAST)
-                    .put(IPV4_UNI_CRITERIA_TYPE, IPV4_UNICAST)
-                    .put(IPV4_MCAST_CRITERIA_TYPE, IPV4_MULTICAST)
-                    .put(IPV6_UNI_CRITERIA_TYPE, IPV6_UNICAST)
-                    .put(IPV6_MCAST_CRITERIA_TYPE, IPV6_MULTICAST)
+                    .put(IPV4_UNI_CRITERIA_TYPE, IPV4_ROUTING)
+                    .put(IPV4_MCAST_CRITERIA_TYPE, IPV4_ROUTING)
+                    .put(IPV6_UNI_CRITERIA_TYPE, IPV6_ROUTING)
+                    .put(IPV6_MCAST_CRITERIA_TYPE, IPV6_ROUTING)
                     .put(MPLS_UNI_CRITERIA_TYPE, MPLS)
                     .build();
 
diff --git a/pipelines/fabric/src/main/resources/include/control/filtering.p4 b/pipelines/fabric/src/main/resources/include/control/filtering.p4
index dcabea7..3c5bfcb 100644
--- a/pipelines/fabric/src/main/resources/include/control/filtering.p4
+++ b/pipelines/fabric/src/main/resources/include/control/filtering.p4
@@ -103,7 +103,7 @@
     table fwd_classifier {
         key = {
             standard_metadata.ingress_port: exact;
-            hdr.ethernet.dst_addr: exact;
+            hdr.ethernet.dst_addr: ternary;
             hdr.vlan_tag.ether_type: exact;
         }
 
diff --git a/pipelines/fabric/src/main/resources/include/control/forwarding.p4 b/pipelines/fabric/src/main/resources/include/control/forwarding.p4
index 5b3b4b8..89eb35a 100644
--- a/pipelines/fabric/src/main/resources/include/control/forwarding.p4
+++ b/pipelines/fabric/src/main/resources/include/control/forwarding.p4
@@ -74,25 +74,25 @@
     }
 
     /*
-     * IPv4 Unicast Table.
+     * IPv4 Routing Table.
      * Matches IPv4 prefix and make egress decision.
      */
-    direct_counter(CounterType.packets_and_bytes) unicast_v4_counter;
+    direct_counter(CounterType.packets_and_bytes) routing_v4_counter;
 
-    action set_next_id_unicast_v4(next_id_t next_id) {
+    action set_next_id_routing_v4(next_id_t next_id) {
         fabric_metadata.next_id = next_id;
-        unicast_v4_counter.count();
+        routing_v4_counter.count();
     }
 
-    table unicast_v4 {
+    table routing_v4 {
         key = {
             hdr.ipv4.dst_addr: lpm;
         }
 
         actions = {
-            set_next_id_unicast_v4;
+            set_next_id_routing_v4;
         }
-        counters = unicast_v4_counter;
+        counters = routing_v4_counter;
     }
 
     /*
@@ -158,77 +158,28 @@
         counters = acl_counter;
     }
 
-#ifdef WITH_MULTICAST
-    /*
-     * IPv4 Multicast Table.
-     * Maches multcast IPv4 address and make egress decision.
-     */
-    direct_counter(CounterType.packets_and_bytes) multicast_v4_counter;
-    action set_next_id_multicast_v4(next_id_t next_id) {
-        fabric_metadata.next_id = next_id;
-        multicast_v4_counter.count();
-    }
-
-    table multicast_v4 {
-        key = {
-            hdr.vlan_tag.vlan_id: exact;
-            hdr.ipv4.dst_addr: lpm;
-        }
-
-        actions = {
-            set_next_id_multicast_v4;
-        }
-        counters = multicast_v4_counter;
-    }
-#endif // WITH_MULTICAST
-
 #ifdef WITH_IPV6
     /*
-     * IPv6 Unicast Table.
+     * IPv6 Routing Table.
      * Matches IPv6 prefix and make egress decision.
      */
-    direct_counter(CounterType.packets_and_bytes) unicast_v6_counter;
+    direct_counter(CounterType.packets_and_bytes) routing_v6_counter;
 
-    action set_next_id_unicast_v6(next_id_t next_id) {
+    action set_next_id_routing_v6(next_id_t next_id) {
         fabric_metadata.next_id = next_id;
-        unicast_v6_counter.count();
+        routing_v6_counter.count();
     }
 
-    table unicast_v6 {
+    table routing_v6 {
         key = {
             hdr.ipv6.dst_addr: lpm;
         }
 
         actions = {
-            set_next_id_unicast_v6;
+            set_next_id_routing_v6;
         }
-        counters = unicast_v6_counter;
+        counters = routing_v6_counter;
     }
-
-#ifdef WITH_MULTICAST
-    /*
-     * IPv6 Multicast Table.
-     * Maches multcast IPv6 address and make egress decision.
-     */
-    direct_counter(CounterType.packets_and_bytes) multicast_v6_counter;
-
-    action set_next_id_multicast_v6(next_id_t next_id) {
-        fabric_metadata.next_id = next_id;
-        multicast_v6_counter.count();
-    }
-
-    table multicast_v6 {
-        key = {
-            hdr.vlan_tag.vlan_id: exact;
-            hdr.ipv6.dst_addr: lpm;
-        }
-
-        actions = {
-            set_next_id_multicast_v6;
-        }
-        counters = multicast_v6_counter;
-    }
-#endif // WITH_MULTICAST
 #endif // WITH_IPV6
 
     apply {
@@ -239,15 +190,9 @@
             // TODO: IPv6
             hdr.vlan_tag.ether_type = ETHERTYPE_IPV4;
         }
-        else if (fabric_metadata.fwd_type == FWD_IPV4_UNICAST) unicast_v4.apply();
-#ifdef WITH_MULTICAST
-        else if (fabric_metadata.fwd_type == FWD_IPV4_MULTICAST) multicast_v4.apply();
-#endif // WITH_MULTICAST
+        else if (fabric_metadata.fwd_type == FWD_IPV4_UNICAST) routing_v4.apply();
 #ifdef WITH_IPV6
-        else if (fabric_metadata.fwd_type == FWD_IPV6_UNICAST) unicast_v6.apply();
-#ifdef WITH_MULTICAST
-        else if (fabric_metadata.fwd_type == FWD_IPV6_MULTICAST) multicast_v6.apply();
-#endif // WITH_MULTICAST
+        else if (fabric_metadata.fwd_type == FWD_IPV6_UNICAST) routing_v6.apply();
 #endif // WITH_IPV6
         acl.apply();
     }
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
index 9d32a41..8571db2 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
@@ -1751,10 +1751,10 @@
       "binding" : "FabricIngress.forwarding.mpls"
     },
     {
-      "name" : "FabricIngress.forwarding.unicast_v4_counter",
+      "name" : "FabricIngress.forwarding.routing_v4_counter",
       "id" : 7,
       "is_direct" : true,
-      "binding" : "FabricIngress.forwarding.unicast_v4"
+      "binding" : "FabricIngress.forwarding.routing_v4"
     },
     {
       "name" : "FabricIngress.forwarding.acl_counter",
@@ -1763,50 +1763,38 @@
       "binding" : "FabricIngress.forwarding.acl"
     },
     {
-      "name" : "FabricIngress.forwarding.multicast_v4_counter",
+      "name" : "FabricIngress.forwarding.routing_v6_counter",
       "id" : 9,
       "is_direct" : true,
-      "binding" : "FabricIngress.forwarding.multicast_v4"
-    },
-    {
-      "name" : "FabricIngress.forwarding.unicast_v6_counter",
-      "id" : 10,
-      "is_direct" : true,
-      "binding" : "FabricIngress.forwarding.unicast_v6"
-    },
-    {
-      "name" : "FabricIngress.forwarding.multicast_v6_counter",
-      "id" : 11,
-      "is_direct" : true,
-      "binding" : "FabricIngress.forwarding.multicast_v6"
+      "binding" : "FabricIngress.forwarding.routing_v6"
     },
     {
       "name" : "FabricIngress.next.vlan_meta_counter",
-      "id" : 12,
+      "id" : 10,
       "is_direct" : true,
       "binding" : "FabricIngress.next.vlan_meta"
     },
     {
       "name" : "FabricIngress.next.simple_counter",
-      "id" : 13,
+      "id" : 11,
       "is_direct" : true,
       "binding" : "FabricIngress.next.simple"
     },
     {
       "name" : "FabricIngress.next.hashed_counter",
-      "id" : 14,
+      "id" : 12,
       "is_direct" : true,
       "binding" : "FabricIngress.next.hashed"
     },
     {
       "name" : "FabricIngress.next.multicast_counter",
-      "id" : 15,
+      "id" : 13,
       "is_direct" : true,
       "binding" : "FabricIngress.next.multicast"
     },
     {
       "name" : "FabricIngress.port_counters_control.egress_port_counter",
-      "id" : 16,
+      "id" : 14,
       "source_info" : {
         "filename" : "include/control/port_counter.p4",
         "line" : 23,
@@ -1818,7 +1806,7 @@
     },
     {
       "name" : "FabricIngress.port_counters_control.ingress_port_counter",
-      "id" : 17,
+      "id" : 15,
       "source_info" : {
         "filename" : "include/control/port_counter.p4",
         "line" : 24,
@@ -1830,31 +1818,31 @@
     },
     {
       "name" : "FabricEgress.process_int_source.counter_int_source",
-      "id" : 18,
+      "id" : 16,
       "is_direct" : true,
       "binding" : "FabricEgress.process_int_source.tb_int_source"
     },
     {
       "name" : "FabricEgress.process_int_transit.counter_int_insert",
-      "id" : 19,
+      "id" : 17,
       "is_direct" : true,
       "binding" : "FabricEgress.process_int_transit.tb_int_insert"
     },
     {
       "name" : "FabricEgress.process_int_transit.counter_int_inst_0003",
-      "id" : 20,
+      "id" : 18,
       "is_direct" : true,
       "binding" : "FabricEgress.process_int_transit.tb_int_inst_0003"
     },
     {
       "name" : "FabricEgress.process_int_transit.counter_int_inst_0407",
-      "id" : 21,
+      "id" : 19,
       "is_direct" : true,
       "binding" : "FabricEgress.process_int_transit.tb_int_inst_0407"
     },
     {
       "name" : "FabricEgress.egress_next.egress_vlan_counter",
-      "id" : 22,
+      "id" : 20,
       "is_direct" : true,
       "binding" : "FabricEgress.egress_next.egress_vlan"
     }
@@ -2114,26 +2102,14 @@
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 11,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
-      "id" : 12,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "nop",
-      "id" : 13,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
       "name" : "drop_now",
-      "id" : 14,
+      "id" : 12,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2160,7 +2136,7 @@
     },
     {
       "name" : "FabricIngress.spgw_ingress.gtpu_decap",
-      "id" : 15,
+      "id" : 13,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2212,7 +2188,7 @@
     },
     {
       "name" : "FabricIngress.spgw_ingress.set_dl_sess_info",
-      "id" : 16,
+      "id" : 14,
       "runtime_data" : [
         {
           "name" : "teid",
@@ -2289,7 +2265,7 @@
     },
     {
       "name" : "FabricIngress.process_set_source_sink.int_set_source",
-      "id" : 17,
+      "id" : 15,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2315,7 +2291,7 @@
     },
     {
       "name" : "FabricIngress.process_set_source_sink.int_set_sink",
-      "id" : 18,
+      "id" : 16,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2341,7 +2317,7 @@
     },
     {
       "name" : "FabricIngress.filtering.drop",
-      "id" : 19,
+      "id" : 17,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2358,7 +2334,7 @@
     },
     {
       "name" : "FabricIngress.filtering.set_vlan",
-      "id" : 20,
+      "id" : 18,
       "runtime_data" : [
         {
           "name" : "new_vlan_id",
@@ -2389,7 +2365,7 @@
     },
     {
       "name" : "FabricIngress.filtering.push_internal_vlan",
-      "id" : 21,
+      "id" : 19,
       "runtime_data" : [
         {
           "name" : "new_vlan_id",
@@ -2540,13 +2516,13 @@
     },
     {
       "name" : "FabricIngress.filtering.nop_ingress_port_vlan",
-      "id" : 22,
+      "id" : 20,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricIngress.filtering.set_forwarding_type",
-      "id" : 23,
+      "id" : 21,
       "runtime_data" : [
         {
           "name" : "fwd_type",
@@ -2577,7 +2553,7 @@
     },
     {
       "name" : "FabricIngress.forwarding.set_next_id_bridging",
-      "id" : 24,
+      "id" : 22,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -2608,7 +2584,7 @@
     },
     {
       "name" : "FabricIngress.forwarding.pop_mpls_and_next",
-      "id" : 25,
+      "id" : 23,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -2653,8 +2629,8 @@
       ]
     },
     {
-      "name" : "FabricIngress.forwarding.set_next_id_unicast_v4",
-      "id" : 26,
+      "name" : "FabricIngress.forwarding.set_next_id_routing_v4",
+      "id" : 24,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -2685,7 +2661,7 @@
     },
     {
       "name" : "FabricIngress.forwarding.set_next_id_acl",
-      "id" : 27,
+      "id" : 25,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -2716,7 +2692,7 @@
     },
     {
       "name" : "FabricIngress.forwarding.punt_to_cpu",
-      "id" : 28,
+      "id" : 26,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2752,7 +2728,7 @@
     },
     {
       "name" : "FabricIngress.forwarding.clone_to_cpu",
-      "id" : 29,
+      "id" : 27,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2788,7 +2764,7 @@
     },
     {
       "name" : "FabricIngress.forwarding.drop",
-      "id" : 30,
+      "id" : 28,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2805,13 +2781,13 @@
     },
     {
       "name" : "FabricIngress.forwarding.nop_acl",
-      "id" : 31,
+      "id" : 29,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "FabricIngress.forwarding.set_next_id_multicast_v4",
-      "id" : 32,
+      "name" : "FabricIngress.forwarding.set_next_id_routing_v6",
+      "id" : 30,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -2833,69 +2809,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 168,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.forwarding.set_next_id_unicast_v6",
-      "id" : 33,
-      "runtime_data" : [
-        {
-          "name" : "next_id",
-          "bitwidth" : 32
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.next_id"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 193,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.forwarding.set_next_id_multicast_v6",
-      "id" : 34,
-      "runtime_data" : [
-        {
-          "name" : "next_id",
-          "bitwidth" : 32
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["scalars", "fabric_metadata_t.next_id"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 216,
+            "line" : 169,
             "column" : 8,
             "source_fragment" : "fabric_metadata.next_id = next_id"
           }
@@ -2904,7 +2818,7 @@
     },
     {
       "name" : "FabricIngress.next.set_vlan",
-      "id" : 35,
+      "id" : 31,
       "runtime_data" : [
         {
           "name" : "new_vlan_id",
@@ -2935,7 +2849,7 @@
     },
     {
       "name" : "FabricIngress.next.output_simple",
-      "id" : 36,
+      "id" : 32,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -2966,7 +2880,7 @@
     },
     {
       "name" : "FabricIngress.next.set_vlan_output",
-      "id" : 37,
+      "id" : 33,
       "runtime_data" : [
         {
           "name" : "new_vlan_id",
@@ -3020,7 +2934,7 @@
     },
     {
       "name" : "FabricIngress.next.l3_routing_simple",
-      "id" : 38,
+      "id" : 34,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -3097,7 +3011,7 @@
     },
     {
       "name" : "FabricIngress.next.mpls_routing_v4_simple",
-      "id" : 39,
+      "id" : 35,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -3288,7 +3202,7 @@
     },
     {
       "name" : "FabricIngress.next.mpls_routing_v6_simple",
-      "id" : 40,
+      "id" : 36,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -3479,7 +3393,7 @@
     },
     {
       "name" : "FabricIngress.next.l3_routing_vlan",
-      "id" : 41,
+      "id" : 37,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -3579,7 +3493,7 @@
     },
     {
       "name" : "FabricIngress.next.l3_routing_hashed",
-      "id" : 42,
+      "id" : 38,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -3656,7 +3570,7 @@
     },
     {
       "name" : "FabricIngress.next.mpls_routing_v4_hashed",
-      "id" : 43,
+      "id" : 39,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -3847,7 +3761,7 @@
     },
     {
       "name" : "FabricIngress.next.mpls_routing_v6_hashed",
-      "id" : 44,
+      "id" : 40,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -4038,7 +3952,7 @@
     },
     {
       "name" : "FabricIngress.next.set_mcast_group",
-      "id" : 45,
+      "id" : 41,
       "runtime_data" : [
         {
           "name" : "gid",
@@ -4098,7 +4012,7 @@
     },
     {
       "name" : "act",
-      "id" : 46,
+      "id" : 42,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4134,7 +4048,7 @@
     },
     {
       "name" : "act_0",
-      "id" : 47,
+      "id" : 43,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4194,7 +4108,7 @@
     },
     {
       "name" : "act_1",
-      "id" : 48,
+      "id" : 44,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4220,7 +4134,7 @@
     },
     {
       "name" : "act_2",
-      "id" : 49,
+      "id" : 45,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4242,7 +4156,7 @@
     },
     {
       "name" : "act_3",
-      "id" : 50,
+      "id" : 46,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4306,7 +4220,7 @@
     },
     {
       "name" : "act_4",
-      "id" : 51,
+      "id" : 47,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4347,7 +4261,7 @@
     },
     {
       "name" : "act_5",
-      "id" : 52,
+      "id" : 48,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4377,7 +4291,7 @@
     },
     {
       "name" : "act_6",
-      "id" : 53,
+      "id" : 49,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4407,7 +4321,7 @@
     },
     {
       "name" : "act_7",
-      "id" : 54,
+      "id" : 50,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4433,7 +4347,7 @@
     },
     {
       "name" : "act_8",
-      "id" : 55,
+      "id" : 51,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4463,7 +4377,7 @@
     },
     {
       "name" : "act_9",
-      "id" : 56,
+      "id" : 52,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4493,7 +4407,7 @@
     },
     {
       "name" : "act_10",
-      "id" : 57,
+      "id" : 53,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4519,7 +4433,7 @@
     },
     {
       "name" : "act_11",
-      "id" : 58,
+      "id" : 54,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4574,7 +4488,7 @@
     },
     {
       "name" : "act_12",
-      "id" : 59,
+      "id" : 55,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4604,7 +4518,7 @@
     },
     {
       "name" : "act_13",
-      "id" : 60,
+      "id" : 56,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4630,7 +4544,7 @@
     },
     {
       "name" : "act_14",
-      "id" : 61,
+      "id" : 57,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4660,7 +4574,7 @@
     },
     {
       "name" : "act_15",
-      "id" : 62,
+      "id" : 58,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4690,7 +4604,7 @@
     },
     {
       "name" : "act_16",
-      "id" : 63,
+      "id" : 59,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4716,7 +4630,7 @@
     },
     {
       "name" : "act_17",
-      "id" : 64,
+      "id" : 60,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4742,7 +4656,7 @@
     },
     {
       "name" : "act_18",
-      "id" : 65,
+      "id" : 61,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4772,7 +4686,7 @@
     },
     {
       "name" : "act_19",
-      "id" : 66,
+      "id" : 62,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4802,7 +4716,7 @@
     },
     {
       "name" : "act_20",
-      "id" : 67,
+      "id" : 63,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4832,7 +4746,7 @@
     },
     {
       "name" : "act_21",
-      "id" : 68,
+      "id" : 64,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4862,7 +4776,7 @@
     },
     {
       "name" : "act_22",
-      "id" : 69,
+      "id" : 65,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4892,7 +4806,7 @@
     },
     {
       "name" : "act_23",
-      "id" : 70,
+      "id" : 66,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4922,7 +4836,7 @@
     },
     {
       "name" : "act_24",
-      "id" : 71,
+      "id" : 67,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4952,7 +4866,7 @@
     },
     {
       "name" : "act_25",
-      "id" : 72,
+      "id" : 68,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4988,7 +4902,7 @@
     },
     {
       "name" : "act_26",
-      "id" : 73,
+      "id" : 69,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5037,7 +4951,7 @@
     },
     {
       "name" : "act_27",
-      "id" : 74,
+      "id" : 70,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5086,7 +5000,7 @@
     },
     {
       "name" : "act_28",
-      "id" : 75,
+      "id" : 71,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5144,7 +5058,7 @@
     },
     {
       "name" : "act_29",
-      "id" : 76,
+      "id" : 72,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5202,7 +5116,7 @@
     },
     {
       "name" : "act_30",
-      "id" : 77,
+      "id" : 73,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5222,43 +5136,43 @@
     },
     {
       "name" : "NoAction",
+      "id" : 74,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "NoAction",
+      "id" : 75,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "NoAction",
+      "id" : 76,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "NoAction",
+      "id" : 77,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "NoAction",
       "id" : 78,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
+      "name" : "nop",
       "id" : 79,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "NoAction",
-      "id" : 80,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "NoAction",
-      "id" : 81,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "NoAction",
-      "id" : 82,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
-      "name" : "nop",
-      "id" : 83,
-      "runtime_data" : [],
-      "primitives" : []
-    },
-    {
       "name" : "drop_now",
-      "id" : 84,
+      "id" : 80,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5285,7 +5199,7 @@
     },
     {
       "name" : "drop_now",
-      "id" : 85,
+      "id" : 81,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5312,7 +5226,7 @@
     },
     {
       "name" : "FabricEgress.spgw_egress.gtpu_encap",
-      "id" : 86,
+      "id" : 82,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -5904,7 +5818,7 @@
     },
     {
       "name" : "FabricEgress.process_int_source.int_source_dscp",
-      "id" : 87,
+      "id" : 83,
       "runtime_data" : [
         {
           "name" : "max_hop",
@@ -6412,7 +6326,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_update_total_hop_cnt",
-      "id" : 88,
+      "id" : 84,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6461,7 +6375,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_transit",
-      "id" : 89,
+      "id" : 85,
       "runtime_data" : [
         {
           "name" : "switch_id",
@@ -6544,13 +6458,13 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0003_i0",
-      "id" : 90,
+      "id" : 86,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0003_i1",
-      "id" : 91,
+      "id" : 87,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6623,7 +6537,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0003_i2",
-      "id" : 92,
+      "id" : 88,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6664,7 +6578,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0003_i3",
-      "id" : 93,
+      "id" : 89,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6771,7 +6685,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0003_i4",
-      "id" : 94,
+      "id" : 90,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -6857,7 +6771,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0003_i5",
-      "id" : 95,
+      "id" : 91,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7009,7 +6923,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0003_i6",
-      "id" : 96,
+      "id" : 92,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7129,7 +7043,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0003_i7",
-      "id" : 97,
+      "id" : 93,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7315,7 +7229,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0003_i8",
-      "id" : 98,
+      "id" : 94,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7356,7 +7270,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0003_i9",
-      "id" : 99,
+      "id" : 95,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7463,7 +7377,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0003_i10",
-      "id" : 100,
+      "id" : 96,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7538,7 +7452,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0003_i11",
-      "id" : 101,
+      "id" : 97,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7679,7 +7593,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0003_i12",
-      "id" : 102,
+      "id" : 98,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7799,7 +7713,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0003_i13",
-      "id" : 103,
+      "id" : 99,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -7985,7 +7899,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0003_i14",
-      "id" : 104,
+      "id" : 100,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8139,7 +8053,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0003_i15",
-      "id" : 105,
+      "id" : 101,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8359,13 +8273,13 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0407_i0",
-      "id" : 106,
+      "id" : 102,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0407_i1",
-      "id" : 107,
+      "id" : 103,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8406,7 +8320,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0407_i2",
-      "id" : 108,
+      "id" : 104,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8466,7 +8380,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0407_i3",
-      "id" : 109,
+      "id" : 105,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8560,7 +8474,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0407_i4",
-      "id" : 110,
+      "id" : 106,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8624,7 +8538,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0407_i5",
-      "id" : 111,
+      "id" : 107,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8722,7 +8636,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0407_i6",
-      "id" : 112,
+      "id" : 108,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8839,7 +8753,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0407_i7",
-      "id" : 113,
+      "id" : 109,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -8990,7 +8904,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0407_i8",
-      "id" : 114,
+      "id" : 110,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9031,7 +8945,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0407_i9",
-      "id" : 115,
+      "id" : 111,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9106,7 +9020,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0407_i10",
-      "id" : 116,
+      "id" : 112,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9200,7 +9114,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0407_i11",
-      "id" : 117,
+      "id" : 113,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9328,7 +9242,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0407_i12",
-      "id" : 118,
+      "id" : 114,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9426,7 +9340,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0407_i13",
-      "id" : 119,
+      "id" : 115,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9558,7 +9472,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0407_i14",
-      "id" : 120,
+      "id" : 116,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9709,7 +9623,7 @@
     },
     {
       "name" : "FabricEgress.process_int_transit.int_set_header_0407_i15",
-      "id" : 121,
+      "id" : 117,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9894,7 +9808,7 @@
     },
     {
       "name" : "FabricEgress.process_int_outer_encap.int_update_ipv4",
-      "id" : 122,
+      "id" : 118,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9943,7 +9857,7 @@
     },
     {
       "name" : "FabricEgress.process_int_outer_encap.int_update_udp",
-      "id" : 123,
+      "id" : 119,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -9992,7 +9906,7 @@
     },
     {
       "name" : "FabricEgress.process_int_outer_encap.int_update_shim",
-      "id" : 124,
+      "id" : 120,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10051,7 +9965,7 @@
     },
     {
       "name" : "FabricEgress.process_int_report.do_report_encapsulation",
-      "id" : 125,
+      "id" : 121,
       "runtime_data" : [
         {
           "name" : "src_mac",
@@ -10727,7 +10641,7 @@
     },
     {
       "name" : "FabricEgress.process_int_sink.restore_header",
-      "id" : 126,
+      "id" : 122,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -10785,7 +10699,7 @@
     },
     {
       "name" : "FabricEgress.process_int_sink.int_sink",
-      "id" : 127,
+      "id" : 123,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11116,7 +11030,7 @@
     },
     {
       "name" : "FabricEgress.pkt_io_egress.pop_vlan",
-      "id" : 128,
+      "id" : 124,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11157,7 +11071,7 @@
     },
     {
       "name" : "FabricEgress.egress_next.pop_vlan",
-      "id" : 129,
+      "id" : 125,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11198,7 +11112,7 @@
     },
     {
       "name" : "act_31",
-      "id" : 130,
+      "id" : 126,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -11260,14 +11174,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [47],
+          "action_ids" : [43],
           "actions" : ["act_0"],
           "base_default_next" : "node_3",
           "next_tables" : {
             "act_0" : "node_3"
           },
           "default_entry" : {
-            "action_id" : 47,
+            "action_id" : 43,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -11283,14 +11197,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [46],
+          "action_ids" : [42],
           "actions" : ["act"],
           "base_default_next" : "node_5",
           "next_tables" : {
             "act" : "node_5"
           },
           "default_entry" : {
-            "action_id" : 46,
+            "action_id" : 42,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -11306,14 +11220,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [50],
+          "action_ids" : [46],
           "actions" : ["act_3"],
           "base_default_next" : "node_7",
           "next_tables" : {
             "act_3" : "node_7"
           },
           "default_entry" : {
-            "action_id" : 50,
+            "action_id" : 46,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -11329,14 +11243,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [48],
+          "action_ids" : [44],
           "actions" : ["act_1"],
           "base_default_next" : "node_10",
           "next_tables" : {
             "act_1" : "node_10"
           },
           "default_entry" : {
-            "action_id" : 48,
+            "action_id" : 44,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -11352,14 +11266,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [49],
+          "action_ids" : [45],
           "actions" : ["act_2"],
           "base_default_next" : "node_10",
           "next_tables" : {
             "act_2" : "node_10"
           },
           "default_entry" : {
-            "action_id" : 49,
+            "action_id" : 45,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -11375,14 +11289,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [51],
+          "action_ids" : [47],
           "actions" : ["act_4"],
           "base_default_next" : null,
           "next_tables" : {
             "act_4" : null
           },
           "default_entry" : {
-            "action_id" : 51,
+            "action_id" : 47,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -11398,14 +11312,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [59],
+          "action_ids" : [55],
           "actions" : ["act_12"],
           "base_default_next" : "node_13",
           "next_tables" : {
             "act_12" : "node_13"
           },
           "default_entry" : {
-            "action_id" : 59,
+            "action_id" : 55,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -11458,14 +11372,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [52],
+          "action_ids" : [48],
           "actions" : ["act_5"],
           "base_default_next" : "node_17",
           "next_tables" : {
             "act_5" : "node_17"
           },
           "default_entry" : {
-            "action_id" : 52,
+            "action_id" : 48,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -11481,14 +11395,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [53],
+          "action_ids" : [49],
           "actions" : ["act_6"],
           "base_default_next" : "node_17",
           "next_tables" : {
             "act_6" : "node_17"
           },
           "default_entry" : {
-            "action_id" : 53,
+            "action_id" : 49,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -11504,14 +11418,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [14],
+          "action_ids" : [12],
           "actions" : ["drop_now"],
           "base_default_next" : "tbl_act_8",
           "next_tables" : {
             "drop_now" : "tbl_act_8"
           },
           "default_entry" : {
-            "action_id" : 14,
+            "action_id" : 12,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -11527,14 +11441,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [54],
+          "action_ids" : [50],
           "actions" : ["act_7"],
           "base_default_next" : "tbl_spgw_ingress_gtpu_decap",
           "next_tables" : {
             "act_7" : "tbl_spgw_ingress_gtpu_decap"
           },
           "default_entry" : {
-            "action_id" : 54,
+            "action_id" : 50,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -11550,14 +11464,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [15],
+          "action_ids" : [13],
           "actions" : ["FabricIngress.spgw_ingress.gtpu_decap"],
           "base_default_next" : "node_27",
           "next_tables" : {
             "FabricIngress.spgw_ingress.gtpu_decap" : "node_27"
           },
           "default_entry" : {
-            "action_id" : 15,
+            "action_id" : 13,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -11586,7 +11500,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [16, 0],
+          "action_ids" : [14, 0],
           "actions" : ["FabricIngress.spgw_ingress.set_dl_sess_info", "NoAction"],
           "base_default_next" : null,
           "next_tables" : {
@@ -11610,14 +11524,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [55],
+          "action_ids" : [51],
           "actions" : ["act_8"],
           "base_default_next" : "node_24",
           "next_tables" : {
             "act_8" : "node_24"
           },
           "default_entry" : {
-            "action_id" : 55,
+            "action_id" : 51,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -11633,14 +11547,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [56],
+          "action_ids" : [52],
           "actions" : ["act_9"],
           "base_default_next" : "node_24",
           "next_tables" : {
             "act_9" : "node_24"
           },
           "default_entry" : {
-            "action_id" : 56,
+            "action_id" : 52,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -11656,14 +11570,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [57],
+          "action_ids" : [53],
           "actions" : ["act_10"],
           "base_default_next" : "node_27",
           "next_tables" : {
             "act_10" : "node_27"
           },
           "default_entry" : {
-            "action_id" : 57,
+            "action_id" : 53,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -11679,14 +11593,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [58],
+          "action_ids" : [54],
           "actions" : ["act_11"],
           "base_default_next" : "node_27",
           "next_tables" : {
             "act_11" : "node_27"
           },
           "default_entry" : {
-            "action_id" : 58,
+            "action_id" : 54,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -11702,14 +11616,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [60],
+          "action_ids" : [56],
           "actions" : ["act_13"],
           "base_default_next" : "FabricIngress.filtering.ingress_port_vlan",
           "next_tables" : {
             "act_13" : "FabricIngress.filtering.ingress_port_vlan"
           },
           "default_entry" : {
-            "action_id" : 60,
+            "action_id" : 56,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -11750,7 +11664,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [21, 20, 19, 22],
+          "action_ids" : [19, 18, 17, 20],
           "actions" : ["FabricIngress.filtering.push_internal_vlan", "FabricIngress.filtering.set_vlan", "FabricIngress.filtering.drop", "FabricIngress.filtering.nop_ingress_port_vlan"],
           "base_default_next" : null,
           "next_tables" : {
@@ -11758,7 +11672,7 @@
             "__MISS__" : "tbl_act_15"
           },
           "default_entry" : {
-            "action_id" : 21,
+            "action_id" : 19,
             "action_const" : true,
             "action_data" : ["0xffe"],
             "action_entry_const" : true
@@ -11774,14 +11688,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [61],
+          "action_ids" : [57],
           "actions" : ["act_14"],
           "base_default_next" : "node_32",
           "next_tables" : {
             "act_14" : "node_32"
           },
           "default_entry" : {
-            "action_id" : 61,
+            "action_id" : 57,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -11797,14 +11711,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [62],
+          "action_ids" : [58],
           "actions" : ["act_15"],
           "base_default_next" : "node_32",
           "next_tables" : {
             "act_15" : "node_32"
           },
           "default_entry" : {
-            "action_id" : 62,
+            "action_id" : 58,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -11827,7 +11741,7 @@
               "mask" : null
             },
             {
-              "match_type" : "exact",
+              "match_type" : "ternary",
               "name" : "hdr.ethernet.dst_addr",
               "target" : ["ethernet", "dst_addr"],
               "mask" : null
@@ -11839,20 +11753,20 @@
               "mask" : null
             }
           ],
-          "match_type" : "exact",
+          "match_type" : "ternary",
           "type" : "simple",
           "max_size" : 1024,
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [23],
+          "action_ids" : [21],
           "actions" : ["FabricIngress.filtering.set_forwarding_type"],
           "base_default_next" : "node_35",
           "next_tables" : {
             "FabricIngress.filtering.set_forwarding_type" : "node_35"
           },
           "default_entry" : {
-            "action_id" : 23,
+            "action_id" : 21,
             "action_const" : true,
             "action_data" : ["0x0"],
             "action_entry_const" : true
@@ -11868,14 +11782,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [63],
+          "action_ids" : [59],
           "actions" : ["act_16"],
           "base_default_next" : "node_35",
           "next_tables" : {
             "act_16" : "node_35"
           },
           "default_entry" : {
-            "action_id" : 63,
+            "action_id" : 59,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -11910,7 +11824,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [24, 4],
+          "action_ids" : [22, 4],
           "actions" : ["FabricIngress.forwarding.set_next_id_bridging", "NoAction"],
           "base_default_next" : "FabricIngress.forwarding.acl",
           "next_tables" : {
@@ -11947,7 +11861,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [25, 5],
+          "action_ids" : [23, 5],
           "actions" : ["FabricIngress.forwarding.pop_mpls_and_next", "NoAction"],
           "base_default_next" : "tbl_act_17",
           "next_tables" : {
@@ -11971,27 +11885,27 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [64],
+          "action_ids" : [60],
           "actions" : ["act_17"],
           "base_default_next" : "FabricIngress.forwarding.acl",
           "next_tables" : {
             "act_17" : "FabricIngress.forwarding.acl"
           },
           "default_entry" : {
-            "action_id" : 64,
+            "action_id" : 60,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "FabricIngress.forwarding.unicast_v4",
+          "name" : "FabricIngress.forwarding.routing_v4",
           "id" : 27,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 87,
             "column" : 10,
-            "source_fragment" : "unicast_v4"
+            "source_fragment" : "routing_v4"
           },
           "key" : [
             {
@@ -12007,11 +11921,11 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [26, 6],
-          "actions" : ["FabricIngress.forwarding.set_next_id_unicast_v4", "NoAction"],
+          "action_ids" : [24, 6],
+          "actions" : ["FabricIngress.forwarding.set_next_id_routing_v4", "NoAction"],
           "base_default_next" : "FabricIngress.forwarding.acl",
           "next_tables" : {
-            "FabricIngress.forwarding.set_next_id_unicast_v4" : "FabricIngress.forwarding.acl",
+            "FabricIngress.forwarding.set_next_id_routing_v4" : "FabricIngress.forwarding.acl",
             "NoAction" : "FabricIngress.forwarding.acl"
           },
           "default_entry" : {
@@ -12022,25 +11936,19 @@
           }
         },
         {
-          "name" : "FabricIngress.forwarding.multicast_v4",
+          "name" : "FabricIngress.forwarding.routing_v6",
           "id" : 28,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 172,
+            "line" : 173,
             "column" : 10,
-            "source_fragment" : "multicast_v4"
+            "source_fragment" : "routing_v6"
           },
           "key" : [
             {
-              "match_type" : "exact",
-              "name" : "hdr.vlan_tag.vlan_id",
-              "target" : ["vlan_tag", "vlan_id"],
-              "mask" : null
-            },
-            {
               "match_type" : "lpm",
-              "name" : "hdr.ipv4.dst_addr",
-              "target" : ["ipv4", "dst_addr"],
+              "name" : "hdr.ipv6.dst_addr",
+              "target" : ["ipv6", "dst_addr"],
               "mask" : null
             }
           ],
@@ -12050,11 +11958,11 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [32, 7],
-          "actions" : ["FabricIngress.forwarding.set_next_id_multicast_v4", "NoAction"],
+          "action_ids" : [30, 7],
+          "actions" : ["FabricIngress.forwarding.set_next_id_routing_v6", "NoAction"],
           "base_default_next" : "FabricIngress.forwarding.acl",
           "next_tables" : {
-            "FabricIngress.forwarding.set_next_id_multicast_v4" : "FabricIngress.forwarding.acl",
+            "FabricIngress.forwarding.set_next_id_routing_v6" : "FabricIngress.forwarding.acl",
             "NoAction" : "FabricIngress.forwarding.acl"
           },
           "default_entry" : {
@@ -12065,88 +11973,8 @@
           }
         },
         {
-          "name" : "FabricIngress.forwarding.unicast_v6",
-          "id" : 29,
-          "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 197,
-            "column" : 10,
-            "source_fragment" : "unicast_v6"
-          },
-          "key" : [
-            {
-              "match_type" : "lpm",
-              "name" : "hdr.ipv6.dst_addr",
-              "target" : ["ipv6", "dst_addr"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "lpm",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : true,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [33, 8],
-          "actions" : ["FabricIngress.forwarding.set_next_id_unicast_v6", "NoAction"],
-          "base_default_next" : "FabricIngress.forwarding.acl",
-          "next_tables" : {
-            "FabricIngress.forwarding.set_next_id_unicast_v6" : "FabricIngress.forwarding.acl",
-            "NoAction" : "FabricIngress.forwarding.acl"
-          },
-          "default_entry" : {
-            "action_id" : 8,
-            "action_const" : false,
-            "action_data" : [],
-            "action_entry_const" : false
-          }
-        },
-        {
-          "name" : "FabricIngress.forwarding.multicast_v6",
-          "id" : 30,
-          "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 220,
-            "column" : 10,
-            "source_fragment" : "multicast_v6"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "name" : "hdr.vlan_tag.vlan_id",
-              "target" : ["vlan_tag", "vlan_id"],
-              "mask" : null
-            },
-            {
-              "match_type" : "lpm",
-              "name" : "hdr.ipv6.dst_addr",
-              "target" : ["ipv6", "dst_addr"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "lpm",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : true,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [34, 9],
-          "actions" : ["FabricIngress.forwarding.set_next_id_multicast_v6", "NoAction"],
-          "base_default_next" : "FabricIngress.forwarding.acl",
-          "next_tables" : {
-            "FabricIngress.forwarding.set_next_id_multicast_v6" : "FabricIngress.forwarding.acl",
-            "NoAction" : "FabricIngress.forwarding.acl"
-          },
-          "default_entry" : {
-            "action_id" : 9,
-            "action_const" : false,
-            "action_data" : [],
-            "action_entry_const" : false
-          }
-        },
-        {
           "name" : "FabricIngress.forwarding.acl",
-          "id" : 31,
+          "id" : 29,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 131,
@@ -12233,7 +12061,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [27, 28, 29, 30, 31],
+          "action_ids" : [25, 26, 27, 28, 29],
           "actions" : ["FabricIngress.forwarding.set_next_id_acl", "FabricIngress.forwarding.punt_to_cpu", "FabricIngress.forwarding.clone_to_cpu", "FabricIngress.forwarding.drop", "FabricIngress.forwarding.nop_acl"],
           "base_default_next" : "tbl_act_18",
           "next_tables" : {
@@ -12244,7 +12072,7 @@
             "FabricIngress.forwarding.nop_acl" : "tbl_act_18"
           },
           "default_entry" : {
-            "action_id" : 31,
+            "action_id" : 29,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12252,7 +12080,7 @@
         },
         {
           "name" : "tbl_act_18",
-          "id" : 32,
+          "id" : 30,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -12260,14 +12088,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [65],
+          "action_ids" : [61],
           "actions" : ["act_18"],
           "base_default_next" : "FabricIngress.next.vlan_meta",
           "next_tables" : {
             "act_18" : "FabricIngress.next.vlan_meta"
           },
           "default_entry" : {
-            "action_id" : 65,
+            "action_id" : 61,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12275,7 +12103,7 @@
         },
         {
           "name" : "FabricIngress.next.vlan_meta",
-          "id" : 33,
+          "id" : 31,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 65,
@@ -12296,7 +12124,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [35, 13],
+          "action_ids" : [31, 11],
           "actions" : ["FabricIngress.next.set_vlan", "nop"],
           "base_default_next" : "FabricIngress.next.simple",
           "next_tables" : {
@@ -12304,7 +12132,7 @@
             "nop" : "FabricIngress.next.simple"
           },
           "default_entry" : {
-            "action_id" : 13,
+            "action_id" : 11,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -12312,7 +12140,7 @@
         },
         {
           "name" : "FabricIngress.next.simple",
-          "id" : 34,
+          "id" : 32,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 122,
@@ -12333,7 +12161,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [36, 37, 38, 39, 40, 41, 10],
+          "action_ids" : [32, 33, 34, 35, 36, 37, 8],
           "actions" : ["FabricIngress.next.output_simple", "FabricIngress.next.set_vlan_output", "FabricIngress.next.l3_routing_simple", "FabricIngress.next.mpls_routing_v4_simple", "FabricIngress.next.mpls_routing_v6_simple", "FabricIngress.next.l3_routing_vlan", "NoAction"],
           "base_default_next" : null,
           "next_tables" : {
@@ -12341,7 +12169,7 @@
             "__MISS__" : "tbl_act_20"
           },
           "default_entry" : {
-            "action_id" : 10,
+            "action_id" : 8,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -12349,7 +12177,7 @@
         },
         {
           "name" : "tbl_act_19",
-          "id" : 35,
+          "id" : 33,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -12357,14 +12185,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [66],
+          "action_ids" : [62],
           "actions" : ["act_19"],
-          "base_default_next" : "node_54",
+          "base_default_next" : "node_50",
           "next_tables" : {
-            "act_19" : "node_54"
+            "act_19" : "node_50"
           },
           "default_entry" : {
-            "action_id" : 66,
+            "action_id" : 62,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12372,7 +12200,7 @@
         },
         {
           "name" : "tbl_act_20",
-          "id" : 36,
+          "id" : 34,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -12380,14 +12208,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [67],
+          "action_ids" : [63],
           "actions" : ["act_20"],
-          "base_default_next" : "node_54",
+          "base_default_next" : "node_50",
           "next_tables" : {
-            "act_20" : "node_54"
+            "act_20" : "node_50"
           },
           "default_entry" : {
-            "action_id" : 67,
+            "action_id" : 63,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12395,7 +12223,7 @@
         },
         {
           "name" : "FabricIngress.next.hashed",
-          "id" : 37,
+          "id" : 35,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 175,
@@ -12417,7 +12245,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [42, 43, 44, 11],
+          "action_ids" : [38, 39, 40, 9],
           "actions" : ["FabricIngress.next.l3_routing_hashed", "FabricIngress.next.mpls_routing_v4_hashed", "FabricIngress.next.mpls_routing_v6_hashed", "NoAction"],
           "base_default_next" : null,
           "next_tables" : {
@@ -12427,7 +12255,7 @@
         },
         {
           "name" : "tbl_act_21",
-          "id" : 38,
+          "id" : 36,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -12435,14 +12263,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [68],
+          "action_ids" : [64],
           "actions" : ["act_21"],
-          "base_default_next" : "node_58",
+          "base_default_next" : "node_54",
           "next_tables" : {
-            "act_21" : "node_58"
+            "act_21" : "node_54"
           },
           "default_entry" : {
-            "action_id" : 68,
+            "action_id" : 64,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12450,7 +12278,7 @@
         },
         {
           "name" : "tbl_act_22",
-          "id" : 39,
+          "id" : 37,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -12458,14 +12286,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [69],
+          "action_ids" : [65],
           "actions" : ["act_22"],
-          "base_default_next" : "node_58",
+          "base_default_next" : "node_54",
           "next_tables" : {
-            "act_22" : "node_58"
+            "act_22" : "node_54"
           },
           "default_entry" : {
-            "action_id" : 69,
+            "action_id" : 65,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -12473,7 +12301,7 @@
         },
         {
           "name" : "FabricIngress.next.multicast",
-          "id" : 40,
+          "id" : 38,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 207,
@@ -12494,7 +12322,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [45, 12],
+          "action_ids" : [41, 10],
           "actions" : ["FabricIngress.next.set_mcast_group", "NoAction"],
           "base_default_next" : null,
           "next_tables" : {
@@ -12502,7 +12330,7 @@
             "__MISS__" : "tbl_act_24"
           },
           "default_entry" : {
-            "action_id" : 12,
+            "action_id" : 10,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -12510,6 +12338,52 @@
         },
         {
           "name" : "tbl_act_23",
+          "id" : 39,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [66],
+          "actions" : ["act_23"],
+          "base_default_next" : "node_58",
+          "next_tables" : {
+            "act_23" : "node_58"
+          },
+          "default_entry" : {
+            "action_id" : 66,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_24",
+          "id" : 40,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [67],
+          "actions" : ["act_24"],
+          "base_default_next" : "node_58",
+          "next_tables" : {
+            "act_24" : "node_58"
+          },
+          "default_entry" : {
+            "action_id" : 67,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_25",
           "id" : 41,
           "key" : [],
           "match_type" : "exact",
@@ -12518,11 +12392,57 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [70],
-          "actions" : ["act_23"],
-          "base_default_next" : "node_62",
+          "action_ids" : [68],
+          "actions" : ["act_25"],
+          "base_default_next" : "node_60",
           "next_tables" : {
-            "act_23" : "node_62"
+            "act_25" : "node_60"
+          },
+          "default_entry" : {
+            "action_id" : 68,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_26",
+          "id" : 42,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [69],
+          "actions" : ["act_26"],
+          "base_default_next" : "node_66",
+          "next_tables" : {
+            "act_26" : "node_66"
+          },
+          "default_entry" : {
+            "action_id" : 69,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_27",
+          "id" : 43,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [70],
+          "actions" : ["act_27"],
+          "base_default_next" : "node_66",
+          "next_tables" : {
+            "act_27" : "node_66"
           },
           "default_entry" : {
             "action_id" : 70,
@@ -12532,8 +12452,8 @@
           }
         },
         {
-          "name" : "tbl_act_24",
-          "id" : 42,
+          "name" : "tbl_act_28",
+          "id" : 44,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -12542,10 +12462,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [71],
-          "actions" : ["act_24"],
-          "base_default_next" : "node_62",
+          "actions" : ["act_28"],
+          "base_default_next" : "node_68",
           "next_tables" : {
-            "act_24" : "node_62"
+            "act_28" : "node_68"
           },
           "default_entry" : {
             "action_id" : 71,
@@ -12555,8 +12475,8 @@
           }
         },
         {
-          "name" : "tbl_act_25",
-          "id" : 43,
+          "name" : "tbl_act_29",
+          "id" : 45,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -12565,10 +12485,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [72],
-          "actions" : ["act_25"],
-          "base_default_next" : "node_64",
+          "actions" : ["act_29"],
+          "base_default_next" : "FabricIngress.process_set_source_sink.tb_set_source",
           "next_tables" : {
-            "act_25" : "node_64"
+            "act_29" : "FabricIngress.process_set_source_sink.tb_set_source"
           },
           "default_entry" : {
             "action_id" : 72,
@@ -12578,100 +12498,8 @@
           }
         },
         {
-          "name" : "tbl_act_26",
-          "id" : 44,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [73],
-          "actions" : ["act_26"],
-          "base_default_next" : "node_70",
-          "next_tables" : {
-            "act_26" : "node_70"
-          },
-          "default_entry" : {
-            "action_id" : 73,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_27",
-          "id" : 45,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [74],
-          "actions" : ["act_27"],
-          "base_default_next" : "node_70",
-          "next_tables" : {
-            "act_27" : "node_70"
-          },
-          "default_entry" : {
-            "action_id" : 74,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_28",
-          "id" : 46,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [75],
-          "actions" : ["act_28"],
-          "base_default_next" : "node_72",
-          "next_tables" : {
-            "act_28" : "node_72"
-          },
-          "default_entry" : {
-            "action_id" : 75,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_29",
-          "id" : 47,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [76],
-          "actions" : ["act_29"],
-          "base_default_next" : "FabricIngress.process_set_source_sink.tb_set_source",
-          "next_tables" : {
-            "act_29" : "FabricIngress.process_set_source_sink.tb_set_source"
-          },
-          "default_entry" : {
-            "action_id" : 76,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
           "name" : "FabricIngress.process_set_source_sink.tb_set_source",
-          "id" : 48,
+          "id" : 46,
           "source_info" : {
             "filename" : "include/int_source.p4",
             "line" : 101,
@@ -12692,7 +12520,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [17, 2],
+          "action_ids" : [15, 2],
           "actions" : ["FabricIngress.process_set_source_sink.int_set_source", "NoAction"],
           "base_default_next" : "FabricIngress.process_set_source_sink.tb_set_sink",
           "next_tables" : {
@@ -12708,7 +12536,7 @@
         },
         {
           "name" : "FabricIngress.process_set_source_sink.tb_set_sink",
-          "id" : 49,
+          "id" : 47,
           "source_info" : {
             "filename" : "include/int_source.p4",
             "line" : 111,
@@ -12729,12 +12557,12 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [18, 3],
+          "action_ids" : [16, 3],
           "actions" : ["FabricIngress.process_set_source_sink.int_set_sink", "NoAction"],
-          "base_default_next" : "node_76",
+          "base_default_next" : "node_72",
           "next_tables" : {
-            "FabricIngress.process_set_source_sink.int_set_sink" : "node_76",
-            "NoAction" : "node_76"
+            "FabricIngress.process_set_source_sink.int_set_sink" : "node_72",
+            "NoAction" : "node_72"
           },
           "default_entry" : {
             "action_id" : 3,
@@ -12745,7 +12573,7 @@
         },
         {
           "name" : "tbl_act_30",
-          "id" : 50,
+          "id" : 48,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -12753,14 +12581,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [77],
+          "action_ids" : [73],
           "actions" : ["act_30"],
           "base_default_next" : null,
           "next_tables" : {
             "act_30" : null
           },
           "default_entry" : {
-            "action_id" : 77,
+            "action_id" : 73,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13016,7 +12844,7 @@
           "id" : 9,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 235,
+            "line" : 186,
             "column" : 11,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_BRIDGING"
           },
@@ -13042,7 +12870,7 @@
           "id" : 10,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 236,
+            "line" : 187,
             "column" : 17,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_MPLS"
           },
@@ -13068,7 +12896,7 @@
           "id" : 11,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 242,
+            "line" : 193,
             "column" : 17,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_IPV4_UNICAST"
           },
@@ -13086,7 +12914,7 @@
               }
             }
           },
-          "true_next" : "FabricIngress.forwarding.unicast_v4",
+          "true_next" : "FabricIngress.forwarding.routing_v4",
           "false_next" : "node_42"
         },
         {
@@ -13094,33 +12922,7 @@
           "id" : 12,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 244,
-            "column" : 17,
-            "source_fragment" : "fabric_metadata.fwd_type == FWD_IPV4_MULTICAST"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "==",
-              "left" : {
-                "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.fwd_type"]
-              },
-              "right" : {
-                "type" : "hexstr",
-                "value" : "0x03"
-              }
-            }
-          },
-          "true_next" : "FabricIngress.forwarding.multicast_v4",
-          "false_next" : "node_44"
-        },
-        {
-          "name" : "node_44",
-          "id" : 13,
-          "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 247,
+            "line" : 195,
             "column" : 17,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_IPV6_UNICAST"
           },
@@ -13138,38 +12940,12 @@
               }
             }
           },
-          "true_next" : "FabricIngress.forwarding.unicast_v6",
-          "false_next" : "node_46"
-        },
-        {
-          "name" : "node_46",
-          "id" : 14,
-          "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 249,
-            "column" : 17,
-            "source_fragment" : "fabric_metadata.fwd_type == FWD_IPV6_MULTICAST"
-          },
-          "expression" : {
-            "type" : "expression",
-            "value" : {
-              "op" : "==",
-              "left" : {
-                "type" : "field",
-                "value" : ["scalars", "fabric_metadata_t.fwd_type"]
-              },
-              "right" : {
-                "type" : "hexstr",
-                "value" : "0x05"
-              }
-            }
-          },
-          "true_next" : "FabricIngress.forwarding.multicast_v6",
+          "true_next" : "FabricIngress.forwarding.routing_v6",
           "false_next" : "FabricIngress.forwarding.acl"
         },
         {
-          "name" : "node_54",
-          "id" : 15,
+          "name" : "node_50",
+          "id" : 13,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 219,
@@ -13195,11 +12971,11 @@
             }
           },
           "true_next" : "FabricIngress.next.hashed",
-          "false_next" : "node_64"
+          "false_next" : "node_60"
         },
         {
-          "name" : "node_58",
-          "id" : 16,
+          "name" : "node_54",
+          "id" : 14,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 220,
@@ -13225,11 +13001,11 @@
             }
           },
           "true_next" : "FabricIngress.next.multicast",
-          "false_next" : "node_64"
+          "false_next" : "node_60"
         },
         {
-          "name" : "node_62",
-          "id" : 17,
+          "name" : "node_58",
+          "id" : 15,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 221,
@@ -13255,11 +13031,11 @@
             }
           },
           "true_next" : "tbl_act_25",
-          "false_next" : "node_64"
+          "false_next" : "node_60"
         },
         {
-          "name" : "node_64",
-          "id" : 18,
+          "name" : "node_60",
+          "id" : 16,
           "expression" : {
             "type" : "expression",
             "value" : {
@@ -13278,12 +13054,12 @@
               }
             }
           },
-          "true_next" : "node_65",
-          "false_next" : "node_70"
+          "true_next" : "node_61",
+          "false_next" : "node_66"
         },
         {
-          "name" : "node_65",
-          "id" : 19,
+          "name" : "node_61",
+          "id" : 17,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 228,
@@ -13308,12 +13084,12 @@
               }
             }
           },
-          "true_next" : "node_66",
-          "false_next" : "node_70"
+          "true_next" : "node_62",
+          "false_next" : "node_66"
         },
         {
-          "name" : "node_66",
-          "id" : 20,
+          "name" : "node_62",
+          "id" : 18,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 229,
@@ -13332,11 +13108,11 @@
             }
           },
           "true_next" : "tbl_act_26",
-          "false_next" : "node_68"
+          "false_next" : "node_64"
         },
         {
-          "name" : "node_68",
-          "id" : 21,
+          "name" : "node_64",
+          "id" : 19,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 233,
@@ -13355,11 +13131,11 @@
             }
           },
           "true_next" : "tbl_act_27",
-          "false_next" : "node_70"
+          "false_next" : "node_66"
         },
         {
-          "name" : "node_70",
-          "id" : 22,
+          "name" : "node_66",
+          "id" : 20,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
             "line" : 27,
@@ -13381,11 +13157,11 @@
             }
           },
           "true_next" : "tbl_act_28",
-          "false_next" : "node_72"
+          "false_next" : "node_68"
         },
         {
-          "name" : "node_72",
-          "id" : 23,
+          "name" : "node_68",
+          "id" : 21,
           "source_info" : {
             "filename" : "include/control/port_counter.p4",
             "line" : 30,
@@ -13410,8 +13186,8 @@
           "false_next" : "FabricIngress.process_set_source_sink.tb_set_source"
         },
         {
-          "name" : "node_76",
-          "id" : 24,
+          "name" : "node_72",
+          "id" : 22,
           "source_info" : {
             "filename" : "fabric.p4",
             "line" : 70,
@@ -13446,11 +13222,11 @@
         "column" : 8,
         "source_fragment" : "FabricEgress"
       },
-      "init_table" : "node_80",
+      "init_table" : "node_76",
       "tables" : [
         {
           "name" : "tbl_drop_now_0",
-          "id" : 51,
+          "id" : 49,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -13458,14 +13234,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [84],
+          "action_ids" : [80],
           "actions" : ["drop_now"],
           "base_default_next" : "FabricEgress.egress_next.egress_vlan",
           "next_tables" : {
             "drop_now" : "FabricEgress.egress_next.egress_vlan"
           },
           "default_entry" : {
-            "action_id" : 84,
+            "action_id" : 80,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13473,7 +13249,7 @@
         },
         {
           "name" : "FabricEgress.egress_next.egress_vlan",
-          "id" : 52,
+          "id" : 50,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 258,
@@ -13500,15 +13276,15 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [129, 83],
+          "action_ids" : [125, 79],
           "actions" : ["FabricEgress.egress_next.pop_vlan", "nop"],
-          "base_default_next" : "node_83",
+          "base_default_next" : "node_79",
           "next_tables" : {
-            "FabricEgress.egress_next.pop_vlan" : "node_83",
-            "nop" : "node_83"
+            "FabricEgress.egress_next.pop_vlan" : "node_79",
+            "nop" : "node_79"
           },
           "default_entry" : {
-            "action_id" : 83,
+            "action_id" : 79,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -13516,6 +13292,52 @@
         },
         {
           "name" : "tbl_pkt_io_egress_pop_vlan",
+          "id" : 51,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [124],
+          "actions" : ["FabricEgress.pkt_io_egress.pop_vlan"],
+          "base_default_next" : "node_82",
+          "next_tables" : {
+            "FabricEgress.pkt_io_egress.pop_vlan" : "node_82"
+          },
+          "default_entry" : {
+            "action_id" : 124,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_drop_now_1",
+          "id" : 52,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [81],
+          "actions" : ["drop_now"],
+          "base_default_next" : "tbl_act_31",
+          "next_tables" : {
+            "drop_now" : "tbl_act_31"
+          },
+          "default_entry" : {
+            "action_id" : 81,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_31",
           "id" : 53,
           "key" : [],
           "match_type" : "exact",
@@ -13524,21 +13346,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [128],
-          "actions" : ["FabricEgress.pkt_io_egress.pop_vlan"],
-          "base_default_next" : "node_86",
+          "action_ids" : [126],
+          "actions" : ["act_31"],
+          "base_default_next" : "node_85",
           "next_tables" : {
-            "FabricEgress.pkt_io_egress.pop_vlan" : "node_86"
+            "act_31" : "node_85"
           },
           "default_entry" : {
-            "action_id" : 128,
+            "action_id" : 126,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_drop_now_1",
+          "name" : "tbl_spgw_egress_gtpu_encap",
           "id" : 54,
           "key" : [],
           "match_type" : "exact",
@@ -13547,60 +13369,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [85],
-          "actions" : ["drop_now"],
-          "base_default_next" : "tbl_act_31",
-          "next_tables" : {
-            "drop_now" : "tbl_act_31"
-          },
-          "default_entry" : {
-            "action_id" : 85,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_31",
-          "id" : 55,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [130],
-          "actions" : ["act_31"],
-          "base_default_next" : "node_89",
-          "next_tables" : {
-            "act_31" : "node_89"
-          },
-          "default_entry" : {
-            "action_id" : 130,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_spgw_egress_gtpu_encap",
-          "id" : 56,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [86],
+          "action_ids" : [82],
           "actions" : ["FabricEgress.spgw_egress.gtpu_encap"],
-          "base_default_next" : "node_91",
+          "base_default_next" : "node_87",
           "next_tables" : {
-            "FabricEgress.spgw_egress.gtpu_encap" : "node_91"
+            "FabricEgress.spgw_egress.gtpu_encap" : "node_87"
           },
           "default_entry" : {
-            "action_id" : 86,
+            "action_id" : 82,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13608,7 +13384,7 @@
         },
         {
           "name" : "FabricEgress.process_int_source.tb_int_source",
-          "id" : 57,
+          "id" : 55,
           "source_info" : {
             "filename" : "include/int_source.p4",
             "line" : 66,
@@ -13647,15 +13423,15 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [87, 78],
+          "action_ids" : [83, 74],
           "actions" : ["FabricEgress.process_int_source.int_source_dscp", "NoAction"],
-          "base_default_next" : "node_94",
+          "base_default_next" : "node_90",
           "next_tables" : {
-            "FabricEgress.process_int_source.int_source_dscp" : "node_94",
-            "NoAction" : "node_94"
+            "FabricEgress.process_int_source.int_source_dscp" : "node_90",
+            "NoAction" : "node_90"
           },
           "default_entry" : {
-            "action_id" : 78,
+            "action_id" : 74,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -13663,7 +13439,7 @@
         },
         {
           "name" : "FabricEgress.process_int_transit.tb_int_insert",
-          "id" : 58,
+          "id" : 56,
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 227,
@@ -13677,7 +13453,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [89, 79],
+          "action_ids" : [85, 75],
           "actions" : ["FabricEgress.process_int_transit.int_transit", "NoAction"],
           "base_default_next" : "FabricEgress.process_int_transit.tb_int_inst_0003",
           "next_tables" : {
@@ -13685,7 +13461,7 @@
             "NoAction" : "FabricEgress.process_int_transit.tb_int_inst_0003"
           },
           "default_entry" : {
-            "action_id" : 79,
+            "action_id" : 75,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -13693,7 +13469,7 @@
         },
         {
           "name" : "FabricEgress.process_int_transit.tb_int_inst_0003",
-          "id" : 59,
+          "id" : 57,
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 237,
@@ -13714,7 +13490,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 80],
+          "action_ids" : [86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 76],
           "actions" : ["FabricEgress.process_int_transit.int_set_header_0003_i0", "FabricEgress.process_int_transit.int_set_header_0003_i1", "FabricEgress.process_int_transit.int_set_header_0003_i2", "FabricEgress.process_int_transit.int_set_header_0003_i3", "FabricEgress.process_int_transit.int_set_header_0003_i4", "FabricEgress.process_int_transit.int_set_header_0003_i5", "FabricEgress.process_int_transit.int_set_header_0003_i6", "FabricEgress.process_int_transit.int_set_header_0003_i7", "FabricEgress.process_int_transit.int_set_header_0003_i8", "FabricEgress.process_int_transit.int_set_header_0003_i9", "FabricEgress.process_int_transit.int_set_header_0003_i10", "FabricEgress.process_int_transit.int_set_header_0003_i11", "FabricEgress.process_int_transit.int_set_header_0003_i12", "FabricEgress.process_int_transit.int_set_header_0003_i13", "FabricEgress.process_int_transit.int_set_header_0003_i14", "FabricEgress.process_int_transit.int_set_header_0003_i15", "NoAction"],
           "base_default_next" : "FabricEgress.process_int_transit.tb_int_inst_0407",
           "next_tables" : {
@@ -13737,7 +13513,7 @@
             "NoAction" : "FabricEgress.process_int_transit.tb_int_inst_0407"
           },
           "default_entry" : {
-            "action_id" : 80,
+            "action_id" : 76,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -13745,7 +13521,7 @@
         },
         {
           "name" : "FabricEgress.process_int_transit.tb_int_inst_0407",
-          "id" : 60,
+          "id" : 58,
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 264,
@@ -13766,7 +13542,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 81],
+          "action_ids" : [102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 77],
           "actions" : ["FabricEgress.process_int_transit.int_set_header_0407_i0", "FabricEgress.process_int_transit.int_set_header_0407_i1", "FabricEgress.process_int_transit.int_set_header_0407_i2", "FabricEgress.process_int_transit.int_set_header_0407_i3", "FabricEgress.process_int_transit.int_set_header_0407_i4", "FabricEgress.process_int_transit.int_set_header_0407_i5", "FabricEgress.process_int_transit.int_set_header_0407_i6", "FabricEgress.process_int_transit.int_set_header_0407_i7", "FabricEgress.process_int_transit.int_set_header_0407_i8", "FabricEgress.process_int_transit.int_set_header_0407_i9", "FabricEgress.process_int_transit.int_set_header_0407_i10", "FabricEgress.process_int_transit.int_set_header_0407_i11", "FabricEgress.process_int_transit.int_set_header_0407_i12", "FabricEgress.process_int_transit.int_set_header_0407_i13", "FabricEgress.process_int_transit.int_set_header_0407_i14", "FabricEgress.process_int_transit.int_set_header_0407_i15", "NoAction"],
           "base_default_next" : "tbl_process_int_transit_int_update_total_hop_cnt",
           "next_tables" : {
@@ -13789,7 +13565,7 @@
             "NoAction" : "tbl_process_int_transit_int_update_total_hop_cnt"
           },
           "default_entry" : {
-            "action_id" : 81,
+            "action_id" : 77,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -13797,6 +13573,52 @@
         },
         {
           "name" : "tbl_process_int_transit_int_update_total_hop_cnt",
+          "id" : 59,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [84],
+          "actions" : ["FabricEgress.process_int_transit.int_update_total_hop_cnt"],
+          "base_default_next" : "node_95",
+          "next_tables" : {
+            "FabricEgress.process_int_transit.int_update_total_hop_cnt" : "node_95"
+          },
+          "default_entry" : {
+            "action_id" : 84,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_process_int_outer_encap_int_update_ipv4",
+          "id" : 60,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [118],
+          "actions" : ["FabricEgress.process_int_outer_encap.int_update_ipv4"],
+          "base_default_next" : "node_97",
+          "next_tables" : {
+            "FabricEgress.process_int_outer_encap.int_update_ipv4" : "node_97"
+          },
+          "default_entry" : {
+            "action_id" : 118,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_process_int_outer_encap_int_update_udp",
           "id" : 61,
           "key" : [],
           "match_type" : "exact",
@@ -13805,21 +13627,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [88],
-          "actions" : ["FabricEgress.process_int_transit.int_update_total_hop_cnt"],
+          "action_ids" : [119],
+          "actions" : ["FabricEgress.process_int_outer_encap.int_update_udp"],
           "base_default_next" : "node_99",
           "next_tables" : {
-            "FabricEgress.process_int_transit.int_update_total_hop_cnt" : "node_99"
+            "FabricEgress.process_int_outer_encap.int_update_udp" : "node_99"
           },
           "default_entry" : {
-            "action_id" : 88,
+            "action_id" : 119,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_process_int_outer_encap_int_update_ipv4",
+          "name" : "tbl_process_int_outer_encap_int_update_shim",
           "id" : 62,
           "key" : [],
           "match_type" : "exact",
@@ -13828,60 +13650,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [122],
-          "actions" : ["FabricEgress.process_int_outer_encap.int_update_ipv4"],
+          "action_ids" : [120],
+          "actions" : ["FabricEgress.process_int_outer_encap.int_update_shim"],
           "base_default_next" : "node_101",
           "next_tables" : {
-            "FabricEgress.process_int_outer_encap.int_update_ipv4" : "node_101"
+            "FabricEgress.process_int_outer_encap.int_update_shim" : "node_101"
           },
           "default_entry" : {
-            "action_id" : 122,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_process_int_outer_encap_int_update_udp",
-          "id" : 63,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [123],
-          "actions" : ["FabricEgress.process_int_outer_encap.int_update_udp"],
-          "base_default_next" : "node_103",
-          "next_tables" : {
-            "FabricEgress.process_int_outer_encap.int_update_udp" : "node_103"
-          },
-          "default_entry" : {
-            "action_id" : 123,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_process_int_outer_encap_int_update_shim",
-          "id" : 64,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [124],
-          "actions" : ["FabricEgress.process_int_outer_encap.int_update_shim"],
-          "base_default_next" : "node_105",
-          "next_tables" : {
-            "FabricEgress.process_int_outer_encap.int_update_shim" : "node_105"
-          },
-          "default_entry" : {
-            "action_id" : 124,
+            "action_id" : 120,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13889,7 +13665,7 @@
         },
         {
           "name" : "FabricEgress.process_int_report.tb_generate_report",
-          "id" : 65,
+          "id" : 63,
           "source_info" : {
             "filename" : "include/int_report.p4",
             "line" : 87,
@@ -13903,15 +13679,15 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [125, 82],
+          "action_ids" : [121, 78],
           "actions" : ["FabricEgress.process_int_report.do_report_encapsulation", "NoAction"],
-          "base_default_next" : "node_107",
+          "base_default_next" : "node_103",
           "next_tables" : {
-            "FabricEgress.process_int_report.do_report_encapsulation" : "node_107",
-            "NoAction" : "node_107"
+            "FabricEgress.process_int_report.do_report_encapsulation" : "node_103",
+            "NoAction" : "node_103"
           },
           "default_entry" : {
-            "action_id" : 82,
+            "action_id" : 78,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -13919,7 +13695,7 @@
         },
         {
           "name" : "tbl_process_int_sink_restore_header",
-          "id" : 66,
+          "id" : 64,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -13927,14 +13703,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [126],
+          "action_ids" : [122],
           "actions" : ["FabricEgress.process_int_sink.restore_header"],
           "base_default_next" : "tbl_process_int_sink_int_sink",
           "next_tables" : {
             "FabricEgress.process_int_sink.restore_header" : "tbl_process_int_sink_int_sink"
           },
           "default_entry" : {
-            "action_id" : 126,
+            "action_id" : 122,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13942,7 +13718,7 @@
         },
         {
           "name" : "tbl_process_int_sink_int_sink",
-          "id" : 67,
+          "id" : 65,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -13950,14 +13726,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [127],
+          "action_ids" : [123],
           "actions" : ["FabricEgress.process_int_sink.int_sink"],
           "base_default_next" : null,
           "next_tables" : {
             "FabricEgress.process_int_sink.int_sink" : null
           },
           "default_entry" : {
-            "action_id" : 127,
+            "action_id" : 123,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -13967,8 +13743,8 @@
       "action_profiles" : [],
       "conditionals" : [
         {
-          "name" : "node_80",
-          "id" : 25,
+          "name" : "node_76",
+          "id" : 23,
           "source_info" : {
             "filename" : "include/control/next.p4",
             "line" : 272,
@@ -14020,8 +13796,8 @@
           "false_next" : "FabricEgress.egress_next.egress_vlan"
         },
         {
-          "name" : "node_83",
-          "id" : 26,
+          "name" : "node_79",
+          "id" : 24,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 42,
@@ -14042,12 +13818,12 @@
               }
             }
           },
-          "true_next" : "node_84",
-          "false_next" : "node_89"
+          "true_next" : "node_80",
+          "false_next" : "node_85"
         },
         {
-          "name" : "node_84",
-          "id" : 27,
+          "name" : "node_80",
+          "id" : 25,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 43,
@@ -14093,11 +13869,11 @@
             }
           },
           "true_next" : "tbl_pkt_io_egress_pop_vlan",
-          "false_next" : "node_86"
+          "false_next" : "node_82"
         },
         {
-          "name" : "node_86",
-          "id" : 28,
+          "name" : "node_82",
+          "id" : 26,
           "source_info" : {
             "filename" : "include/control/packetio.p4",
             "line" : 46,
@@ -14156,8 +13932,8 @@
           "false_next" : "tbl_act_31"
         },
         {
-          "name" : "node_89",
-          "id" : 29,
+          "name" : "node_85",
+          "id" : 27,
           "source_info" : {
             "filename" : "include/spgw.p4",
             "line" : 221,
@@ -14179,11 +13955,11 @@
             }
           },
           "true_next" : "tbl_spgw_egress_gtpu_encap",
-          "false_next" : "node_91"
+          "false_next" : "node_87"
         },
         {
-          "name" : "node_91",
-          "id" : 30,
+          "name" : "node_87",
+          "id" : 28,
           "source_info" : {
             "filename" : "fabric.p4",
             "line" : 94,
@@ -14259,11 +14035,11 @@
             }
           },
           "false_next" : null,
-          "true_next" : "node_92"
+          "true_next" : "node_88"
         },
         {
-          "name" : "node_92",
-          "id" : 31,
+          "name" : "node_88",
+          "id" : 29,
           "source_info" : {
             "filename" : "fabric.p4",
             "line" : 97,
@@ -14285,11 +14061,11 @@
             }
           },
           "true_next" : "FabricEgress.process_int_source.tb_int_source",
-          "false_next" : "node_94"
+          "false_next" : "node_90"
         },
         {
-          "name" : "node_94",
-          "id" : 32,
+          "name" : "node_90",
+          "id" : 30,
           "source_info" : {
             "filename" : "fabric.p4",
             "line" : 100,
@@ -14311,8 +14087,8 @@
           "true_next" : "FabricEgress.process_int_transit.tb_int_insert"
         },
         {
-          "name" : "node_99",
-          "id" : 33,
+          "name" : "node_95",
+          "id" : 31,
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 314,
@@ -14331,11 +14107,11 @@
             }
           },
           "true_next" : "tbl_process_int_outer_encap_int_update_ipv4",
-          "false_next" : "node_101"
+          "false_next" : "node_97"
         },
         {
-          "name" : "node_101",
-          "id" : 34,
+          "name" : "node_97",
+          "id" : 32,
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 317,
@@ -14354,11 +14130,11 @@
             }
           },
           "true_next" : "tbl_process_int_outer_encap_int_update_udp",
-          "false_next" : "node_103"
+          "false_next" : "node_99"
         },
         {
-          "name" : "node_103",
-          "id" : 35,
+          "name" : "node_99",
+          "id" : 33,
           "source_info" : {
             "filename" : "include/int_transit.p4",
             "line" : 320,
@@ -14377,11 +14153,11 @@
             }
           },
           "true_next" : "tbl_process_int_outer_encap_int_update_shim",
-          "false_next" : "node_105"
+          "false_next" : "node_101"
         },
         {
-          "name" : "node_105",
-          "id" : 36,
+          "name" : "node_101",
+          "id" : 34,
           "source_info" : {
             "filename" : "fabric.p4",
             "line" : 104,
@@ -14403,11 +14179,11 @@
             }
           },
           "true_next" : "FabricEgress.process_int_report.tb_generate_report",
-          "false_next" : "node_107"
+          "false_next" : "node_103"
         },
         {
-          "name" : "node_107",
-          "id" : 37,
+          "name" : "node_103",
+          "id" : 35,
           "source_info" : {
             "filename" : "fabric.p4",
             "line" : 108,
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt b/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt
index c3f101c..a5dd8cf 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt
@@ -142,7 +142,7 @@
     id: 2
     name: "hdr.ethernet.dst_addr"
     bitwidth: 48
-    match_type: EXACT
+    match_type: TERNARY
   }
   match_fields {
     id: 3
@@ -212,9 +212,9 @@
 }
 tables {
   preamble {
-    id: 33586372
-    name: "FabricIngress.forwarding.unicast_v4"
-    alias: "unicast_v4"
+    id: 33562650
+    name: "FabricIngress.forwarding.routing_v4"
+    alias: "routing_v4"
   }
   match_fields {
     id: 1
@@ -223,13 +223,13 @@
     match_type: LPM
   }
   action_refs {
-    id: 16828976
+    id: 16777434
   }
   action_refs {
     id: 16800567
     annotations: "@defaultonly()"
   }
-  direct_resource_ids: 318768492
+  direct_resource_ids: 318811107
   size: 1024
   idle_timeout_behavior: NO_TIMEOUT
 }
@@ -333,38 +333,9 @@
 }
 tables {
   preamble {
-    id: 33578363
-    name: "FabricIngress.forwarding.multicast_v4"
-    alias: "multicast_v4"
-  }
-  match_fields {
-    id: 1
-    name: "hdr.vlan_tag.vlan_id"
-    bitwidth: 12
-    match_type: EXACT
-  }
-  match_fields {
-    id: 2
-    name: "hdr.ipv4.dst_addr"
-    bitwidth: 32
-    match_type: LPM
-  }
-  action_refs {
-    id: 16809157
-  }
-  action_refs {
-    id: 16800567
-    annotations: "@defaultonly()"
-  }
-  direct_resource_ids: 318797896
-  size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
-}
-tables {
-  preamble {
-    id: 33568751
-    name: "FabricIngress.forwarding.unicast_v6"
-    alias: "unicast_v6"
+    id: 33614081
+    name: "FabricIngress.forwarding.routing_v6"
+    alias: "routing_v6"
   }
   match_fields {
     id: 1
@@ -373,42 +344,13 @@
     match_type: LPM
   }
   action_refs {
-    id: 16823773
+    id: 16809751
   }
   action_refs {
     id: 16800567
     annotations: "@defaultonly()"
   }
-  direct_resource_ids: 318820865
-  size: 1024
-  idle_timeout_behavior: NO_TIMEOUT
-}
-tables {
-  preamble {
-    id: 33581295
-    name: "FabricIngress.forwarding.multicast_v6"
-    alias: "multicast_v6"
-  }
-  match_fields {
-    id: 1
-    name: "hdr.vlan_tag.vlan_id"
-    bitwidth: 12
-    match_type: EXACT
-  }
-  match_fields {
-    id: 2
-    name: "hdr.ipv6.dst_addr"
-    bitwidth: 128
-    match_type: LPM
-  }
-  action_refs {
-    id: 16819612
-  }
-  action_refs {
-    id: 16800567
-    annotations: "@defaultonly()"
-  }
-  direct_resource_ids: 318815310
+  direct_resource_ids: 318799210
   size: 1024
   idle_timeout_behavior: NO_TIMEOUT
 }
@@ -905,9 +847,9 @@
 }
 actions {
   preamble {
-    id: 16828976
-    name: "FabricIngress.forwarding.set_next_id_unicast_v4"
-    alias: "set_next_id_unicast_v4"
+    id: 16777434
+    name: "FabricIngress.forwarding.set_next_id_routing_v4"
+    alias: "set_next_id_routing_v4"
   }
   params {
     id: 1
@@ -957,33 +899,9 @@
 }
 actions {
   preamble {
-    id: 16809157
-    name: "FabricIngress.forwarding.set_next_id_multicast_v4"
-    alias: "set_next_id_multicast_v4"
-  }
-  params {
-    id: 1
-    name: "next_id"
-    bitwidth: 32
-  }
-}
-actions {
-  preamble {
-    id: 16823773
-    name: "FabricIngress.forwarding.set_next_id_unicast_v6"
-    alias: "set_next_id_unicast_v6"
-  }
-  params {
-    id: 1
-    name: "next_id"
-    bitwidth: 32
-  }
-}
-actions {
-  preamble {
-    id: 16819612
-    name: "FabricIngress.forwarding.set_next_id_multicast_v6"
-    alias: "set_next_id_multicast_v6"
+    id: 16809751
+    name: "FabricIngress.forwarding.set_next_id_routing_v6"
+    alias: "set_next_id_routing_v6"
   }
   params {
     id: 1
@@ -1692,14 +1610,14 @@
 }
 direct_counters {
   preamble {
-    id: 318768492
-    name: "FabricIngress.forwarding.unicast_v4_counter"
-    alias: "unicast_v4_counter"
+    id: 318811107
+    name: "FabricIngress.forwarding.routing_v4_counter"
+    alias: "routing_v4_counter"
   }
   spec {
     unit: BOTH
   }
-  direct_table_id: 33586372
+  direct_table_id: 33562650
 }
 direct_counters {
   preamble {
@@ -1714,36 +1632,14 @@
 }
 direct_counters {
   preamble {
-    id: 318797896
-    name: "FabricIngress.forwarding.multicast_v4_counter"
-    alias: "multicast_v4_counter"
+    id: 318799210
+    name: "FabricIngress.forwarding.routing_v6_counter"
+    alias: "routing_v6_counter"
   }
   spec {
     unit: BOTH
   }
-  direct_table_id: 33578363
-}
-direct_counters {
-  preamble {
-    id: 318820865
-    name: "FabricIngress.forwarding.unicast_v6_counter"
-    alias: "unicast_v6_counter"
-  }
-  spec {
-    unit: BOTH
-  }
-  direct_table_id: 33568751
-}
-direct_counters {
-  preamble {
-    id: 318815310
-    name: "FabricIngress.forwarding.multicast_v6_counter"
-    alias: "multicast_v6_counter"
-  }
-  spec {
-    unit: BOTH
-  }
-  direct_table_id: 33581295
+  direct_table_id: 33614081
 }
 direct_counters {
   preamble {
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
index dfb2b04..2885ebd 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
@@ -1387,10 +1387,10 @@
       "binding" : "FabricIngress.forwarding.mpls"
     },
     {
-      "name" : "FabricIngress.forwarding.unicast_v4_counter",
+      "name" : "FabricIngress.forwarding.routing_v4_counter",
       "id" : 6,
       "is_direct" : true,
-      "binding" : "FabricIngress.forwarding.unicast_v4"
+      "binding" : "FabricIngress.forwarding.routing_v4"
     },
     {
       "name" : "FabricIngress.forwarding.acl_counter",
@@ -2024,7 +2024,7 @@
       ]
     },
     {
-      "name" : "FabricIngress.forwarding.set_next_id_unicast_v4",
+      "name" : "FabricIngress.forwarding.set_next_id_routing_v4",
       "id" : 18,
       "runtime_data" : [
         {
@@ -9531,7 +9531,7 @@
               "mask" : null
             },
             {
-              "match_type" : "exact",
+              "match_type" : "ternary",
               "name" : "hdr.ethernet.dst_addr",
               "target" : ["ethernet", "dst_addr"],
               "mask" : null
@@ -9543,7 +9543,7 @@
               "mask" : null
             }
           ],
-          "match_type" : "exact",
+          "match_type" : "ternary",
           "type" : "simple",
           "max_size" : 1024,
           "with_counters" : true,
@@ -9689,13 +9689,13 @@
           }
         },
         {
-          "name" : "FabricIngress.forwarding.unicast_v4",
+          "name" : "FabricIngress.forwarding.routing_v4",
           "id" : 9,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 87,
             "column" : 10,
-            "source_fragment" : "unicast_v4"
+            "source_fragment" : "routing_v4"
           },
           "key" : [
             {
@@ -9712,10 +9712,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [18, 4],
-          "actions" : ["FabricIngress.forwarding.set_next_id_unicast_v4", "NoAction"],
+          "actions" : ["FabricIngress.forwarding.set_next_id_routing_v4", "NoAction"],
           "base_default_next" : "FabricIngress.forwarding.acl",
           "next_tables" : {
-            "FabricIngress.forwarding.set_next_id_unicast_v4" : "FabricIngress.forwarding.acl",
+            "FabricIngress.forwarding.set_next_id_routing_v4" : "FabricIngress.forwarding.acl",
             "NoAction" : "FabricIngress.forwarding.acl"
           },
           "default_entry" : {
@@ -10403,7 +10403,7 @@
           "id" : 2,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 235,
+            "line" : 186,
             "column" : 11,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_BRIDGING"
           },
@@ -10429,7 +10429,7 @@
           "id" : 3,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 236,
+            "line" : 187,
             "column" : 17,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_MPLS"
           },
@@ -10455,7 +10455,7 @@
           "id" : 4,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 250,
+            "line" : 193,
             "column" : 17,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_IPV4_UNICAST"
           },
@@ -10473,7 +10473,7 @@
               }
             }
           },
-          "true_next" : "FabricIngress.forwarding.unicast_v4",
+          "true_next" : "FabricIngress.forwarding.routing_v4",
           "false_next" : "FabricIngress.forwarding.acl"
         },
         {
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/p4info.txt b/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/p4info.txt
index 53a3653..f82a75e 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/p4info.txt
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/p4info.txt
@@ -101,7 +101,7 @@
     id: 2
     name: "hdr.ethernet.dst_addr"
     bitwidth: 48
-    match_type: EXACT
+    match_type: TERNARY
   }
   match_fields {
     id: 3
@@ -171,9 +171,9 @@
 }
 tables {
   preamble {
-    id: 33586372
-    name: "FabricIngress.forwarding.unicast_v4"
-    alias: "unicast_v4"
+    id: 33562650
+    name: "FabricIngress.forwarding.routing_v4"
+    alias: "routing_v4"
   }
   match_fields {
     id: 1
@@ -182,13 +182,13 @@
     match_type: LPM
   }
   action_refs {
-    id: 16828976
+    id: 16777434
   }
   action_refs {
     id: 16800567
     annotations: "@defaultonly()"
   }
-  direct_resource_ids: 318768492
+  direct_resource_ids: 318811107
   size: 1024
   idle_timeout_behavior: NO_TIMEOUT
 }
@@ -747,9 +747,9 @@
 }
 actions {
   preamble {
-    id: 16828976
-    name: "FabricIngress.forwarding.set_next_id_unicast_v4"
-    alias: "set_next_id_unicast_v4"
+    id: 16777434
+    name: "FabricIngress.forwarding.set_next_id_routing_v4"
+    alias: "set_next_id_routing_v4"
   }
   params {
     id: 1
@@ -1487,14 +1487,14 @@
 }
 direct_counters {
   preamble {
-    id: 318768492
-    name: "FabricIngress.forwarding.unicast_v4_counter"
-    alias: "unicast_v4_counter"
+    id: 318811107
+    name: "FabricIngress.forwarding.routing_v4_counter"
+    alias: "routing_v4_counter"
   }
   spec {
     unit: BOTH
   }
-  direct_table_id: 33586372
+  direct_table_id: 33562650
 }
 direct_counters {
   preamble {
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json
index af8acf0..9d273d2 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json
@@ -969,10 +969,10 @@
       "binding" : "FabricIngress.forwarding.mpls"
     },
     {
-      "name" : "FabricIngress.forwarding.unicast_v4_counter",
+      "name" : "FabricIngress.forwarding.routing_v4_counter",
       "id" : 5,
       "is_direct" : true,
-      "binding" : "FabricIngress.forwarding.unicast_v4"
+      "binding" : "FabricIngress.forwarding.routing_v4"
     },
     {
       "name" : "FabricIngress.forwarding.acl_counter",
@@ -1747,7 +1747,7 @@
       ]
     },
     {
-      "name" : "FabricIngress.forwarding.set_next_id_unicast_v4",
+      "name" : "FabricIngress.forwarding.set_next_id_routing_v4",
       "id" : 19,
       "runtime_data" : [
         {
@@ -5517,7 +5517,7 @@
               "mask" : null
             },
             {
-              "match_type" : "exact",
+              "match_type" : "ternary",
               "name" : "hdr.ethernet.dst_addr",
               "target" : ["ethernet", "dst_addr"],
               "mask" : null
@@ -5529,7 +5529,7 @@
               "mask" : null
             }
           ],
-          "match_type" : "exact",
+          "match_type" : "ternary",
           "type" : "simple",
           "max_size" : 1024,
           "with_counters" : true,
@@ -5675,13 +5675,13 @@
           }
         },
         {
-          "name" : "FabricIngress.forwarding.unicast_v4",
+          "name" : "FabricIngress.forwarding.routing_v4",
           "id" : 27,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 87,
             "column" : 10,
-            "source_fragment" : "unicast_v4"
+            "source_fragment" : "routing_v4"
           },
           "key" : [
             {
@@ -5698,10 +5698,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [19, 4],
-          "actions" : ["FabricIngress.forwarding.set_next_id_unicast_v4", "NoAction"],
+          "actions" : ["FabricIngress.forwarding.set_next_id_routing_v4", "NoAction"],
           "base_default_next" : "FabricIngress.forwarding.acl",
           "next_tables" : {
-            "FabricIngress.forwarding.set_next_id_unicast_v4" : "FabricIngress.forwarding.acl",
+            "FabricIngress.forwarding.set_next_id_routing_v4" : "FabricIngress.forwarding.acl",
             "NoAction" : "FabricIngress.forwarding.acl"
           },
           "default_entry" : {
@@ -6463,7 +6463,7 @@
           "id" : 9,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 235,
+            "line" : 186,
             "column" : 11,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_BRIDGING"
           },
@@ -6489,7 +6489,7 @@
           "id" : 10,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 236,
+            "line" : 187,
             "column" : 17,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_MPLS"
           },
@@ -6515,7 +6515,7 @@
           "id" : 11,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 250,
+            "line" : 193,
             "column" : 17,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_IPV4_UNICAST"
           },
@@ -6533,7 +6533,7 @@
               }
             }
           },
-          "true_next" : "FabricIngress.forwarding.unicast_v4",
+          "true_next" : "FabricIngress.forwarding.routing_v4",
           "false_next" : "FabricIngress.forwarding.acl"
         },
         {
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt
index ca66919..a7cb512 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt
@@ -96,7 +96,7 @@
     id: 2
     name: "hdr.ethernet.dst_addr"
     bitwidth: 48
-    match_type: EXACT
+    match_type: TERNARY
   }
   match_fields {
     id: 3
@@ -166,9 +166,9 @@
 }
 tables {
   preamble {
-    id: 33586372
-    name: "FabricIngress.forwarding.unicast_v4"
-    alias: "unicast_v4"
+    id: 33562650
+    name: "FabricIngress.forwarding.routing_v4"
+    alias: "routing_v4"
   }
   match_fields {
     id: 1
@@ -177,13 +177,13 @@
     match_type: LPM
   }
   action_refs {
-    id: 16828976
+    id: 16777434
   }
   action_refs {
     id: 16800567
     annotations: "@defaultonly()"
   }
-  direct_resource_ids: 318768492
+  direct_resource_ids: 318811107
   size: 1024
   idle_timeout_behavior: NO_TIMEOUT
 }
@@ -554,9 +554,9 @@
 }
 actions {
   preamble {
-    id: 16828976
-    name: "FabricIngress.forwarding.set_next_id_unicast_v4"
-    alias: "set_next_id_unicast_v4"
+    id: 16777434
+    name: "FabricIngress.forwarding.set_next_id_routing_v4"
+    alias: "set_next_id_routing_v4"
   }
   params {
     id: 1
@@ -946,14 +946,14 @@
 }
 direct_counters {
   preamble {
-    id: 318768492
-    name: "FabricIngress.forwarding.unicast_v4_counter"
-    alias: "unicast_v4_counter"
+    id: 318811107
+    name: "FabricIngress.forwarding.routing_v4_counter"
+    alias: "routing_v4_counter"
   }
   spec {
     unit: BOTH
   }
-  direct_table_id: 33586372
+  direct_table_id: 33562650
 }
 direct_counters {
   preamble {
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json
index cd54f59..e8ad083 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json
@@ -703,10 +703,10 @@
       "binding" : "FabricIngress.forwarding.mpls"
     },
     {
-      "name" : "FabricIngress.forwarding.unicast_v4_counter",
+      "name" : "FabricIngress.forwarding.routing_v4_counter",
       "id" : 4,
       "is_direct" : true,
-      "binding" : "FabricIngress.forwarding.unicast_v4"
+      "binding" : "FabricIngress.forwarding.routing_v4"
     },
     {
       "name" : "FabricIngress.forwarding.acl_counter",
@@ -1252,7 +1252,7 @@
       ]
     },
     {
-      "name" : "FabricIngress.forwarding.set_next_id_unicast_v4",
+      "name" : "FabricIngress.forwarding.set_next_id_routing_v4",
       "id" : 14,
       "runtime_data" : [
         {
@@ -3497,7 +3497,7 @@
               "mask" : null
             },
             {
-              "match_type" : "exact",
+              "match_type" : "ternary",
               "name" : "hdr.ethernet.dst_addr",
               "target" : ["ethernet", "dst_addr"],
               "mask" : null
@@ -3509,7 +3509,7 @@
               "mask" : null
             }
           ],
-          "match_type" : "exact",
+          "match_type" : "ternary",
           "type" : "simple",
           "max_size" : 1024,
           "with_counters" : true,
@@ -3655,13 +3655,13 @@
           }
         },
         {
-          "name" : "FabricIngress.forwarding.unicast_v4",
+          "name" : "FabricIngress.forwarding.routing_v4",
           "id" : 9,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
             "line" : 87,
             "column" : 10,
-            "source_fragment" : "unicast_v4"
+            "source_fragment" : "routing_v4"
           },
           "key" : [
             {
@@ -3678,10 +3678,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [14, 2],
-          "actions" : ["FabricIngress.forwarding.set_next_id_unicast_v4", "NoAction"],
+          "actions" : ["FabricIngress.forwarding.set_next_id_routing_v4", "NoAction"],
           "base_default_next" : "FabricIngress.forwarding.acl",
           "next_tables" : {
-            "FabricIngress.forwarding.set_next_id_unicast_v4" : "FabricIngress.forwarding.acl",
+            "FabricIngress.forwarding.set_next_id_routing_v4" : "FabricIngress.forwarding.acl",
             "NoAction" : "FabricIngress.forwarding.acl"
           },
           "default_entry" : {
@@ -4272,7 +4272,7 @@
           "id" : 2,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 235,
+            "line" : 186,
             "column" : 11,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_BRIDGING"
           },
@@ -4298,7 +4298,7 @@
           "id" : 3,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 236,
+            "line" : 187,
             "column" : 17,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_MPLS"
           },
@@ -4324,7 +4324,7 @@
           "id" : 4,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 250,
+            "line" : 193,
             "column" : 17,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_IPV4_UNICAST"
           },
@@ -4342,7 +4342,7 @@
               }
             }
           },
-          "true_next" : "FabricIngress.forwarding.unicast_v4",
+          "true_next" : "FabricIngress.forwarding.routing_v4",
           "false_next" : "FabricIngress.forwarding.acl"
         },
         {
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/p4info.txt b/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/p4info.txt
index 2787013..efb3a76 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/p4info.txt
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/p4info.txt
@@ -55,7 +55,7 @@
     id: 2
     name: "hdr.ethernet.dst_addr"
     bitwidth: 48
-    match_type: EXACT
+    match_type: TERNARY
   }
   match_fields {
     id: 3
@@ -125,9 +125,9 @@
 }
 tables {
   preamble {
-    id: 33586372
-    name: "FabricIngress.forwarding.unicast_v4"
-    alias: "unicast_v4"
+    id: 33562650
+    name: "FabricIngress.forwarding.routing_v4"
+    alias: "routing_v4"
   }
   match_fields {
     id: 1
@@ -136,13 +136,13 @@
     match_type: LPM
   }
   action_refs {
-    id: 16828976
+    id: 16777434
   }
   action_refs {
     id: 16800567
     annotations: "@defaultonly()"
   }
-  direct_resource_ids: 318768492
+  direct_resource_ids: 318811107
   size: 1024
   idle_timeout_behavior: NO_TIMEOUT
 }
@@ -477,9 +477,9 @@
 }
 actions {
   preamble {
-    id: 16828976
-    name: "FabricIngress.forwarding.set_next_id_unicast_v4"
-    alias: "set_next_id_unicast_v4"
+    id: 16777434
+    name: "FabricIngress.forwarding.set_next_id_routing_v4"
+    alias: "set_next_id_routing_v4"
   }
   params {
     id: 1
@@ -858,14 +858,14 @@
 }
 direct_counters {
   preamble {
-    id: 318768492
-    name: "FabricIngress.forwarding.unicast_v4_counter"
-    alias: "unicast_v4_counter"
+    id: 318811107
+    name: "FabricIngress.forwarding.routing_v4_counter"
+    alias: "routing_v4_counter"
   }
   spec {
     unit: BOTH
   }
-  direct_table_id: 33586372
+  direct_table_id: 33562650
 }
 direct_counters {
   preamble {
diff --git a/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/FabricInterpreterTest.java b/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/FabricInterpreterTest.java
index 7601ca7..ca38cf8 100644
--- a/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/FabricInterpreterTest.java
+++ b/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/FabricInterpreterTest.java
@@ -133,7 +133,7 @@
         TrafficTreatment treatment = DefaultTrafficTreatment.emptyTreatment();
 
         PiAction mappedAction = interpreter.mapTreatment(treatment,
-                                                         FabricConstants.FABRIC_INGRESS_FORWARDING_UNICAST_V4);
+                                                         FabricConstants.FABRIC_INGRESS_FORWARDING_ROUTING_V4);
         PiAction expectedAction = PiAction.builder()
                 .withId(FabricConstants.NOP)
                 .build();
diff --git a/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/pipeliner/FabricFilteringPipelinerTest.java b/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/pipeliner/FabricFilteringPipelinerTest.java
index 5769e8f..9ceb869 100644
--- a/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/pipeliner/FabricFilteringPipelinerTest.java
+++ b/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/pipeliner/FabricFilteringPipelinerTest.java
@@ -76,24 +76,27 @@
         actualFlowRule = flowRulesInstalled.get(1);
         flowRuleExpected = buildExpectedFwdClassifierRule(PORT_1,
                                                           ROUTER_MAC,
+                                                          null,
                                                           Ethernet.TYPE_IPV4,
-                                                          FWD_IPV4_UNICAST);
+                                                          FabricFilteringPipeliner.FWD_IPV4_ROUTING);
         assertTrue(flowRuleExpected.exactMatch(actualFlowRule));
 
         // forwarding classifier ipv6
         actualFlowRule = flowRulesInstalled.get(2);
         flowRuleExpected = buildExpectedFwdClassifierRule(PORT_1,
                                                           ROUTER_MAC,
+                                                          null,
                                                           Ethernet.TYPE_IPV6,
-                                                          FWD_IPV6_UNICAST);
+                                                          FabricFilteringPipeliner.FWD_IPV6_ROUTING);
         assertTrue(flowRuleExpected.exactMatch(actualFlowRule));
 
         // forwarding classifier mpls
         actualFlowRule = flowRulesInstalled.get(3);
         flowRuleExpected = buildExpectedFwdClassifierRule(PORT_1,
                                                           ROUTER_MAC,
+                                                          null,
                                                           Ethernet.MPLS_UNICAST,
-                                                          FWD_MPLS);
+                                                          FabricFilteringPipeliner.FWD_MPLS);
         assertTrue(flowRuleExpected.exactMatch(actualFlowRule));
     }
 
@@ -112,7 +115,7 @@
                 .permit()
                 .withPriority(PRIORITY)
                 .withKey(Criteria.matchInPort(PORT_1))
-                .addCondition(Criteria.matchEthDst(MacAddress.IPV4_MULTICAST))
+                .addCondition(Criteria.matchEthDstMasked(MacAddress.IPV4_MULTICAST, MacAddress.IPV4_MULTICAST_MASK))
                 .addCondition(Criteria.matchVlanId(VlanId.NONE))
                 .withMeta(treatment)
                 .fromApp(APP_ID)
@@ -137,8 +140,9 @@
         actualFlowRule = flowRulesInstalled.get(1);
         flowRuleExpected = buildExpectedFwdClassifierRule(PORT_1,
                                                           MacAddress.IPV4_MULTICAST,
+                                                          MacAddress.IPV4_MULTICAST_MASK,
                                                           Ethernet.TYPE_IPV4,
-                                                          FWD_IPV4_MULTICAST);
+                                                          FabricFilteringPipeliner.FWD_IPV4_ROUTING);
         assertTrue(flowRuleExpected.exactMatch(actualFlowRule));
     }
 
@@ -157,7 +161,7 @@
                 .permit()
                 .withPriority(PRIORITY)
                 .withKey(Criteria.matchInPort(PORT_1))
-                .addCondition(Criteria.matchEthDst(MacAddress.IPV6_MULTICAST))
+                .addCondition(Criteria.matchEthDstMasked(MacAddress.IPV6_MULTICAST, MacAddress.IPV6_MULTICAST_MASK))
                 .addCondition(Criteria.matchVlanId(VlanId.NONE))
                 .withMeta(treatment)
                 .fromApp(APP_ID)
@@ -182,8 +186,9 @@
         actualFlowRule = flowRulesInstalled.get(1);
         flowRuleExpected = buildExpectedFwdClassifierRule(PORT_1,
                                                           MacAddress.IPV6_MULTICAST,
+                                                          MacAddress.IPV6_MULTICAST_MASK,
                                                           Ethernet.TYPE_IPV6,
-                                                          FWD_IPV6_MULTICAST);
+                                                          FabricFilteringPipeliner.FWD_IPV6_ROUTING);
         assertTrue(flowRuleExpected.exactMatch(actualFlowRule));
     }
 
@@ -329,13 +334,19 @@
 
     private FlowRule buildExpectedFwdClassifierRule(PortNumber inPort,
                                                     MacAddress dstMac,
+                                                    MacAddress dstMacMask,
                                                     short ethType,
                                                     byte fwdClass) {
-        TrafficSelector selector = DefaultTrafficSelector.builder()
-                .matchEthDst(dstMac)
+        TrafficSelector.Builder sbuilder = DefaultTrafficSelector.builder()
                 .matchInPort(inPort)
-                .matchEthType(ethType)
-                .build();
+                .matchEthType(ethType);
+        if (dstMacMask != null) {
+            sbuilder.matchEthDstMasked(dstMac, dstMacMask);
+        } else {
+            sbuilder.matchEthDstMasked(dstMac, MacAddress.EXACT_MASK);
+        }
+        TrafficSelector selector = sbuilder.build();
+
         PiActionParam classParam = new PiActionParam(FabricConstants.FWD_TYPE,
                                                      ImmutableByteSequence.copyFrom(fwdClass));
         PiAction fwdClassifierAction = PiAction.builder()
diff --git a/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/pipeliner/FabricForwardingPipelineTest.java b/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/pipeliner/FabricForwardingPipelineTest.java
index 77bb035..bb06dd3 100644
--- a/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/pipeliner/FabricForwardingPipelineTest.java
+++ b/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/pipeliner/FabricForwardingPipelineTest.java
@@ -20,6 +20,7 @@
 import org.junit.Test;
 import org.onlab.packet.Ethernet;
 import org.onlab.packet.IPv4;
+import org.onlab.packet.MacAddress;
 import org.onlab.packet.TpPort;
 import org.onlab.packet.UDP;
 import org.onosproject.net.flow.DefaultFlowRule;
@@ -28,6 +29,8 @@
 import org.onosproject.net.flow.FlowRule;
 import org.onosproject.net.flow.TrafficSelector;
 import org.onosproject.net.flow.TrafficTreatment;
+import org.onosproject.net.flow.criteria.Criterion;
+import org.onosproject.net.flow.criteria.EthCriterion;
 import org.onosproject.net.flowobjective.DefaultForwardingObjective;
 import org.onosproject.net.flowobjective.ForwardingObjective;
 import org.onosproject.net.group.GroupDescription;
@@ -145,7 +148,7 @@
                 .matchEthDst(HOST_MAC)
                 .build();
         testSpecificForward(FabricConstants.FABRIC_INGRESS_FORWARDING_BRIDGING,
-                            selector, selector, NEXT_ID_1);
+                            buildExpectedSelector(selector), selector, NEXT_ID_1);
     }
 
     @Test
@@ -166,7 +169,7 @@
         TrafficSelector expectedSelector = DefaultTrafficSelector.builder()
                 .matchIPDst(IPV4_UNICAST_ADDR)
                 .build();
-        testSpecificForward(FabricConstants.FABRIC_INGRESS_FORWARDING_UNICAST_V4,
+        testSpecificForward(FabricConstants.FABRIC_INGRESS_FORWARDING_ROUTING_V4,
                             expectedSelector, selector, NEXT_ID_1);
     }
 
@@ -179,7 +182,7 @@
         TrafficSelector expectedSelector = DefaultTrafficSelector.builder()
                 .matchIPDst(IPV4_UNICAST_ADDR)
                 .build();
-        testSpecificForward(FabricConstants.FABRIC_INGRESS_FORWARDING_UNICAST_V4,
+        testSpecificForward(FabricConstants.FABRIC_INGRESS_FORWARDING_ROUTING_V4,
                             expectedSelector, selector, null);
     }
 
@@ -194,7 +197,7 @@
         TrafficSelector expectedSelector = DefaultTrafficSelector.builder()
                 .matchIPDst(IPV4_MCAST_ADDR)
                 .build();
-        testSpecificForward(FabricConstants.FABRIC_INGRESS_FORWARDING_UNICAST_V4,
+        testSpecificForward(FabricConstants.FABRIC_INGRESS_FORWARDING_ROUTING_V4,
                             expectedSelector, selector, NEXT_ID_1);
     }
 
@@ -208,7 +211,7 @@
         TrafficSelector expectedSelector = DefaultTrafficSelector.builder()
                 .matchIPDst(IPV6_UNICAST_ADDR)
                 .build();
-        testSpecificForward(FabricConstants.FABRIC_INGRESS_FORWARDING_UNICAST_V6,
+        testSpecificForward(FabricConstants.FABRIC_INGRESS_FORWARDING_ROUTING_V6,
                             expectedSelector, selector, NEXT_ID_1);
 
     }
@@ -224,7 +227,7 @@
         TrafficSelector expectedSelector = DefaultTrafficSelector.builder()
                 .matchIPDst(IPV6_MCAST_ADDR)
                 .build();
-        testSpecificForward(FabricConstants.FABRIC_INGRESS_FORWARDING_UNICAST_V6,
+        testSpecificForward(FabricConstants.FABRIC_INGRESS_FORWARDING_ROUTING_V6,
                             expectedSelector, selector, NEXT_ID_1);
     }
 
@@ -264,10 +267,10 @@
 
             if (expectedTableId.equals(FabricConstants.FABRIC_INGRESS_FORWARDING_BRIDGING)) {
                 setNextIdAction.withId(FabricConstants.FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_BRIDGING);
-            } else if (expectedTableId.equals(FabricConstants.FABRIC_INGRESS_FORWARDING_UNICAST_V4)) {
-                setNextIdAction.withId(FabricConstants.FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_UNICAST_V4);
-            } else if (expectedTableId.equals(FabricConstants.FABRIC_INGRESS_FORWARDING_UNICAST_V6)) {
-                setNextIdAction.withId(FabricConstants.FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_UNICAST_V6);
+            } else if (expectedTableId.equals(FabricConstants.FABRIC_INGRESS_FORWARDING_ROUTING_V4)) {
+                setNextIdAction.withId(FabricConstants.FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_ROUTING_V4);
+            } else if (expectedTableId.equals(FabricConstants.FABRIC_INGRESS_FORWARDING_ROUTING_V6)) {
+                setNextIdAction.withId(FabricConstants.FABRIC_INGRESS_FORWARDING_SET_NEXT_ID_ROUTING_V6);
             }
 
             setNextIdTreatment = DefaultTrafficTreatment.builder()
@@ -314,4 +317,16 @@
 
         assertTrue(expectedFlowRule.exactMatch(actualFlowRule));
     }
+
+    private TrafficSelector buildExpectedSelector(TrafficSelector selector) {
+        TrafficSelector.Builder sbuilder = DefaultTrafficSelector.builder();
+        selector.criteria().forEach(c -> {
+            if (c.type() == Criterion.Type.ETH_DST) {
+                sbuilder.matchEthDstMasked(((EthCriterion) c).mac(), MacAddress.EXACT_MASK);
+            } else {
+                sbuilder.add(c);
+            }
+        });
+        return sbuilder.build();
+    }
 }
diff --git a/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/pipeliner/FabricPipelinerTest.java b/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/pipeliner/FabricPipelinerTest.java
index 5e08aa2..c361377 100644
--- a/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/pipeliner/FabricPipelinerTest.java
+++ b/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/pipeliner/FabricPipelinerTest.java
@@ -61,14 +61,6 @@
             .matchVlanId(VLAN_100)
             .build();
 
-    // Forwarding types
-    static final byte FWD_BRIDGING = 0;
-    static final byte FWD_MPLS = 1;
-    static final byte FWD_IPV4_UNICAST = 2;
-    static final byte FWD_IPV4_MULTICAST = 3;
-    static final byte FWD_IPV6_UNICAST = 4;
-    static final byte FWD_IPV6_MULTICAST = 5;
-
     static final PiCriterion VLAN_VALID = PiCriterion.builder()
             .matchExact(FabricConstants.HDR_VLAN_TAG_IS_VALID, new byte[]{1})
             .build();
diff --git a/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/pipeliner/ForwardingFunctionTypeTest.java b/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/pipeliner/ForwardingFunctionTypeTest.java
index 5e77906..1ef11c2 100644
--- a/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/pipeliner/ForwardingFunctionTypeTest.java
+++ b/pipelines/fabric/src/test/java/org/onosproject/pipelines/fabric/pipeliner/ForwardingFunctionTypeTest.java
@@ -72,7 +72,7 @@
                 .matchEthType(Ethernet.TYPE_IPV4)
                 .matchIPDst(IPV4_UNICAST_ADDR)
                 .build();
-        testFft(selector, ForwardingFunctionType.IPV4_UNICAST);
+        testFft(selector, ForwardingFunctionType.IPV4_ROUTING);
     }
 
     @Test
@@ -82,7 +82,7 @@
                 .matchEthType(Ethernet.TYPE_IPV4)
                 .matchIPDst(IPV4_MCAST_ADDR)
                 .build();
-        testFft(selector, ForwardingFunctionType.IPV4_MULTICAST);
+        testFft(selector, ForwardingFunctionType.IPV4_ROUTING);
     }
 
     @Test
@@ -92,7 +92,7 @@
                 .matchEthType(Ethernet.TYPE_IPV6)
                 .matchIPDst(IPV6_UNICAST_ADDR)
                 .build();
-        testFft(selector, ForwardingFunctionType.IPV6_UNICAST);
+        testFft(selector, ForwardingFunctionType.IPV6_ROUTING);
     }
 
     @Test
@@ -102,7 +102,7 @@
                 .matchEthType(Ethernet.TYPE_IPV6)
                 .matchIPDst(IPV6_MCAST_ADDR)
                 .build();
-        testFft(selector, ForwardingFunctionType.IPV4_MULTICAST);
+        testFft(selector, ForwardingFunctionType.IPV4_ROUTING);
     }
 
     @Test
diff --git a/utils/misc/src/main/java/org/onlab/packet/MacAddress.java b/utils/misc/src/main/java/org/onlab/packet/MacAddress.java
index 8a6d918..7abf12a 100644
--- a/utils/misc/src/main/java/org/onlab/packet/MacAddress.java
+++ b/utils/misc/src/main/java/org/onlab/packet/MacAddress.java
@@ -48,6 +48,10 @@
      */
     public static final MacAddress BROADCAST = valueOf("ff:ff:ff:ff:ff:ff");
     /**
+     * Mask that indicates exact match on the MacAddress.
+     */
+    public static final MacAddress EXACT_MASK = valueOf("ff:ff:ff:ff:ff:ff");
+    /**
      * IPv4 multicast MAC address.
      */
     public static final MacAddress IPV4_MULTICAST = valueOf("01:00:5e:00:00:00");