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 8a09ac2..10deed0 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
@@ -863,7 +863,7 @@
       "name" : "deparser",
       "id" : 0,
       "source_info" : {
-        "filename" : "include/parser.p4",
+        "filename" : "./include/parser.p4",
         "line" : 165,
         "column" : 8,
         "source_fragment" : "FabricDeparser"
@@ -943,7 +943,7 @@
       "name" : "FabricIngress.port_counters_control.egress_port_counter",
       "id" : 11,
       "source_info" : {
-        "filename" : "include/control/port_counter.p4",
+        "filename" : "./include/control/port_counter.p4",
         "line" : 23,
         "column" : 48,
         "source_fragment" : "egress_port_counter"
@@ -955,13 +955,19 @@
       "name" : "FabricIngress.port_counters_control.ingress_port_counter",
       "id" : 12,
       "source_info" : {
-        "filename" : "include/control/port_counter.p4",
+        "filename" : "./include/control/port_counter.p4",
         "line" : 24,
         "column" : 48,
         "source_fragment" : "ingress_port_counter"
       },
       "size" : 511,
       "is_direct" : false
+    },
+    {
+      "name" : "FabricEgress.egress_next.egress_vlan_counter",
+      "id" : 13,
+      "is_direct" : true,
+      "binding" : "FabricEgress.egress_next.egress_vlan"
     }
   ],
   "register_arrays" : [],
@@ -970,7 +976,7 @@
       "name" : "calc",
       "id" : 0,
       "source_info" : {
-        "filename" : "include/checksum.p4",
+        "filename" : "./include/checksum.p4",
         "line" : 28,
         "column" : 8,
         "source_fragment" : "update_checksum(hdr.ipv4.isValid(), ..."
@@ -1027,7 +1033,7 @@
       "name" : "calc_0",
       "id" : 1,
       "source_info" : {
-        "filename" : "include/spgw.p4",
+        "filename" : "./include/control/../spgw.p4",
         "line" : 296,
         "column" : 8,
         "source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
@@ -1084,7 +1090,7 @@
       "name" : "calc_1",
       "id" : 2,
       "source_info" : {
-        "filename" : "include/checksum.p4",
+        "filename" : "./include/checksum.p4",
         "line" : 56,
         "column" : 8,
         "source_fragment" : "verify_checksum(hdr.ipv4.isValid(), ..."
@@ -1227,7 +1233,7 @@
           "op" : "drop",
           "parameters" : [],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 33,
             "column" : 8,
             "source_fragment" : "mark_to_drop()"
@@ -1237,7 +1243,7 @@
           "op" : "exit",
           "parameters" : [],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 34,
             "column" : 8,
             "source_fragment" : "exit"
@@ -1259,7 +1265,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 38,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.setInvalid()"
@@ -1274,7 +1280,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 39,
             "column" : 8,
             "source_fragment" : "gtpu_udp.setInvalid()"
@@ -1289,7 +1295,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 40,
             "column" : 8,
             "source_fragment" : "gtpu.setInvalid()"
@@ -1328,7 +1334,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 46,
             "column" : 8,
             "source_fragment" : "spgw_meta.teid = teid"
@@ -1347,7 +1353,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 47,
             "column" : 8,
             "source_fragment" : "spgw_meta.s1u_enb_addr = s1u_enb_addr"
@@ -1366,7 +1372,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 48,
             "column" : 8,
             "source_fragment" : "spgw_meta.s1u_sgw_addr = s1u_sgw_addr"
@@ -1389,8 +1395,8 @@
           "op" : "drop",
           "parameters" : [],
           "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 31,
+            "filename" : "./include/control/filtering.p4",
+            "line" : 37,
             "column" : 8,
             "source_fragment" : "mark_to_drop()"
           }
@@ -1420,8 +1426,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 35,
+            "filename" : "./include/control/filtering.p4",
+            "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id"
           }
@@ -1447,8 +1453,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 41,
+            "filename" : "./include/control/filtering.p4",
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.vlan_tag.setValid()"
           }
@@ -1466,8 +1472,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 42,
+            "filename" : "./include/control/filtering.p4",
+            "line" : 50,
             "column" : 8,
             "source_fragment" : "hdr.vlan_tag.cfi = 0"
           }
@@ -1485,8 +1491,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 43,
+            "filename" : "./include/control/filtering.p4",
+            "line" : 51,
             "column" : 8,
             "source_fragment" : "hdr.vlan_tag.pri = 0"
           }
@@ -1504,8 +1510,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 44,
+            "filename" : "./include/control/filtering.p4",
+            "line" : 52,
             "column" : 8,
             "source_fragment" : "hdr.vlan_tag.ether_type = hdr.ethernet.ether_type"
           }
@@ -1523,7 +1529,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/../define.p4",
+            "filename" : "./include/control/../define.p4",
             "line" : 66,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
@@ -1542,10 +1548,10 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 35,
+            "filename" : "./include/control/filtering.p4",
+            "line" : 54,
             "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id; ..."
+            "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id"
           }
         },
         {
@@ -1571,8 +1577,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 49,
+            "filename" : "./include/control/filtering.p4",
+            "line" : 57,
             "column" : 8,
             "source_fragment" : "fabric_metadata.pop_vlan_when_packet_in = true"
           }
@@ -1602,8 +1608,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 53,
+            "filename" : "./include/control/filtering.p4",
+            "line" : 94,
             "column" : 8,
             "source_fragment" : "fabric_metadata.fwd_type = fwd_type"
           }
@@ -1611,25 +1617,8 @@
       ]
     },
     {
-      "name" : "FabricIngress.forwarding.drop",
+      "name" : "FabricIngress.forwarding.set_next_id_bridging",
       "id" : 21,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "drop",
-          "parameters" : [],
-          "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 36,
-            "column" : 8,
-            "source_fragment" : "mark_to_drop()"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.forwarding.set_next_id",
-      "id" : 22,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -1650,8 +1639,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 40,
+            "filename" : "./include/control/forwarding.p4",
+            "line" : 37,
             "column" : 8,
             "source_fragment" : "fabric_metadata.next_id = next_id"
           }
@@ -1659,7 +1648,53 @@
       ]
     },
     {
-      "name" : "FabricIngress.forwarding.set_next_id",
+      "name" : "FabricIngress.forwarding.pop_mpls_and_next",
+      "id" : 22,
+      "runtime_data" : [
+        {
+          "name" : "next_id",
+          "bitwidth" : 32
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "mpls"
+            }
+          ],
+          "source_info" : {
+            "filename" : "./include/control/forwarding.p4",
+            "line" : 60,
+            "column" : 8,
+            "source_fragment" : "hdr.mpls.setInvalid()"
+          }
+        },
+        {
+          "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" : 61,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.next_id = next_id"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.forwarding.set_next_id_unicast_v4",
       "id" : 23,
       "runtime_data" : [
         {
@@ -1681,8 +1716,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 40,
+            "filename" : "./include/control/forwarding.p4",
+            "line" : 83,
             "column" : 8,
             "source_fragment" : "fabric_metadata.next_id = next_id"
           }
@@ -1690,7 +1725,7 @@
       ]
     },
     {
-      "name" : "FabricIngress.forwarding.set_next_id",
+      "name" : "FabricIngress.forwarding.set_next_id_acl",
       "id" : 24,
       "runtime_data" : [
         {
@@ -1712,8 +1747,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 40,
+            "filename" : "./include/control/forwarding.p4",
+            "line" : 105,
             "column" : 8,
             "source_fragment" : "fabric_metadata.next_id = next_id"
           }
@@ -1721,54 +1756,8 @@
       ]
     },
     {
-      "name" : "FabricIngress.forwarding.pop_mpls_and_next",
+      "name" : "FabricIngress.forwarding.send_to_controller",
       "id" : 25,
-      "runtime_data" : [
-        {
-          "name" : "next_id",
-          "bitwidth" : 32
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "mpls"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 44,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.setInvalid()"
-          }
-        },
-        {
-          "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" : 45,
-            "column" : 8,
-            "source_fragment" : "fabric_metadata.next_id = next_id"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.forwarding.duplicate_to_controller",
-      "id" : 26,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -1784,8 +1773,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 49,
+            "filename" : "./include/control/forwarding.p4",
+            "line" : 110,
             "column" : 8,
             "source_fragment" : "standard_metadata.egress_spec = 255"
           }
@@ -1793,39 +1782,25 @@
       ]
     },
     {
-      "name" : "FabricIngress.next.output",
-      "id" : 27,
-      "runtime_data" : [
-        {
-          "name" : "port_num",
-          "bitwidth" : 9
-        }
-      ],
+      "name" : "FabricIngress.forwarding.drop",
+      "id" : 26,
+      "runtime_data" : [],
       "primitives" : [
         {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "egress_spec"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
+          "op" : "drop",
+          "parameters" : [],
           "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 33,
+            "filename" : "./include/control/forwarding.p4",
+            "line" : 115,
             "column" : 8,
-            "source_fragment" : "standard_metadata.egress_spec = port_num"
+            "source_fragment" : "mark_to_drop()"
           }
         }
       ]
     },
     {
       "name" : "FabricIngress.next.set_vlan",
-      "id" : 28,
+      "id" : 27,
       "runtime_data" : [
         {
           "name" : "new_vlan_id",
@@ -1846,8 +1821,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 37,
+            "filename" : "./include/control/next.p4",
+            "line" : 61,
             "column" : 8,
             "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id"
           }
@@ -1855,6 +1830,37 @@
       ]
     },
     {
+      "name" : "FabricIngress.next.output_simple",
+      "id" : 28,
+      "runtime_data" : [
+        {
+          "name" : "port_num",
+          "bitwidth" : 9
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "egress_spec"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "./include/control/next.p4",
+            "line" : 85,
+            "column" : 8,
+            "source_fragment" : "standard_metadata.egress_spec = port_num"
+          }
+        }
+      ]
+    },
+    {
       "name" : "FabricIngress.next.set_vlan_output",
       "id" : 29,
       "runtime_data" : [
@@ -1881,8 +1887,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 46,
+            "filename" : "./include/control/next.p4",
+            "line" : 90,
             "column" : 8,
             "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id"
           }
@@ -1900,8 +1906,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 33,
+            "filename" : "./include/control/next.p4",
+            "line" : 85,
             "column" : 8,
             "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
           }
@@ -1909,7 +1915,7 @@
       ]
     },
     {
-      "name" : "FabricIngress.next.l3_routing",
+      "name" : "FabricIngress.next.l3_routing_simple",
       "id" : 30,
       "runtime_data" : [
         {
@@ -1939,8 +1945,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 51,
+            "filename" : "./include/control/next.p4",
+            "line" : 37,
             "column" : 8,
             "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
           }
@@ -1958,8 +1964,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 55,
+            "filename" : "./include/control/next.p4",
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
           }
@@ -1977,8 +1983,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 33,
+            "filename" : "./include/control/next.p4",
+            "line" : 85,
             "column" : 8,
             "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
           }
@@ -1986,7 +1992,7 @@
       ]
     },
     {
-      "name" : "FabricIngress.next.l3_routing",
+      "name" : "FabricIngress.next.mpls_routing_v4_simple",
       "id" : 31,
       "runtime_data" : [
         {
@@ -2000,6 +2006,10 @@
         {
           "name" : "dmac",
           "bitwidth" : 48
+        },
+        {
+          "name" : "label",
+          "bitwidth" : 20
         }
       ],
       "primitives" : [
@@ -2016,8 +2026,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 51,
+            "filename" : "./include/control/next.p4",
+            "line" : 37,
             "column" : 8,
             "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
           }
@@ -2035,8 +2045,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 55,
+            "filename" : "./include/control/next.p4",
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
           }
@@ -2054,17 +2064,318 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 33,
+            "filename" : "./include/control/next.p4",
+            "line" : 85,
             "column" : 8,
             "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
           }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "mpls"
+            }
+          ],
+          "source_info" : {
+            "filename" : "./include/control/next.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.mpls.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "ether_type"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x8847"
+            }
+          ],
+          "source_info" : {
+            "filename" : "./include/control/../define.p4",
+            "line" : 67,
+            "column" : 31,
+            "source_fragment" : "0x8847; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["mpls", "label"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 3
+            }
+          ],
+          "source_info" : {
+            "filename" : "./include/control/next.p4",
+            "line" : 48,
+            "column" : 8,
+            "source_fragment" : "hdr.mpls.label = label; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["mpls", "tc"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "./include/control/next.p4",
+            "line" : 49,
+            "column" : 8,
+            "source_fragment" : "hdr.mpls.tc = tc; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["mpls", "bos"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x01"
+            }
+          ],
+          "source_info" : {
+            "filename" : "./include/control/next.p4",
+            "line" : 50,
+            "column" : 8,
+            "source_fragment" : "hdr.mpls.bos = 1w1"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["mpls", "ttl"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x40"
+            }
+          ],
+          "source_info" : {
+            "filename" : "./include/control/../define.p4",
+            "line" : 87,
+            "column" : 32,
+            "source_fragment" : "64; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.next.mpls_routing_v6_simple",
+      "id" : 32,
+      "runtime_data" : [
+        {
+          "name" : "port_num",
+          "bitwidth" : 9
+        },
+        {
+          "name" : "smac",
+          "bitwidth" : 48
+        },
+        {
+          "name" : "dmac",
+          "bitwidth" : 48
+        },
+        {
+          "name" : "label",
+          "bitwidth" : 20
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["ethernet", "src_addr"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 1
+            }
+          ],
+          "source_info" : {
+            "filename" : "./include/control/next.p4",
+            "line" : 37,
+            "column" : 8,
+            "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["ethernet", "dst_addr"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 2
+            }
+          ],
+          "source_info" : {
+            "filename" : "./include/control/next.p4",
+            "line" : 41,
+            "column" : 8,
+            "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "egress_spec"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "./include/control/next.p4",
+            "line" : 85,
+            "column" : 8,
+            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "mpls"
+            }
+          ],
+          "source_info" : {
+            "filename" : "./include/control/next.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.mpls.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "ether_type"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x8847"
+            }
+          ],
+          "source_info" : {
+            "filename" : "./include/control/../define.p4",
+            "line" : 67,
+            "column" : 31,
+            "source_fragment" : "0x8847; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["mpls", "label"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 3
+            }
+          ],
+          "source_info" : {
+            "filename" : "./include/control/next.p4",
+            "line" : 48,
+            "column" : 8,
+            "source_fragment" : "hdr.mpls.label = label; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["mpls", "tc"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "./include/control/next.p4",
+            "line" : 49,
+            "column" : 8,
+            "source_fragment" : "hdr.mpls.tc = tc; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["mpls", "bos"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x01"
+            }
+          ],
+          "source_info" : {
+            "filename" : "./include/control/next.p4",
+            "line" : 50,
+            "column" : 8,
+            "source_fragment" : "hdr.mpls.bos = 1w1"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["mpls", "ttl"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x40"
+            }
+          ],
+          "source_info" : {
+            "filename" : "./include/control/../define.p4",
+            "line" : 87,
+            "column" : 32,
+            "source_fragment" : "64; ..."
+          }
         }
       ]
     },
     {
       "name" : "FabricIngress.next.l3_routing_vlan",
-      "id" : 32,
+      "id" : 33,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -2097,8 +2408,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 51,
+            "filename" : "./include/control/next.p4",
+            "line" : 37,
             "column" : 8,
             "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
           }
@@ -2116,8 +2427,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 55,
+            "filename" : "./include/control/next.p4",
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
           }
@@ -2135,8 +2446,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 46,
+            "filename" : "./include/control/next.p4",
+            "line" : 90,
             "column" : 8,
             "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id; ..."
           }
@@ -2154,8 +2465,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 33,
+            "filename" : "./include/control/next.p4",
+            "line" : 85,
             "column" : 8,
             "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
           }
@@ -2163,198 +2474,7 @@
       ]
     },
     {
-      "name" : "FabricIngress.next.mpls_routing_v4",
-      "id" : 33,
-      "runtime_data" : [
-        {
-          "name" : "port_num",
-          "bitwidth" : 9
-        },
-        {
-          "name" : "smac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "dmac",
-          "bitwidth" : 48
-        },
-        {
-          "name" : "label",
-          "bitwidth" : 20
-        }
-      ],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "src_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 1
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 51,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "dst_addr"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 2
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 55,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["standard_metadata", "egress_spec"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 0
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 33,
-            "column" : 8,
-            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
-          }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "mpls"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 72,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x8847"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 67,
-            "column" : 31,
-            "source_fragment" : "0x8847; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "label"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 3
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 74,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.label = label; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "tc"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 75,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.tc = tc; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "bos"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x01"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 76,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.bos = 1w1"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "ttl"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x40"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 87,
-            "column" : 32,
-            "source_fragment" : "64; ..."
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricIngress.next.mpls_routing_v4",
+      "name" : "FabricIngress.next.l3_routing_hashed",
       "id" : 34,
       "runtime_data" : [
         {
@@ -2368,10 +2488,6 @@
         {
           "name" : "dmac",
           "bitwidth" : 48
-        },
-        {
-          "name" : "label",
-          "bitwidth" : 20
         }
       ],
       "primitives" : [
@@ -2388,8 +2504,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 51,
+            "filename" : "./include/control/next.p4",
+            "line" : 37,
             "column" : 8,
             "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
           }
@@ -2407,8 +2523,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 55,
+            "filename" : "./include/control/next.p4",
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
           }
@@ -2426,126 +2542,16 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 33,
+            "filename" : "./include/control/next.p4",
+            "line" : 149,
             "column" : 8,
             "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
           }
-        },
-        {
-          "op" : "add_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "mpls"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 72,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.setValid()"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x8847"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 67,
-            "column" : 31,
-            "source_fragment" : "0x8847; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "label"]
-            },
-            {
-              "type" : "runtime_data",
-              "value" : 3
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 74,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.label = label; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "tc"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x00"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 75,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.tc = tc; ..."
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "bos"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x01"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 76,
-            "column" : 8,
-            "source_fragment" : "hdr.mpls.bos = 1w1"
-          }
-        },
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["mpls", "ttl"]
-            },
-            {
-              "type" : "hexstr",
-              "value" : "0x40"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/../define.p4",
-            "line" : 87,
-            "column" : 32,
-            "source_fragment" : "64; ..."
-          }
         }
       ]
     },
     {
-      "name" : "FabricIngress.next.mpls_routing_v6",
+      "name" : "FabricIngress.next.mpls_routing_v4_hashed",
       "id" : 35,
       "runtime_data" : [
         {
@@ -2579,8 +2585,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 51,
+            "filename" : "./include/control/next.p4",
+            "line" : 37,
             "column" : 8,
             "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
           }
@@ -2598,8 +2604,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 55,
+            "filename" : "./include/control/next.p4",
+            "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
           }
@@ -2617,8 +2623,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 33,
+            "filename" : "./include/control/next.p4",
+            "line" : 149,
             "column" : 8,
             "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
           }
@@ -2632,8 +2638,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 72,
+            "filename" : "./include/control/next.p4",
+            "line" : 46,
             "column" : 8,
             "source_fragment" : "hdr.mpls.setValid()"
           }
@@ -2651,7 +2657,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/../define.p4",
+            "filename" : "./include/control/../define.p4",
             "line" : 67,
             "column" : 31,
             "source_fragment" : "0x8847; ..."
@@ -2670,8 +2676,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 74,
+            "filename" : "./include/control/next.p4",
+            "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.mpls.label = label; ..."
           }
@@ -2689,8 +2695,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 75,
+            "filename" : "./include/control/next.p4",
+            "line" : 49,
             "column" : 8,
             "source_fragment" : "hdr.mpls.tc = tc; ..."
           }
@@ -2708,8 +2714,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 76,
+            "filename" : "./include/control/next.p4",
+            "line" : 50,
             "column" : 8,
             "source_fragment" : "hdr.mpls.bos = 1w1"
           }
@@ -2727,7 +2733,198 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/../define.p4",
+            "filename" : "./include/control/../define.p4",
+            "line" : 87,
+            "column" : 32,
+            "source_fragment" : "64; ..."
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.next.mpls_routing_v6_hashed",
+      "id" : 36,
+      "runtime_data" : [
+        {
+          "name" : "port_num",
+          "bitwidth" : 9
+        },
+        {
+          "name" : "smac",
+          "bitwidth" : 48
+        },
+        {
+          "name" : "dmac",
+          "bitwidth" : 48
+        },
+        {
+          "name" : "label",
+          "bitwidth" : 20
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["ethernet", "src_addr"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 1
+            }
+          ],
+          "source_info" : {
+            "filename" : "./include/control/next.p4",
+            "line" : 37,
+            "column" : 8,
+            "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["ethernet", "dst_addr"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 2
+            }
+          ],
+          "source_info" : {
+            "filename" : "./include/control/next.p4",
+            "line" : 41,
+            "column" : 8,
+            "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "egress_spec"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "./include/control/next.p4",
+            "line" : 149,
+            "column" : 8,
+            "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
+          }
+        },
+        {
+          "op" : "add_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "mpls"
+            }
+          ],
+          "source_info" : {
+            "filename" : "./include/control/next.p4",
+            "line" : 46,
+            "column" : 8,
+            "source_fragment" : "hdr.mpls.setValid()"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "ether_type"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x8847"
+            }
+          ],
+          "source_info" : {
+            "filename" : "./include/control/../define.p4",
+            "line" : 67,
+            "column" : 31,
+            "source_fragment" : "0x8847; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["mpls", "label"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 3
+            }
+          ],
+          "source_info" : {
+            "filename" : "./include/control/next.p4",
+            "line" : 48,
+            "column" : 8,
+            "source_fragment" : "hdr.mpls.label = label; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["mpls", "tc"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x00"
+            }
+          ],
+          "source_info" : {
+            "filename" : "./include/control/next.p4",
+            "line" : 49,
+            "column" : 8,
+            "source_fragment" : "hdr.mpls.tc = tc; ..."
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["mpls", "bos"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x01"
+            }
+          ],
+          "source_info" : {
+            "filename" : "./include/control/next.p4",
+            "line" : 50,
+            "column" : 8,
+            "source_fragment" : "hdr.mpls.bos = 1w1"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["mpls", "ttl"]
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x40"
+            }
+          ],
+          "source_info" : {
+            "filename" : "./include/control/../define.p4",
             "line" : 87,
             "column" : 32,
             "source_fragment" : "64; ..."
@@ -2737,7 +2934,7 @@
     },
     {
       "name" : "FabricIngress.next.set_mcast_group",
-      "id" : 36,
+      "id" : 37,
       "runtime_data" : [
         {
           "name" : "gid",
@@ -2758,8 +2955,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 148,
+            "filename" : "./include/control/next.p4",
+            "line" : 202,
             "column" : 8,
             "source_fragment" : "standard_metadata.mcast_grp = gid"
           }
@@ -2768,7 +2965,7 @@
     },
     {
       "name" : "act",
-      "id" : 37,
+      "id" : 38,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2784,7 +2981,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/packetio.p4",
+            "filename" : "./include/control/packetio.p4",
             "line" : 26,
             "column" : 12,
             "source_fragment" : "standard_metadata.egress_spec = hdr.packet_out.egress_port"
@@ -2799,7 +2996,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/packetio.p4",
+            "filename" : "./include/control/packetio.p4",
             "line" : 27,
             "column" : 12,
             "source_fragment" : "hdr.packet_out.setInvalid()"
@@ -2809,7 +3006,7 @@
     },
     {
       "name" : "act_0",
-      "id" : 38,
+      "id" : 39,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2839,7 +3036,7 @@
     },
     {
       "name" : "act_1",
-      "id" : 39,
+      "id" : 40,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2869,7 +3066,7 @@
     },
     {
       "name" : "act_2",
-      "id" : 40,
+      "id" : 41,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2885,7 +3082,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 152,
             "column" : 12,
             "source_fragment" : "spgw_meta.s1u_enb_addr = ipv4.src_addr"
@@ -2904,7 +3101,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 153,
             "column" : 12,
             "source_fragment" : "spgw_meta.s1u_sgw_addr = ipv4.dst_addr"
@@ -2923,7 +3120,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 154,
             "column" : 17,
             "source_fragment" : "= gtpu_ipv4; ..."
@@ -2942,7 +3139,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 155,
             "column" : 16,
             "source_fragment" : "= gtpu_udp; ..."
@@ -2952,7 +3149,7 @@
     },
     {
       "name" : "act_3",
-      "id" : 41,
+      "id" : 42,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2978,7 +3175,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 159,
             "column" : 16,
             "source_fragment" : "spgw_meta.do_spgw = true"
@@ -2997,7 +3194,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/../define.p4",
+            "filename" : "./include/control/../define.p4",
             "line" : 98,
             "column" : 31,
             "source_fragment" : "1w0; ..."
@@ -3007,7 +3204,7 @@
     },
     {
       "name" : "act_4",
-      "id" : 42,
+      "id" : 43,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3037,7 +3234,7 @@
     },
     {
       "name" : "act_5",
-      "id" : 43,
+      "id" : 44,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3067,7 +3264,7 @@
     },
     {
       "name" : "act_6",
-      "id" : 44,
+      "id" : 45,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3093,7 +3290,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 163,
             "column" : 12,
             "source_fragment" : "spgw_meta.do_spgw = true"
@@ -3112,7 +3309,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/../define.p4",
+            "filename" : "./include/control/../define.p4",
             "line" : 99,
             "column" : 33,
             "source_fragment" : "1w1; ..."
@@ -3122,7 +3319,7 @@
     },
     {
       "name" : "act_7",
-      "id" : 45,
+      "id" : 46,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3171,7 +3368,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 146,
             "column" : 8,
             "source_fragment" : "spgw_meta.do_spgw = false"
@@ -3181,7 +3378,7 @@
     },
     {
       "name" : "act_8",
-      "id" : 46,
+      "id" : 47,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3207,7 +3404,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 169,
             "column" : 12,
             "source_fragment" : "return"
@@ -3217,7 +3414,7 @@
     },
     {
       "name" : "act_9",
-      "id" : 47,
+      "id" : 48,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3247,7 +3444,7 @@
     },
     {
       "name" : "act_10",
-      "id" : 48,
+      "id" : 49,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3277,7 +3474,7 @@
     },
     {
       "name" : "act_11",
-      "id" : 49,
+      "id" : 50,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3293,7 +3490,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 199,
             "column" : 8,
             "source_fragment" : "spgw_meta.ipv4_len = ipv4.total_len"
@@ -3303,7 +3500,7 @@
     },
     {
       "name" : "act_12",
-      "id" : 50,
+      "id" : 51,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3319,7 +3516,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/../define.p4",
+            "filename" : "./include/control/../define.p4",
             "line" : 69,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
@@ -3338,7 +3535,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/../define.p4",
+            "filename" : "./include/control/../define.p4",
             "line" : 69,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
@@ -3348,7 +3545,7 @@
     },
     {
       "name" : "act_13",
-      "id" : 51,
+      "id" : 52,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3378,7 +3575,7 @@
     },
     {
       "name" : "act_14",
-      "id" : 52,
+      "id" : 53,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3408,7 +3605,7 @@
     },
     {
       "name" : "act_15",
-      "id" : 53,
+      "id" : 54,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3447,8 +3644,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 168,
+            "filename" : "./include/control/next.p4",
+            "line" : 221,
             "column" : 20,
             "source_fragment" : "hdr.ipv4.ttl = hdr.ipv4.ttl - 1"
           }
@@ -3457,7 +3654,7 @@
     },
     {
       "name" : "act_16",
-      "id" : 54,
+      "id" : 55,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3486,7 +3683,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/port_counter.p4",
+            "filename" : "./include/control/port_counter.p4",
             "line" : 28,
             "column" : 38,
             "source_fragment" : "(bit<32>)standard_metadata.egress_spec"
@@ -3505,7 +3702,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/port_counter.p4",
+            "filename" : "./include/control/port_counter.p4",
             "line" : 28,
             "column" : 12,
             "source_fragment" : "egress_port_counter.count((bit<32>)standard_metadata.egress_spec)"
@@ -3515,7 +3712,7 @@
     },
     {
       "name" : "act_17",
-      "id" : 55,
+      "id" : 56,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3544,7 +3741,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/port_counter.p4",
+            "filename" : "./include/control/port_counter.p4",
             "line" : 31,
             "column" : 39,
             "source_fragment" : "(bit<32>)standard_metadata.ingress_port"
@@ -3563,7 +3760,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/port_counter.p4",
+            "filename" : "./include/control/port_counter.p4",
             "line" : 31,
             "column" : 12,
             "source_fragment" : "ingress_port_counter.count((bit<32>)standard_metadata.ingress_port)"
@@ -3573,13 +3770,13 @@
     },
     {
       "name" : "nop",
-      "id" : 56,
+      "id" : 57,
       "runtime_data" : [],
       "primitives" : []
     },
     {
       "name" : "FabricEgress.spgw_egress.gtpu_encap",
-      "id" : 57,
+      "id" : 58,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3591,7 +3788,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 214,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.setValid()"
@@ -3610,7 +3807,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 215,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.version = 4"
@@ -3629,7 +3826,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/../define.p4",
+            "filename" : "./include/control/../define.p4",
             "line" : 78,
             "column" : 28,
             "source_fragment" : "5; ..."
@@ -3648,7 +3845,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 217,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.diffserv = 0"
@@ -3690,7 +3887,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 218,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.total_len = spgw_meta.ipv4_len ..."
@@ -3709,7 +3906,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 220,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.identification = 0x1513"
@@ -3728,7 +3925,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 221,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.flags = 0"
@@ -3747,7 +3944,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 222,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.frag_offset = 0"
@@ -3766,7 +3963,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/../define.p4",
+            "filename" : "./include/control/../define.p4",
             "line" : 88,
             "column" : 32,
             "source_fragment" : "64; ..."
@@ -3785,7 +3982,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/../define.p4",
+            "filename" : "./include/control/../define.p4",
             "line" : 75,
             "column" : 25,
             "source_fragment" : "17; ..."
@@ -3804,7 +4001,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 225,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.dst_addr = spgw_meta.s1u_enb_addr"
@@ -3823,7 +4020,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 226,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.src_addr = spgw_meta.s1u_sgw_addr"
@@ -3842,7 +4039,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 227,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.hdr_checksum = 0"
@@ -3857,7 +4054,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 229,
             "column" : 8,
             "source_fragment" : "gtpu_udp.setValid()"
@@ -3876,7 +4073,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 230,
             "column" : 8,
             "source_fragment" : "gtpu_udp.src_port = 2152"
@@ -3895,7 +4092,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 231,
             "column" : 8,
             "source_fragment" : "gtpu_udp.dst_port = 2152"
@@ -3937,7 +4134,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 232,
             "column" : 8,
             "source_fragment" : "gtpu_udp.len = spgw_meta.ipv4_len ..."
@@ -3956,7 +4153,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 234,
             "column" : 8,
             "source_fragment" : "gtpu_udp.checksum = 0"
@@ -3971,7 +4168,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 236,
             "column" : 8,
             "source_fragment" : "gtpu.setValid()"
@@ -3990,7 +4187,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 237,
             "column" : 8,
             "source_fragment" : "gtpu.version = 0x01"
@@ -4009,7 +4206,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 238,
             "column" : 8,
             "source_fragment" : "gtpu.pt = 0x01"
@@ -4028,7 +4225,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 239,
             "column" : 8,
             "source_fragment" : "gtpu.spare = 0"
@@ -4047,7 +4244,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 240,
             "column" : 8,
             "source_fragment" : "gtpu.ex_flag = 0"
@@ -4066,7 +4263,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 241,
             "column" : 8,
             "source_fragment" : "gtpu.seq_flag = 0"
@@ -4085,7 +4282,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 242,
             "column" : 8,
             "source_fragment" : "gtpu.npdu_flag = 0"
@@ -4104,7 +4301,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 243,
             "column" : 8,
             "source_fragment" : "gtpu.msgtype = 0xff"
@@ -4123,7 +4320,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 244,
             "column" : 8,
             "source_fragment" : "gtpu.msglen = spgw_meta.ipv4_len"
@@ -4142,7 +4339,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 245,
             "column" : 8,
             "source_fragment" : "gtpu.teid = spgw_meta.teid"
@@ -4152,47 +4349,6 @@
     },
     {
       "name" : "FabricEgress.pkt_io_egress.pop_vlan",
-      "id" : 58,
-      "runtime_data" : [],
-      "primitives" : [
-        {
-          "op" : "assign",
-          "parameters" : [
-            {
-              "type" : "field",
-              "value" : ["ethernet", "ether_type"]
-            },
-            {
-              "type" : "field",
-              "value" : ["vlan_tag", "ether_type"]
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/packetio.p4",
-            "line" : 38,
-            "column" : 8,
-            "source_fragment" : "hdr.ethernet.ether_type = hdr.vlan_tag.ether_type"
-          }
-        },
-        {
-          "op" : "remove_header",
-          "parameters" : [
-            {
-              "type" : "header",
-              "value" : "vlan_tag"
-            }
-          ],
-          "source_info" : {
-            "filename" : "include/control/packetio.p4",
-            "line" : 39,
-            "column" : 8,
-            "source_fragment" : "hdr.vlan_tag.setInvalid()"
-          }
-        }
-      ]
-    },
-    {
-      "name" : "FabricEgress.egress_next.pop_vlan",
       "id" : 59,
       "runtime_data" : [],
       "primitives" : [
@@ -4209,8 +4365,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 188,
+            "filename" : "./include/control/packetio.p4",
+            "line" : 38,
             "column" : 8,
             "source_fragment" : "hdr.ethernet.ether_type = hdr.vlan_tag.ether_type"
           }
@@ -4224,8 +4380,49 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 189,
+            "filename" : "./include/control/packetio.p4",
+            "line" : 39,
+            "column" : 8,
+            "source_fragment" : "hdr.vlan_tag.setInvalid()"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricEgress.egress_next.pop_vlan",
+      "id" : 60,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["ethernet", "ether_type"]
+            },
+            {
+              "type" : "field",
+              "value" : ["vlan_tag", "ether_type"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "./include/control/next.p4",
+            "line" : 247,
+            "column" : 8,
+            "source_fragment" : "hdr.ethernet.ether_type = hdr.vlan_tag.ether_type"
+          }
+        },
+        {
+          "op" : "remove_header",
+          "parameters" : [
+            {
+              "type" : "header",
+              "value" : "vlan_tag"
+            }
+          ],
+          "source_info" : {
+            "filename" : "./include/control/next.p4",
+            "line" : 248,
             "column" : 8,
             "source_fragment" : "hdr.vlan_tag.setInvalid()"
           }
@@ -4234,7 +4431,7 @@
     },
     {
       "name" : "act_18",
-      "id" : 60,
+      "id" : 61,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4246,7 +4443,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/packetio.p4",
+            "filename" : "./include/control/packetio.p4",
             "line" : 46,
             "column" : 12,
             "source_fragment" : "hdr.packet_in.setValid()"
@@ -4265,7 +4462,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/packetio.p4",
+            "filename" : "./include/control/packetio.p4",
             "line" : 47,
             "column" : 12,
             "source_fragment" : "hdr.packet_in.ingress_port = standard_metadata.ingress_port"
@@ -4275,7 +4472,7 @@
     },
     {
       "name" : "act_19",
-      "id" : 61,
+      "id" : 62,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4348,14 +4545,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [37],
+          "action_ids" : [38],
           "actions" : ["act"],
           "base_default_next" : null,
           "next_tables" : {
             "act" : null
           },
           "default_entry" : {
-            "action_id" : 37,
+            "action_id" : 38,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -4371,14 +4568,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [45],
+          "action_ids" : [46],
           "actions" : ["act_7"],
           "base_default_next" : "node_5",
           "next_tables" : {
             "act_7" : "node_5"
           },
           "default_entry" : {
-            "action_id" : 45,
+            "action_id" : 46,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -4394,14 +4591,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [40],
+          "action_ids" : [41],
           "actions" : ["act_2"],
           "base_default_next" : "FabricIngress.spgw_ingress.s1u_filter_table",
           "next_tables" : {
             "act_2" : "FabricIngress.spgw_ingress.s1u_filter_table"
           },
           "default_entry" : {
-            "action_id" : 40,
+            "action_id" : 41,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -4411,7 +4608,7 @@
           "name" : "FabricIngress.spgw_ingress.s1u_filter_table",
           "id" : 3,
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 65,
             "column" : 10,
             "source_fragment" : "s1u_filter_table"
@@ -4454,14 +4651,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [38],
+          "action_ids" : [39],
           "actions" : ["act_0"],
           "base_default_next" : "node_10",
           "next_tables" : {
             "act_0" : "node_10"
           },
           "default_entry" : {
-            "action_id" : 38,
+            "action_id" : 39,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -4477,14 +4674,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [39],
+          "action_ids" : [40],
           "actions" : ["act_1"],
           "base_default_next" : "node_10",
           "next_tables" : {
             "act_1" : "node_10"
           },
           "default_entry" : {
-            "action_id" : 39,
+            "action_id" : 40,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -4500,14 +4697,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [41],
+          "action_ids" : [42],
           "actions" : ["act_3"],
           "base_default_next" : "node_17",
           "next_tables" : {
             "act_3" : "node_17"
           },
           "default_entry" : {
-            "action_id" : 41,
+            "action_id" : 42,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -4517,7 +4714,7 @@
           "name" : "FabricIngress.spgw_ingress.ue_filter_table",
           "id" : 7,
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 55,
             "column" : 10,
             "source_fragment" : "ue_filter_table"
@@ -4560,14 +4757,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [42],
+          "action_ids" : [43],
           "actions" : ["act_4"],
           "base_default_next" : "node_15",
           "next_tables" : {
             "act_4" : "node_15"
           },
           "default_entry" : {
-            "action_id" : 42,
+            "action_id" : 43,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -4583,14 +4780,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [43],
+          "action_ids" : [44],
           "actions" : ["act_5"],
           "base_default_next" : "node_15",
           "next_tables" : {
             "act_5" : "node_15"
           },
           "default_entry" : {
-            "action_id" : 43,
+            "action_id" : 44,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -4606,14 +4803,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [44],
+          "action_ids" : [45],
           "actions" : ["act_6"],
           "base_default_next" : "node_17",
           "next_tables" : {
             "act_6" : "node_17"
           },
           "default_entry" : {
-            "action_id" : 44,
+            "action_id" : 45,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -4629,14 +4826,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [46],
+          "action_ids" : [47],
           "actions" : ["act_8"],
           "base_default_next" : "node_19",
           "next_tables" : {
             "act_8" : "node_19"
           },
           "default_entry" : {
-            "action_id" : 46,
+            "action_id" : 47,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -4669,7 +4866,7 @@
           "name" : "FabricIngress.spgw_ingress.dl_sess_lookup",
           "id" : 13,
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 124,
             "column" : 10,
             "source_fragment" : "dl_sess_lookup"
@@ -4712,14 +4909,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [47],
+          "action_ids" : [48],
           "actions" : ["act_9"],
           "base_default_next" : "node_26",
           "next_tables" : {
             "act_9" : "node_26"
           },
           "default_entry" : {
-            "action_id" : 47,
+            "action_id" : 48,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -4735,14 +4932,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [48],
+          "action_ids" : [49],
           "actions" : ["act_10"],
           "base_default_next" : "node_26",
           "next_tables" : {
             "act_10" : "node_26"
           },
           "default_entry" : {
-            "action_id" : 48,
+            "action_id" : 49,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -4775,7 +4972,7 @@
           "name" : "FabricIngress.spgw_ingress.ue_cdr_table",
           "id" : 17,
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 134,
             "column" : 10,
             "source_fragment" : "ue_cdr_table"
@@ -4818,14 +5015,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [49],
+          "action_ids" : [50],
           "actions" : ["act_11"],
           "base_default_next" : "FabricIngress.filtering.ingress_port_vlan",
           "next_tables" : {
             "act_11" : "FabricIngress.filtering.ingress_port_vlan"
           },
           "default_entry" : {
-            "action_id" : 49,
+            "action_id" : 50,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -4835,8 +5032,8 @@
           "name" : "FabricIngress.filtering.ingress_port_vlan",
           "id" : 19,
           "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 57,
+            "filename" : "./include/control/filtering.p4",
+            "line" : 61,
             "column" : 10,
             "source_fragment" : "ingress_port_vlan"
           },
@@ -4886,8 +5083,8 @@
           "name" : "FabricIngress.filtering.fwd_classifier",
           "id" : 20,
           "source_info" : {
-            "filename" : "include/control/filtering.p4",
-            "line" : 76,
+            "filename" : "./include/control/filtering.p4",
+            "line" : 98,
             "column" : 10,
             "source_fragment" : "fwd_classifier"
           },
@@ -4934,8 +5131,8 @@
           "name" : "FabricIngress.forwarding.bridging",
           "id" : 21,
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 52,
+            "filename" : "./include/control/forwarding.p4",
+            "line" : 41,
             "column" : 10,
             "source_fragment" : "bridging"
           },
@@ -4959,11 +5156,11 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [22, 4],
-          "actions" : ["FabricIngress.forwarding.set_next_id", "NoAction"],
+          "action_ids" : [21, 4],
+          "actions" : ["FabricIngress.forwarding.set_next_id_bridging", "NoAction"],
           "base_default_next" : "FabricIngress.forwarding.acl",
           "next_tables" : {
-            "FabricIngress.forwarding.set_next_id" : "FabricIngress.forwarding.acl",
+            "FabricIngress.forwarding.set_next_id_bridging" : "FabricIngress.forwarding.acl",
             "NoAction" : "FabricIngress.forwarding.acl"
           },
           "default_entry" : {
@@ -4977,8 +5174,8 @@
           "name" : "FabricIngress.forwarding.mpls",
           "id" : 22,
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 64,
+            "filename" : "./include/control/forwarding.p4",
+            "line" : 65,
             "column" : 10,
             "source_fragment" : "mpls"
           },
@@ -4996,7 +5193,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [25, 5],
+          "action_ids" : [22, 5],
           "actions" : ["FabricIngress.forwarding.pop_mpls_and_next", "NoAction"],
           "base_default_next" : "tbl_act_12",
           "next_tables" : {
@@ -5020,14 +5217,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [50],
+          "action_ids" : [51],
           "actions" : ["act_12"],
           "base_default_next" : "FabricIngress.forwarding.acl",
           "next_tables" : {
             "act_12" : "FabricIngress.forwarding.acl"
           },
           "default_entry" : {
-            "action_id" : 50,
+            "action_id" : 51,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -5037,8 +5234,8 @@
           "name" : "FabricIngress.forwarding.unicast_v4",
           "id" : 24,
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 75,
+            "filename" : "./include/control/forwarding.p4",
+            "line" : 87,
             "column" : 10,
             "source_fragment" : "unicast_v4"
           },
@@ -5057,10 +5254,10 @@
           "support_timeout" : false,
           "direct_meters" : null,
           "action_ids" : [23, 6],
-          "actions" : ["FabricIngress.forwarding.set_next_id", "NoAction"],
+          "actions" : ["FabricIngress.forwarding.set_next_id_unicast_v4", "NoAction"],
           "base_default_next" : "FabricIngress.forwarding.acl",
           "next_tables" : {
-            "FabricIngress.forwarding.set_next_id" : "FabricIngress.forwarding.acl",
+            "FabricIngress.forwarding.set_next_id_unicast_v4" : "FabricIngress.forwarding.acl",
             "NoAction" : "FabricIngress.forwarding.acl"
           },
           "default_entry" : {
@@ -5074,8 +5271,8 @@
           "name" : "FabricIngress.forwarding.acl",
           "id" : 25,
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 133,
+            "filename" : "./include/control/forwarding.p4",
+            "line" : 119,
             "column" : 10,
             "source_fragment" : "acl"
           },
@@ -5159,12 +5356,12 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [24, 26, 21, 11],
-          "actions" : ["FabricIngress.forwarding.set_next_id", "FabricIngress.forwarding.duplicate_to_controller", "FabricIngress.forwarding.drop", "nop"],
+          "action_ids" : [24, 25, 26, 11],
+          "actions" : ["FabricIngress.forwarding.set_next_id_acl", "FabricIngress.forwarding.send_to_controller", "FabricIngress.forwarding.drop", "nop"],
           "base_default_next" : "FabricIngress.next.vlan_meta",
           "next_tables" : {
-            "FabricIngress.forwarding.set_next_id" : "FabricIngress.next.vlan_meta",
-            "FabricIngress.forwarding.duplicate_to_controller" : "FabricIngress.next.vlan_meta",
+            "FabricIngress.forwarding.set_next_id_acl" : "FabricIngress.next.vlan_meta",
+            "FabricIngress.forwarding.send_to_controller" : "FabricIngress.next.vlan_meta",
             "FabricIngress.forwarding.drop" : "FabricIngress.next.vlan_meta",
             "nop" : "FabricIngress.next.vlan_meta"
           },
@@ -5179,8 +5376,8 @@
           "name" : "FabricIngress.next.vlan_meta",
           "id" : 26,
           "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 96,
+            "filename" : "./include/control/next.p4",
+            "line" : 65,
             "column" : 10,
             "source_fragment" : "vlan_meta"
           },
@@ -5198,7 +5395,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [28, 12],
+          "action_ids" : [27, 12],
           "actions" : ["FabricIngress.next.set_vlan", "nop"],
           "base_default_next" : "FabricIngress.next.simple",
           "next_tables" : {
@@ -5216,8 +5413,8 @@
           "name" : "FabricIngress.next.simple",
           "id" : 27,
           "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 109,
+            "filename" : "./include/control/next.p4",
+            "line" : 122,
             "column" : 10,
             "source_fragment" : "simple"
           },
@@ -5235,8 +5432,8 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [27, 29, 30, 33, 32, 7],
-          "actions" : ["FabricIngress.next.output", "FabricIngress.next.set_vlan_output", "FabricIngress.next.l3_routing", "FabricIngress.next.mpls_routing_v4", "FabricIngress.next.l3_routing_vlan", "NoAction"],
+          "action_ids" : [28, 29, 30, 31, 32, 33, 7],
+          "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" : {
             "__HIT__" : "tbl_act_13",
@@ -5259,14 +5456,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [51],
+          "action_ids" : [52],
           "actions" : ["act_13"],
           "base_default_next" : "node_44",
           "next_tables" : {
             "act_13" : "node_44"
           },
           "default_entry" : {
-            "action_id" : 51,
+            "action_id" : 52,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -5282,14 +5479,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [52],
+          "action_ids" : [53],
           "actions" : ["act_14"],
           "base_default_next" : "node_44",
           "next_tables" : {
             "act_14" : "node_44"
           },
           "default_entry" : {
-            "action_id" : 52,
+            "action_id" : 53,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -5305,14 +5502,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [53],
+          "action_ids" : [54],
           "actions" : ["act_15"],
           "base_default_next" : "FabricIngress.next.hashed",
           "next_tables" : {
             "act_15" : "FabricIngress.next.hashed"
           },
           "default_entry" : {
-            "action_id" : 53,
+            "action_id" : 54,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -5322,8 +5519,8 @@
           "name" : "FabricIngress.next.hashed",
           "id" : 31,
           "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 124,
+            "filename" : "./include/control/next.p4",
+            "line" : 175,
             "column" : 10,
             "source_fragment" : "hashed"
           },
@@ -5342,13 +5539,13 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [31, 34, 35, 8],
-          "actions" : ["FabricIngress.next.l3_routing", "FabricIngress.next.mpls_routing_v4", "FabricIngress.next.mpls_routing_v6", "NoAction"],
+          "action_ids" : [34, 35, 36, 8],
+          "actions" : ["FabricIngress.next.l3_routing_hashed", "FabricIngress.next.mpls_routing_v4_hashed", "FabricIngress.next.mpls_routing_v6_hashed", "NoAction"],
           "base_default_next" : "FabricIngress.next.multicast",
           "next_tables" : {
-            "FabricIngress.next.l3_routing" : "FabricIngress.next.multicast",
-            "FabricIngress.next.mpls_routing_v4" : "FabricIngress.next.multicast",
-            "FabricIngress.next.mpls_routing_v6" : "FabricIngress.next.multicast",
+            "FabricIngress.next.l3_routing_hashed" : "FabricIngress.next.multicast",
+            "FabricIngress.next.mpls_routing_v4_hashed" : "FabricIngress.next.multicast",
+            "FabricIngress.next.mpls_routing_v6_hashed" : "FabricIngress.next.multicast",
             "NoAction" : "FabricIngress.next.multicast"
           }
         },
@@ -5356,8 +5553,8 @@
           "name" : "FabricIngress.next.multicast",
           "id" : 32,
           "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 153,
+            "filename" : "./include/control/next.p4",
+            "line" : 206,
             "column" : 10,
             "source_fragment" : "multicast"
           },
@@ -5375,7 +5572,7 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [36, 9],
+          "action_ids" : [37, 9],
           "actions" : ["FabricIngress.next.set_mcast_group", "NoAction"],
           "base_default_next" : "node_50",
           "next_tables" : {
@@ -5399,14 +5596,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [54],
+          "action_ids" : [55],
           "actions" : ["act_16"],
           "base_default_next" : "node_52",
           "next_tables" : {
             "act_16" : "node_52"
           },
           "default_entry" : {
-            "action_id" : 54,
+            "action_id" : 55,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -5422,14 +5619,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [55],
+          "action_ids" : [56],
           "actions" : ["act_17"],
           "base_default_next" : null,
           "next_tables" : {
             "act_17" : null
           },
           "default_entry" : {
-            "action_id" : 55,
+            "action_id" : 56,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -5473,7 +5670,7 @@
           "name" : "node_2",
           "id" : 0,
           "source_info" : {
-            "filename" : "include/control/packetio.p4",
+            "filename" : "./include/control/packetio.p4",
             "line" : 25,
             "column" : 12,
             "source_fragment" : "hdr.packet_out.isValid()"
@@ -5496,7 +5693,7 @@
           "name" : "node_5",
           "id" : 1,
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 147,
             "column" : 12,
             "source_fragment" : "gtpu.isValid()"
@@ -5553,7 +5750,7 @@
           "name" : "node_17",
           "id" : 4,
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 167,
             "column" : 12,
             "source_fragment" : "spgw_meta.do_spgw == false"
@@ -5610,7 +5807,7 @@
           "name" : "node_20",
           "id" : 6,
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 172,
             "column" : 12,
             "source_fragment" : "spgw_meta.direction == DIR_UPLINK"
@@ -5636,7 +5833,7 @@
           "name" : "node_22",
           "id" : 7,
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 189,
             "column" : 12,
             "source_fragment" : "spgw_meta.direction == DIR_DOWNLINK"
@@ -5662,7 +5859,7 @@
           "name" : "node_26",
           "id" : 8,
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 190,
             "column" : 16,
             "source_fragment" : "!dl_sess_lookup.apply().hit"
@@ -5692,8 +5889,8 @@
           "name" : "node_32",
           "id" : 9,
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 163,
+            "filename" : "./include/control/forwarding.p4",
+            "line" : 222,
             "column" : 11,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_BRIDGING"
           },
@@ -5718,8 +5915,8 @@
           "name" : "node_34",
           "id" : 10,
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 164,
+            "filename" : "./include/control/forwarding.p4",
+            "line" : 223,
             "column" : 17,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_MPLS"
           },
@@ -5744,8 +5941,8 @@
           "name" : "node_37",
           "id" : 11,
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 179,
+            "filename" : "./include/control/forwarding.p4",
+            "line" : 238,
             "column" : 17,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_IPV4_UNICAST"
           },
@@ -5787,8 +5984,8 @@
           "name" : "node_45",
           "id" : 13,
           "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 166,
+            "filename" : "./include/control/next.p4",
+            "line" : 219,
             "column" : 16,
             "source_fragment" : "!hdr.mpls.isValid()"
           },
@@ -5817,8 +6014,8 @@
           "name" : "node_46",
           "id" : 14,
           "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 167,
+            "filename" : "./include/control/next.p4",
+            "line" : 220,
             "column" : 19,
             "source_fragment" : "hdr.ipv4.isValid()"
           },
@@ -5840,7 +6037,7 @@
           "name" : "node_50",
           "id" : 15,
           "source_info" : {
-            "filename" : "include/control/port_counter.p4",
+            "filename" : "./include/control/port_counter.p4",
             "line" : 27,
             "column" : 12,
             "source_fragment" : "standard_metadata.egress_spec < 511"
@@ -5866,7 +6063,7 @@
           "name" : "node_52",
           "id" : 16,
           "source_info" : {
-            "filename" : "include/control/port_counter.p4",
+            "filename" : "./include/control/port_counter.p4",
             "line" : 30,
             "column" : 12,
             "source_fragment" : "standard_metadata.ingress_port < 511"
@@ -5905,8 +6102,8 @@
           "name" : "FabricEgress.egress_next.egress_vlan",
           "id" : 35,
           "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 192,
+            "filename" : "./include/control/next.p4",
+            "line" : 252,
             "column" : 10,
             "source_fragment" : "egress_vlan"
           },
@@ -5927,10 +6124,10 @@
           "match_type" : "exact",
           "type" : "simple",
           "max_size" : 1024,
-          "with_counters" : false,
+          "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [59, 56],
+          "action_ids" : [60, 57],
           "actions" : ["FabricEgress.egress_next.pop_vlan", "nop"],
           "base_default_next" : "node_57",
           "next_tables" : {
@@ -5938,7 +6135,7 @@
             "nop" : "node_57"
           },
           "default_entry" : {
-            "action_id" : 56,
+            "action_id" : 57,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
@@ -5954,14 +6151,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [58],
+          "action_ids" : [59],
           "actions" : ["FabricEgress.pkt_io_egress.pop_vlan"],
           "base_default_next" : "tbl_act_18",
           "next_tables" : {
             "FabricEgress.pkt_io_egress.pop_vlan" : "tbl_act_18"
           },
           "default_entry" : {
-            "action_id" : 58,
+            "action_id" : 59,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -5977,14 +6174,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [60],
+          "action_ids" : [61],
           "actions" : ["act_18"],
           "base_default_next" : "tbl_act_19",
           "next_tables" : {
             "act_18" : "tbl_act_19"
           },
           "default_entry" : {
-            "action_id" : 60,
+            "action_id" : 61,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -6000,14 +6197,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [61],
+          "action_ids" : [62],
           "actions" : ["act_19"],
           "base_default_next" : "node_62",
           "next_tables" : {
             "act_19" : "node_62"
           },
           "default_entry" : {
-            "action_id" : 61,
+            "action_id" : 62,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -6023,14 +6220,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [57],
+          "action_ids" : [58],
           "actions" : ["FabricEgress.spgw_egress.gtpu_encap"],
           "base_default_next" : null,
           "next_tables" : {
             "FabricEgress.spgw_egress.gtpu_encap" : null
           },
           "default_entry" : {
-            "action_id" : 57,
+            "action_id" : 58,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -6043,7 +6240,7 @@
           "name" : "node_57",
           "id" : 17,
           "source_info" : {
-            "filename" : "include/control/packetio.p4",
+            "filename" : "./include/control/packetio.p4",
             "line" : 42,
             "column" : 12,
             "source_fragment" : "standard_metadata.egress_port == 255"
@@ -6069,7 +6266,7 @@
           "name" : "node_58",
           "id" : 18,
           "source_info" : {
-            "filename" : "include/control/packetio.p4",
+            "filename" : "./include/control/packetio.p4",
             "line" : 43,
             "column" : 16,
             "source_fragment" : "hdr.vlan_tag.isValid() && fabric_metadata.pop_vlan_when_packet_in == true"
@@ -6119,7 +6316,7 @@
           "name" : "node_62",
           "id" : 19,
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 249,
             "column" : 12,
             "source_fragment" : "spgw_meta.do_spgw == true && spgw_meta.direction == DIR_DOWNLINK"
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 3b7c27c..93b7a12 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
@@ -111,6 +111,7 @@
   }
   action_refs {
     id: 16819938
+    annotations: "@defaultonly()"
   }
   action_refs {
     id: 16798734
@@ -171,7 +172,7 @@
     match_type: TERNARY
   }
   action_refs {
-    id: 16839692
+    id: 16811012
   }
   action_refs {
     id: 16800567
@@ -217,7 +218,7 @@
     match_type: LPM
   }
   action_refs {
-    id: 16839692
+    id: 16828976
   }
   action_refs {
     id: 16800567
@@ -306,16 +307,17 @@
     match_type: TERNARY
   }
   action_refs {
-    id: 16839692
+    id: 16785374
   }
   action_refs {
-    id: 16801739
+    id: 16810628
   }
   action_refs {
     id: 16833260
   }
   action_refs {
     id: 16819938
+    annotations: "@defaultonly()"
   }
   const_default_action_id: 16819938
   direct_resource_ids: 318772272
@@ -339,6 +341,7 @@
   }
   action_refs {
     id: 16819938
+    annotations: "@defaultonly()"
   }
   direct_resource_ids: 318785328
   size: 1024
@@ -357,16 +360,19 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16832750
+    id: 16802668
   }
   action_refs {
     id: 16808391
   }
   action_refs {
-    id: 16812135
+    id: 16780007
   }
   action_refs {
-    id: 16780811
+    id: 16806134
+  }
+  action_refs {
+    id: 16795970
   }
   action_refs {
     id: 16791579
@@ -392,13 +398,13 @@
     match_type: EXACT
   }
   action_refs {
-    id: 16812135
+    id: 16800211
   }
   action_refs {
-    id: 16780811
+    id: 16779239
   }
   action_refs {
-    id: 16827088
+    id: 16819349
   }
   action_refs {
     id: 16800567
@@ -455,7 +461,9 @@
   }
   action_refs {
     id: 16819938
+    annotations: "@defaultonly()"
   }
+  direct_resource_ids: 318827144
   size: 1024
   idle_timeout_behavior: NO_TIMEOUT
 }
@@ -561,16 +569,9 @@
 }
 actions {
   preamble {
-    id: 16833260
-    name: "FabricIngress.forwarding.drop"
-    alias: "forwarding.drop"
-  }
-}
-actions {
-  preamble {
-    id: 16839692
-    name: "FabricIngress.forwarding.set_next_id"
-    alias: "set_next_id"
+    id: 16811012
+    name: "FabricIngress.forwarding.set_next_id_bridging"
+    alias: "set_next_id_bridging"
   }
   params {
     id: 1
@@ -592,21 +593,40 @@
 }
 actions {
   preamble {
-    id: 16801739
-    name: "FabricIngress.forwarding.duplicate_to_controller"
-    alias: "duplicate_to_controller"
+    id: 16828976
+    name: "FabricIngress.forwarding.set_next_id_unicast_v4"
+    alias: "set_next_id_unicast_v4"
+  }
+  params {
+    id: 1
+    name: "next_id"
+    bitwidth: 32
   }
 }
 actions {
   preamble {
-    id: 16832750
-    name: "FabricIngress.next.output"
-    alias: "output"
+    id: 16785374
+    name: "FabricIngress.forwarding.set_next_id_acl"
+    alias: "set_next_id_acl"
   }
   params {
     id: 1
-    name: "port_num"
-    bitwidth: 9
+    name: "next_id"
+    bitwidth: 32
+  }
+}
+actions {
+  preamble {
+    id: 16810628
+    name: "FabricIngress.forwarding.send_to_controller"
+    alias: "send_to_controller"
+  }
+}
+actions {
+  preamble {
+    id: 16833260
+    name: "FabricIngress.forwarding.drop"
+    alias: "forwarding.drop"
   }
 }
 actions {
@@ -623,6 +643,18 @@
 }
 actions {
   preamble {
+    id: 16802668
+    name: "FabricIngress.next.output_simple"
+    alias: "output_simple"
+  }
+  params {
+    id: 1
+    name: "port_num"
+    bitwidth: 9
+  }
+}
+actions {
+  preamble {
     id: 16808391
     name: "FabricIngress.next.set_vlan_output"
     alias: "set_vlan_output"
@@ -640,9 +672,9 @@
 }
 actions {
   preamble {
-    id: 16812135
-    name: "FabricIngress.next.l3_routing"
-    alias: "l3_routing"
+    id: 16780007
+    name: "FabricIngress.next.l3_routing_simple"
+    alias: "l3_routing_simple"
   }
   params {
     id: 1
@@ -662,6 +694,60 @@
 }
 actions {
   preamble {
+    id: 16806134
+    name: "FabricIngress.next.mpls_routing_v4_simple"
+    alias: "mpls_routing_v4_simple"
+  }
+  params {
+    id: 1
+    name: "port_num"
+    bitwidth: 9
+  }
+  params {
+    id: 2
+    name: "smac"
+    bitwidth: 48
+  }
+  params {
+    id: 3
+    name: "dmac"
+    bitwidth: 48
+  }
+  params {
+    id: 4
+    name: "label"
+    bitwidth: 20
+  }
+}
+actions {
+  preamble {
+    id: 16795970
+    name: "FabricIngress.next.mpls_routing_v6_simple"
+    alias: "mpls_routing_v6_simple"
+  }
+  params {
+    id: 1
+    name: "port_num"
+    bitwidth: 9
+  }
+  params {
+    id: 2
+    name: "smac"
+    bitwidth: 48
+  }
+  params {
+    id: 3
+    name: "dmac"
+    bitwidth: 48
+  }
+  params {
+    id: 4
+    name: "label"
+    bitwidth: 20
+  }
+}
+actions {
+  preamble {
     id: 16791579
     name: "FabricIngress.next.l3_routing_vlan"
     alias: "l3_routing_vlan"
@@ -689,9 +775,31 @@
 }
 actions {
   preamble {
-    id: 16780811
-    name: "FabricIngress.next.mpls_routing_v4"
-    alias: "mpls_routing_v4"
+    id: 16800211
+    name: "FabricIngress.next.l3_routing_hashed"
+    alias: "l3_routing_hashed"
+  }
+  params {
+    id: 1
+    name: "port_num"
+    bitwidth: 9
+  }
+  params {
+    id: 2
+    name: "smac"
+    bitwidth: 48
+  }
+  params {
+    id: 3
+    name: "dmac"
+    bitwidth: 48
+  }
+}
+actions {
+  preamble {
+    id: 16779239
+    name: "FabricIngress.next.mpls_routing_v4_hashed"
+    alias: "mpls_routing_v4_hashed"
   }
   params {
     id: 1
@@ -716,9 +824,9 @@
 }
 actions {
   preamble {
-    id: 16827088
-    name: "FabricIngress.next.mpls_routing_v6"
-    alias: "mpls_routing_v6"
+    id: 16819349
+    name: "FabricIngress.next.mpls_routing_v6_hashed"
+    alias: "mpls_routing_v6_hashed"
   }
   params {
     id: 1
@@ -927,6 +1035,17 @@
   }
   direct_table_id: 33606828
 }
+direct_counters {
+  preamble {
+    id: 318827144
+    name: "FabricEgress.egress_next.egress_vlan_counter"
+    alias: "egress_vlan_counter"
+  }
+  spec {
+    unit: BOTH
+  }
+  direct_table_id: 33599342
+}
 controller_packet_metadata {
   preamble {
     id: 67146229