diff --git a/pipelines/fabric/src/main/resources/p4c-out/bmv2/fabric-spgw.json b/pipelines/fabric/src/main/resources/p4c-out/bmv2/fabric-spgw.json
index 6a023a5..56c04b4 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/bmv2/fabric-spgw.json
+++ b/pipelines/fabric/src/main/resources/p4c-out/bmv2/fabric-spgw.json
@@ -100,9 +100,23 @@
       ]
     },
     {
-      "name" : "arp_t",
+      "name" : "ipv6_t",
       "id" : 7,
       "fields" : [
+        ["version", 4, false],
+        ["traffic_class", 8, false],
+        ["flow_label", 20, false],
+        ["payload_len", 16, false],
+        ["next_hdr", 8, false],
+        ["hop_limit", 8, false],
+        ["src_addr", 128, false],
+        ["dst_addr", 128, false]
+      ]
+    },
+    {
+      "name" : "arp_t",
+      "id" : 8,
+      "fields" : [
         ["hw_type", 16, false],
         ["proto_type", 16, false],
         ["hw_addr_len", 8, false],
@@ -112,7 +126,7 @@
     },
     {
       "name" : "tcp_t",
-      "id" : 8,
+      "id" : 9,
       "fields" : [
         ["src_port", 16, false],
         ["dst_port", 16, false],
@@ -129,7 +143,7 @@
     },
     {
       "name" : "icmp_t",
-      "id" : 9,
+      "id" : 10,
       "fields" : [
         ["icmp_type", 8, false],
         ["icmp_code", 8, false],
@@ -141,7 +155,7 @@
     },
     {
       "name" : "packet_out_header_t",
-      "id" : 10,
+      "id" : 11,
       "fields" : [
         ["egress_port", 9, false],
         ["_pad", 7, false]
@@ -149,7 +163,7 @@
     },
     {
       "name" : "packet_in_header_t",
-      "id" : 11,
+      "id" : 12,
       "fields" : [
         ["ingress_port", 9, false],
         ["_pad", 7, false]
@@ -157,10 +171,11 @@
     },
     {
       "name" : "spgw_meta_t",
-      "id" : 12,
+      "id" : 13,
       "fields" : [
         ["do_spgw", 1, 0],
         ["direction", 1, false],
+        ["ipv4_len", 16, false],
         ["teid", 32, false],
         ["s1u_enb_addr", 32, false],
         ["s1u_sgw_addr", 32, false],
@@ -169,7 +184,7 @@
     },
     {
       "name" : "standard_metadata",
-      "id" : 13,
+      "id" : 14,
       "fields" : [
         ["ingress_port", 9, false],
         ["egress_spec", 9, false],
@@ -184,12 +199,14 @@
         ["deq_timedelta", 32, false],
         ["deq_qdepth", 19, false],
         ["ingress_global_timestamp", 48, false],
+        ["egress_global_timestamp", 48, false],
         ["lf_field_list", 32, false],
         ["mcast_grp", 16, false],
-        ["resubmit_flag", 1, false],
+        ["resubmit_flag", 32, false],
         ["egress_rid", 16, false],
         ["checksum_error", 1, false],
-        ["_padding_0", 4, false]
+        ["recirculate_flag", 32, false],
+        ["_padding_0", 5, false]
       ]
     }
   ],
@@ -258,50 +275,57 @@
       "pi_omit" : true
     },
     {
-      "name" : "arp",
+      "name" : "ipv6",
       "id" : 9,
+      "header_type" : "ipv6_t",
+      "metadata" : false,
+      "pi_omit" : true
+    },
+    {
+      "name" : "arp",
+      "id" : 10,
       "header_type" : "arp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "tcp",
-      "id" : 10,
+      "id" : 11,
       "header_type" : "tcp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "udp",
-      "id" : 11,
+      "id" : 12,
       "header_type" : "udp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "icmp",
-      "id" : 12,
+      "id" : 13,
       "header_type" : "icmp_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "packet_out",
-      "id" : 13,
+      "id" : 14,
       "header_type" : "packet_out_header_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
       "name" : "packet_in",
-      "id" : 14,
+      "id" : 15,
       "header_type" : "packet_in_header_t",
       "metadata" : false,
       "pi_omit" : true
     },
     {
-      "name" : "spgw",
-      "id" : 15,
+      "name" : "userMetadata.spgw",
+      "id" : 16,
       "header_type" : "spgw_meta_t",
       "metadata" : true,
       "pi_omit" : true
@@ -313,12 +337,12 @@
   "header_union_stacks" : [],
   "field_lists" : [],
   "errors" : [
-    ["NoError", 1],
-    ["PacketTooShort", 2],
-    ["NoMatch", 3],
-    ["StackOutOfBounds", 4],
-    ["HeaderTooShort", 5],
-    ["ParserTimeout", 6]
+    ["NoError", 0],
+    ["PacketTooShort", 1],
+    ["NoMatch", 2],
+    ["StackOutOfBounds", 3],
+    ["HeaderTooShort", 4],
+    ["ParserTimeout", 5]
   ],
   "enums" : [],
   "parsers" : [
@@ -333,6 +357,7 @@
           "parser_ops" : [],
           "transitions" : [
             {
+              "type" : "hexstr",
               "value" : "0x00ff",
               "mask" : null,
               "next_state" : "parse_packet_out"
@@ -402,26 +427,36 @@
           ],
           "transitions" : [
             {
+              "type" : "hexstr",
               "value" : "0x8100",
               "mask" : null,
               "next_state" : "parse_vlan_tag"
             },
             {
+              "type" : "hexstr",
               "value" : "0x8847",
               "mask" : null,
               "next_state" : "parse_mpls"
             },
             {
+              "type" : "hexstr",
               "value" : "0x0806",
               "mask" : null,
               "next_state" : "parse_arp"
             },
             {
+              "type" : "hexstr",
               "value" : "0x0800",
               "mask" : null,
               "next_state" : "parse_ipv4"
             },
             {
+              "type" : "hexstr",
+              "value" : "0x86dd",
+              "mask" : null,
+              "next_state" : "parse_ipv6"
+            },
+            {
               "value" : "default",
               "mask" : null,
               "next_state" : null
@@ -450,16 +485,25 @@
           ],
           "transitions" : [
             {
+              "type" : "hexstr",
               "value" : "0x0806",
               "mask" : null,
               "next_state" : "parse_arp"
             },
             {
+              "type" : "hexstr",
               "value" : "0x0800",
               "mask" : null,
               "next_state" : "parse_ipv4"
             },
             {
+              "type" : "hexstr",
+              "value" : "0x86dd",
+              "mask" : null,
+              "next_state" : "parse_ipv6"
+            },
+            {
+              "type" : "hexstr",
               "value" : "0x8847",
               "mask" : null,
               "next_state" : "parse_mpls"
@@ -506,11 +550,18 @@
           ],
           "transitions" : [
             {
+              "type" : "hexstr",
               "value" : "0x04",
               "mask" : null,
               "next_state" : "parse_ipv4"
             },
             {
+              "type" : "hexstr",
+              "value" : "0x06",
+              "mask" : null,
+              "next_state" : "parse_ipv6"
+            },
+            {
               "value" : "default",
               "mask" : null,
               "next_state" : "parse_ethernet"
@@ -552,16 +603,19 @@
           ],
           "transitions" : [
             {
+              "type" : "hexstr",
               "value" : "0x06",
               "mask" : null,
               "next_state" : "parse_tcp"
             },
             {
+              "type" : "hexstr",
               "value" : "0x11",
               "mask" : null,
               "next_state" : "parse_udp"
             },
             {
+              "type" : "hexstr",
               "value" : "0x01",
               "mask" : null,
               "next_state" : "parse_icmp"
@@ -580,13 +634,72 @@
           ]
         },
         {
-          "name" : "parse_arp",
+          "name" : "parse_ipv6",
           "id" : 6,
           "parser_ops" : [
             {
               "parameters" : [
                 {
                   "type" : "regular",
+                  "value" : "ipv6"
+                }
+              ],
+              "op" : "extract"
+            },
+            {
+              "parameters" : [
+                {
+                  "type" : "field",
+                  "value" : ["scalars", "fabric_metadata_t.ip_proto"]
+                },
+                {
+                  "type" : "field",
+                  "value" : ["ipv6", "next_hdr"]
+                }
+              ],
+              "op" : "set"
+            }
+          ],
+          "transitions" : [
+            {
+              "type" : "hexstr",
+              "value" : "0x06",
+              "mask" : null,
+              "next_state" : "parse_tcp"
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x11",
+              "mask" : null,
+              "next_state" : "parse_udp"
+            },
+            {
+              "type" : "hexstr",
+              "value" : "0x3a",
+              "mask" : null,
+              "next_state" : "parse_icmp"
+            },
+            {
+              "value" : "default",
+              "mask" : null,
+              "next_state" : null
+            }
+          ],
+          "transition_key" : [
+            {
+              "type" : "field",
+              "value" : ["ipv6", "next_hdr"]
+            }
+          ]
+        },
+        {
+          "name" : "parse_arp",
+          "id" : 7,
+          "parser_ops" : [
+            {
+              "parameters" : [
+                {
+                  "type" : "regular",
                   "value" : "arp"
                 }
               ],
@@ -604,7 +717,7 @@
         },
         {
           "name" : "parse_tcp",
-          "id" : 7,
+          "id" : 8,
           "parser_ops" : [
             {
               "parameters" : [
@@ -653,7 +766,7 @@
         },
         {
           "name" : "parse_udp",
-          "id" : 8,
+          "id" : 9,
           "parser_ops" : [
             {
               "parameters" : [
@@ -693,6 +806,7 @@
           ],
           "transitions" : [
             {
+              "type" : "hexstr",
               "value" : "0x0868",
               "mask" : null,
               "next_state" : "parse_gtpu"
@@ -712,7 +826,7 @@
         },
         {
           "name" : "parse_icmp",
-          "id" : 9,
+          "id" : 10,
           "parser_ops" : [
             {
               "parameters" : [
@@ -735,7 +849,7 @@
         },
         {
           "name" : "parse_gtpu",
-          "id" : 10,
+          "id" : 11,
           "parser_ops" : [
             {
               "parameters" : [
@@ -758,16 +872,19 @@
           ],
           "transitions" : [
             {
+              "type" : "hexstr",
               "value" : "0x06",
               "mask" : null,
               "next_state" : "parse_tcp"
             },
             {
+              "type" : "hexstr",
               "value" : "0x11",
               "mask" : null,
               "next_state" : "parse_udp_inner"
             },
             {
+              "type" : "hexstr",
               "value" : "0x01",
               "mask" : null,
               "next_state" : "parse_icmp"
@@ -787,7 +904,7 @@
         },
         {
           "name" : "parse_udp_inner",
-          "id" : 11,
+          "id" : 12,
           "parser_ops" : [
             {
               "parameters" : [
@@ -837,80 +954,105 @@
       ]
     }
   ],
+  "parse_vsets" : [],
   "deparsers" : [
     {
       "name" : "deparser",
       "id" : 0,
       "source_info" : {
-        "filename" : "include/parser.p4",
+        "filename" : "./include/parser.p4",
         "line" : 164,
         "column" : 8,
         "source_fragment" : "FabricDeparser"
       },
-      "order" : ["packet_in", "ethernet", "vlan_tag", "mpls", "arp", "gtpu_ipv4", "gtpu_udp", "gtpu", "ipv4", "tcp", "udp", "icmp"]
+      "order" : ["packet_in", "ethernet", "vlan_tag", "mpls", "arp", "gtpu_ipv4", "gtpu_udp", "gtpu", "ipv4", "ipv6", "tcp", "udp", "icmp"]
     }
   ],
   "meter_arrays" : [],
   "counter_arrays" : [
     {
-      "name" : "spgw_ingress.ue_counter",
+      "name" : "FabricIngress.spgw_ingress.ue_counter",
       "id" : 0,
       "is_direct" : true,
-      "binding" : "spgw_ingress.ue_cdr_table"
+      "binding" : "FabricIngress.spgw_ingress.ue_cdr_table"
     },
     {
-      "name" : "filtering.ingress_port_vlan_counter",
+      "name" : "FabricIngress.filtering.ingress_port_vlan_counter",
       "id" : 1,
       "is_direct" : true,
-      "binding" : "filtering.ingress_port_vlan"
+      "binding" : "FabricIngress.filtering.ingress_port_vlan"
     },
     {
-      "name" : "filtering.fwd_classifier_counter",
+      "name" : "FabricIngress.filtering.fwd_classifier_counter",
       "id" : 2,
       "is_direct" : true,
-      "binding" : "filtering.fwd_classifier"
+      "binding" : "FabricIngress.filtering.fwd_classifier"
     },
     {
-      "name" : "forwarding.bridging_counter",
+      "name" : "FabricIngress.forwarding.bridging_counter",
       "id" : 3,
       "is_direct" : true,
-      "binding" : "forwarding.bridging"
+      "binding" : "FabricIngress.forwarding.bridging"
     },
     {
-      "name" : "forwarding.mpls_counter",
+      "name" : "FabricIngress.forwarding.mpls_counter",
       "id" : 4,
       "is_direct" : true,
-      "binding" : "forwarding.mpls"
+      "binding" : "FabricIngress.forwarding.mpls"
     },
     {
-      "name" : "forwarding.unicast_v4_counter",
+      "name" : "FabricIngress.forwarding.unicast_v4_counter",
       "id" : 5,
       "is_direct" : true,
-      "binding" : "forwarding.unicast_v4"
+      "binding" : "FabricIngress.forwarding.unicast_v4"
     },
     {
-      "name" : "forwarding.acl_counter",
+      "name" : "FabricIngress.forwarding.acl_counter",
       "id" : 6,
       "is_direct" : true,
-      "binding" : "forwarding.acl"
+      "binding" : "FabricIngress.forwarding.acl"
     },
     {
-      "name" : "next.simple_counter",
+      "name" : "FabricIngress.forwarding.multicast_v4_counter",
       "id" : 7,
       "is_direct" : true,
-      "binding" : "next.simple"
+      "binding" : "FabricIngress.forwarding.multicast_v4"
     },
     {
-      "name" : "next.hashed_counter",
+      "name" : "FabricIngress.forwarding.unicast_v6_counter",
       "id" : 8,
       "is_direct" : true,
-      "binding" : "next.hashed"
+      "binding" : "FabricIngress.forwarding.unicast_v6"
     },
     {
-      "name" : "port_counters_control.egress_port_counter",
+      "name" : "FabricIngress.forwarding.multicast_v6_counter",
       "id" : 9,
+      "is_direct" : true,
+      "binding" : "FabricIngress.forwarding.multicast_v6"
+    },
+    {
+      "name" : "FabricIngress.next.simple_counter",
+      "id" : 10,
+      "is_direct" : true,
+      "binding" : "FabricIngress.next.simple"
+    },
+    {
+      "name" : "FabricIngress.next.hashed_counter",
+      "id" : 11,
+      "is_direct" : true,
+      "binding" : "FabricIngress.next.hashed"
+    },
+    {
+      "name" : "FabricIngress.next.multicast_counter",
+      "id" : 12,
+      "is_direct" : true,
+      "binding" : "FabricIngress.next.multicast"
+    },
+    {
+      "name" : "FabricIngress.port_counters_control.egress_port_counter",
+      "id" : 13,
       "source_info" : {
-        "filename" : "include/control/port_counter.p4",
+        "filename" : "./include/control/port_counter.p4",
         "line" : 23,
         "column" : 48,
         "source_fragment" : "egress_port_counter"
@@ -919,10 +1061,10 @@
       "is_direct" : false
     },
     {
-      "name" : "port_counters_control.ingress_port_counter",
-      "id" : 10,
+      "name" : "FabricIngress.port_counters_control.ingress_port_counter",
+      "id" : 14,
       "source_info" : {
-        "filename" : "include/control/port_counter.p4",
+        "filename" : "./include/control/port_counter.p4",
         "line" : 24,
         "column" : 48,
         "source_fragment" : "ingress_port_counter"
@@ -937,7 +1079,7 @@
       "name" : "calc",
       "id" : 0,
       "source_info" : {
-        "filename" : "include/checksum.p4",
+        "filename" : "./include/checksum.p4",
         "line" : 56,
         "column" : 8,
         "source_fragment" : "verify_checksum(hdr.ipv4.isValid(), ..."
@@ -994,7 +1136,7 @@
       "name" : "calc_0",
       "id" : 1,
       "source_info" : {
-        "filename" : "include/checksum.p4",
+        "filename" : "./include/checksum.p4",
         "line" : 28,
         "column" : 8,
         "source_fragment" : "update_checksum(hdr.ipv4.isValid(), ..."
@@ -1051,8 +1193,8 @@
       "name" : "calc_1",
       "id" : 2,
       "source_info" : {
-        "filename" : "include/spgw.p4",
-        "line" : 293,
+        "filename" : "./include/control/../spgw.p4",
+        "line" : 296,
         "column" : 8,
         "source_fragment" : "update_checksum(gtpu_ipv4.isValid(), ..."
       },
@@ -1162,27 +1304,51 @@
       "primitives" : []
     },
     {
-      "name" : "nop",
+      "name" : "NoAction",
       "id" : 9,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "nop",
+      "name" : "NoAction",
       "id" : 10,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "spgw_ingress.drop_now",
+      "name" : "NoAction",
       "id" : 11,
       "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "NoAction",
+      "id" : 12,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "nop",
+      "id" : 13,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "nop",
+      "id" : 14,
+      "runtime_data" : [],
+      "primitives" : []
+    },
+    {
+      "name" : "FabricIngress.spgw_ingress.drop_now",
+      "id" : 15,
+      "runtime_data" : [],
       "primitives" : [
         {
           "op" : "drop",
           "parameters" : [],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 33,
             "column" : 8,
             "source_fragment" : "mark_to_drop()"
@@ -1192,7 +1358,7 @@
           "op" : "exit",
           "parameters" : [],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 34,
             "column" : 8,
             "source_fragment" : "exit"
@@ -1201,8 +1367,8 @@
       ]
     },
     {
-      "name" : "spgw_ingress.gtpu_decap",
-      "id" : 12,
+      "name" : "FabricIngress.spgw_ingress.gtpu_decap",
+      "id" : 16,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -1214,7 +1380,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 38,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.setInvalid()"
@@ -1229,7 +1395,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 39,
             "column" : 8,
             "source_fragment" : "gtpu_udp.setInvalid()"
@@ -1244,7 +1410,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 40,
             "column" : 8,
             "source_fragment" : "gtpu.setInvalid()"
@@ -1253,8 +1419,8 @@
       ]
     },
     {
-      "name" : "spgw_ingress.set_dl_sess_info",
-      "id" : 13,
+      "name" : "FabricIngress.spgw_ingress.set_dl_sess_info",
+      "id" : 17,
       "runtime_data" : [
         {
           "name" : "teid",
@@ -1275,7 +1441,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["spgw", "teid"]
+              "value" : ["userMetadata.spgw", "teid"]
             },
             {
               "type" : "runtime_data",
@@ -1283,7 +1449,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 46,
             "column" : 8,
             "source_fragment" : "spgw_meta.teid = teid"
@@ -1294,7 +1460,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["spgw", "s1u_enb_addr"]
+              "value" : ["userMetadata.spgw", "s1u_enb_addr"]
             },
             {
               "type" : "runtime_data",
@@ -1302,7 +1468,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"
@@ -1313,7 +1479,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["spgw", "s1u_sgw_addr"]
+              "value" : ["userMetadata.spgw", "s1u_sgw_addr"]
             },
             {
               "type" : "runtime_data",
@@ -1321,7 +1487,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"
@@ -1330,21 +1496,21 @@
       ]
     },
     {
-      "name" : "spgw_ingress.update_ue_cdr",
-      "id" : 14,
+      "name" : "FabricIngress.spgw_ingress.update_ue_cdr",
+      "id" : 18,
       "runtime_data" : [],
       "primitives" : []
     },
     {
-      "name" : "filtering.drop",
-      "id" : 15,
+      "name" : "FabricIngress.filtering.drop",
+      "id" : 19,
       "runtime_data" : [],
       "primitives" : [
         {
           "op" : "drop",
           "parameters" : [],
           "source_info" : {
-            "filename" : "include/control/filtering.p4",
+            "filename" : "./include/control/filtering.p4",
             "line" : 31,
             "column" : 8,
             "source_fragment" : "mark_to_drop()"
@@ -1353,8 +1519,8 @@
       ]
     },
     {
-      "name" : "filtering.set_vlan",
-      "id" : 16,
+      "name" : "FabricIngress.filtering.set_vlan",
+      "id" : 20,
       "runtime_data" : [
         {
           "name" : "new_vlan_id",
@@ -1375,7 +1541,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/filtering.p4",
+            "filename" : "./include/control/filtering.p4",
             "line" : 35,
             "column" : 8,
             "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id"
@@ -1384,8 +1550,8 @@
       ]
     },
     {
-      "name" : "filtering.push_internal_vlan",
-      "id" : 17,
+      "name" : "FabricIngress.filtering.push_internal_vlan",
+      "id" : 21,
       "runtime_data" : [
         {
           "name" : "new_vlan_id",
@@ -1402,7 +1568,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/filtering.p4",
+            "filename" : "./include/control/filtering.p4",
             "line" : 41,
             "column" : 8,
             "source_fragment" : "hdr.vlan_tag.setValid()"
@@ -1421,7 +1587,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/filtering.p4",
+            "filename" : "./include/control/filtering.p4",
             "line" : 42,
             "column" : 8,
             "source_fragment" : "hdr.vlan_tag.cfi = 0"
@@ -1440,7 +1606,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/filtering.p4",
+            "filename" : "./include/control/filtering.p4",
             "line" : 43,
             "column" : 8,
             "source_fragment" : "hdr.vlan_tag.pri = 0"
@@ -1459,7 +1625,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/filtering.p4",
+            "filename" : "./include/control/filtering.p4",
             "line" : 44,
             "column" : 8,
             "source_fragment" : "hdr.vlan_tag.ether_type = hdr.ethernet.ether_type"
@@ -1478,7 +1644,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/../define.p4",
+            "filename" : "./include/control/../define.p4",
             "line" : 32,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
@@ -1497,7 +1663,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/filtering.p4",
+            "filename" : "./include/control/filtering.p4",
             "line" : 35,
             "column" : 8,
             "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id; ..."
@@ -1526,7 +1692,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/filtering.p4",
+            "filename" : "./include/control/filtering.p4",
             "line" : 49,
             "column" : 8,
             "source_fragment" : "fabric_metadata.pop_vlan_at_egress = true"
@@ -1535,8 +1701,8 @@
       ]
     },
     {
-      "name" : "filtering.set_forwarding_type",
-      "id" : 18,
+      "name" : "FabricIngress.filtering.set_forwarding_type",
+      "id" : 22,
       "runtime_data" : [
         {
           "name" : "fwd_type",
@@ -1557,7 +1723,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/filtering.p4",
+            "filename" : "./include/control/filtering.p4",
             "line" : 53,
             "column" : 8,
             "source_fragment" : "fabric_metadata.fwd_type = fwd_type"
@@ -1566,15 +1732,15 @@
       ]
     },
     {
-      "name" : "forwarding.drop",
-      "id" : 19,
+      "name" : "FabricIngress.forwarding.drop",
+      "id" : 23,
       "runtime_data" : [],
       "primitives" : [
         {
           "op" : "drop",
           "parameters" : [],
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
+            "filename" : "./include/control/forwarding.p4",
             "line" : 36,
             "column" : 8,
             "source_fragment" : "mark_to_drop()"
@@ -1583,8 +1749,8 @@
       ]
     },
     {
-      "name" : "forwarding.set_next_id",
-      "id" : 20,
+      "name" : "FabricIngress.forwarding.set_next_id",
+      "id" : 24,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -1605,7 +1771,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
+            "filename" : "./include/control/forwarding.p4",
             "line" : 40,
             "column" : 8,
             "source_fragment" : "fabric_metadata.next_id = next_id"
@@ -1614,8 +1780,8 @@
       ]
     },
     {
-      "name" : "forwarding.set_next_id",
-      "id" : 21,
+      "name" : "FabricIngress.forwarding.set_next_id",
+      "id" : 25,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -1636,7 +1802,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
+            "filename" : "./include/control/forwarding.p4",
             "line" : 40,
             "column" : 8,
             "source_fragment" : "fabric_metadata.next_id = next_id"
@@ -1645,8 +1811,8 @@
       ]
     },
     {
-      "name" : "forwarding.set_next_id",
-      "id" : 22,
+      "name" : "FabricIngress.forwarding.set_next_id",
+      "id" : 26,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -1667,7 +1833,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
+            "filename" : "./include/control/forwarding.p4",
             "line" : 40,
             "column" : 8,
             "source_fragment" : "fabric_metadata.next_id = next_id"
@@ -1676,8 +1842,101 @@
       ]
     },
     {
-      "name" : "forwarding.pop_mpls_and_next",
-      "id" : 23,
+      "name" : "FabricIngress.forwarding.set_next_id",
+      "id" : 27,
+      "runtime_data" : [
+        {
+          "name" : "next_id",
+          "bitwidth" : 32
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.next_id"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "./include/control/forwarding.p4",
+            "line" : 40,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.next_id = next_id"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.forwarding.set_next_id",
+      "id" : 28,
+      "runtime_data" : [
+        {
+          "name" : "next_id",
+          "bitwidth" : 32
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.next_id"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "./include/control/forwarding.p4",
+            "line" : 40,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.next_id = next_id"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.forwarding.set_next_id",
+      "id" : 29,
+      "runtime_data" : [
+        {
+          "name" : "next_id",
+          "bitwidth" : 32
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["scalars", "fabric_metadata_t.next_id"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "./include/control/forwarding.p4",
+            "line" : 40,
+            "column" : 8,
+            "source_fragment" : "fabric_metadata.next_id = next_id"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "FabricIngress.forwarding.pop_mpls_and_next",
+      "id" : 30,
       "runtime_data" : [
         {
           "name" : "next_id",
@@ -1694,7 +1953,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
+            "filename" : "./include/control/forwarding.p4",
             "line" : 44,
             "column" : 8,
             "source_fragment" : "hdr.mpls.setInvalid()"
@@ -1713,7 +1972,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
+            "filename" : "./include/control/forwarding.p4",
             "line" : 45,
             "column" : 8,
             "source_fragment" : "fabric_metadata.next_id = next_id"
@@ -1722,8 +1981,8 @@
       ]
     },
     {
-      "name" : "forwarding.duplicate_to_controller",
-      "id" : 24,
+      "name" : "FabricIngress.forwarding.duplicate_to_controller",
+      "id" : 31,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -1739,7 +1998,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
+            "filename" : "./include/control/forwarding.p4",
             "line" : 49,
             "column" : 8,
             "source_fragment" : "standard_metadata.egress_spec = 255"
@@ -1748,8 +2007,8 @@
       ]
     },
     {
-      "name" : "next.output",
-      "id" : 25,
+      "name" : "FabricIngress.next.output",
+      "id" : 32,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -1770,7 +2029,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
+            "filename" : "./include/control/next.p4",
             "line" : 32,
             "column" : 8,
             "source_fragment" : "standard_metadata.egress_spec = port_num"
@@ -1779,8 +2038,8 @@
       ]
     },
     {
-      "name" : "next.set_vlan_output",
-      "id" : 26,
+      "name" : "FabricIngress.next.set_vlan_output",
+      "id" : 33,
       "runtime_data" : [
         {
           "name" : "new_vlan_id",
@@ -1805,7 +2064,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
+            "filename" : "./include/control/next.p4",
             "line" : 36,
             "column" : 8,
             "source_fragment" : "hdr.vlan_tag.vlan_id = new_vlan_id"
@@ -1834,7 +2093,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
+            "filename" : "./include/control/next.p4",
             "line" : 39,
             "column" : 8,
             "source_fragment" : "fabric_metadata.pop_vlan_at_egress = false"
@@ -1853,7 +2112,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
+            "filename" : "./include/control/next.p4",
             "line" : 32,
             "column" : 8,
             "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
@@ -1862,8 +2121,8 @@
       ]
     },
     {
-      "name" : "next.l3_routing",
-      "id" : 27,
+      "name" : "FabricIngress.next.l3_routing",
+      "id" : 34,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -1892,7 +2151,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
+            "filename" : "./include/control/next.p4",
             "line" : 44,
             "column" : 8,
             "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
@@ -1911,7 +2170,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
+            "filename" : "./include/control/next.p4",
             "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
@@ -1930,7 +2189,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
+            "filename" : "./include/control/next.p4",
             "line" : 32,
             "column" : 8,
             "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
@@ -1939,8 +2198,8 @@
       ]
     },
     {
-      "name" : "next.l3_routing",
-      "id" : 28,
+      "name" : "FabricIngress.next.l3_routing",
+      "id" : 35,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -1969,7 +2228,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
+            "filename" : "./include/control/next.p4",
             "line" : 44,
             "column" : 8,
             "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
@@ -1988,7 +2247,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
+            "filename" : "./include/control/next.p4",
             "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
@@ -2007,7 +2266,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
+            "filename" : "./include/control/next.p4",
             "line" : 32,
             "column" : 8,
             "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
@@ -2016,8 +2275,8 @@
       ]
     },
     {
-      "name" : "next.mpls_routing_v4",
-      "id" : 29,
+      "name" : "FabricIngress.next.mpls_routing_v4",
+      "id" : 36,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -2050,7 +2309,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
+            "filename" : "./include/control/next.p4",
             "line" : 44,
             "column" : 8,
             "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
@@ -2069,7 +2328,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
+            "filename" : "./include/control/next.p4",
             "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
@@ -2088,7 +2347,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
+            "filename" : "./include/control/next.p4",
             "line" : 32,
             "column" : 8,
             "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
@@ -2103,7 +2362,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
+            "filename" : "./include/control/next.p4",
             "line" : 59,
             "column" : 8,
             "source_fragment" : "hdr.mpls.setValid()"
@@ -2122,7 +2381,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/../define.p4",
+            "filename" : "./include/control/../define.p4",
             "line" : 33,
             "column" : 31,
             "source_fragment" : "0x8847; ..."
@@ -2141,7 +2400,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
+            "filename" : "./include/control/next.p4",
             "line" : 61,
             "column" : 8,
             "source_fragment" : "hdr.mpls.label = label; ..."
@@ -2160,7 +2419,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
+            "filename" : "./include/control/next.p4",
             "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.mpls.tc = tc; ..."
@@ -2179,7 +2438,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
+            "filename" : "./include/control/next.p4",
             "line" : 63,
             "column" : 8,
             "source_fragment" : "hdr.mpls.bos = 1w1"
@@ -2198,7 +2457,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/../define.p4",
+            "filename" : "./include/control/../define.p4",
             "line" : 67,
             "column" : 32,
             "source_fragment" : "64; ..."
@@ -2207,8 +2466,8 @@
       ]
     },
     {
-      "name" : "next.mpls_routing_v4",
-      "id" : 30,
+      "name" : "FabricIngress.next.mpls_routing_v4",
+      "id" : 37,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -2241,7 +2500,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
+            "filename" : "./include/control/next.p4",
             "line" : 44,
             "column" : 8,
             "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
@@ -2260,7 +2519,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
+            "filename" : "./include/control/next.p4",
             "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
@@ -2279,7 +2538,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
+            "filename" : "./include/control/next.p4",
             "line" : 32,
             "column" : 8,
             "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
@@ -2294,7 +2553,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
+            "filename" : "./include/control/next.p4",
             "line" : 59,
             "column" : 8,
             "source_fragment" : "hdr.mpls.setValid()"
@@ -2313,7 +2572,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/../define.p4",
+            "filename" : "./include/control/../define.p4",
             "line" : 33,
             "column" : 31,
             "source_fragment" : "0x8847; ..."
@@ -2332,7 +2591,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
+            "filename" : "./include/control/next.p4",
             "line" : 61,
             "column" : 8,
             "source_fragment" : "hdr.mpls.label = label; ..."
@@ -2351,7 +2610,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
+            "filename" : "./include/control/next.p4",
             "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.mpls.tc = tc; ..."
@@ -2370,7 +2629,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
+            "filename" : "./include/control/next.p4",
             "line" : 63,
             "column" : 8,
             "source_fragment" : "hdr.mpls.bos = 1w1"
@@ -2389,7 +2648,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/../define.p4",
+            "filename" : "./include/control/../define.p4",
             "line" : 67,
             "column" : 32,
             "source_fragment" : "64; ..."
@@ -2398,8 +2657,8 @@
       ]
     },
     {
-      "name" : "next.mpls_routing_v6",
-      "id" : 31,
+      "name" : "FabricIngress.next.mpls_routing_v6",
+      "id" : 38,
       "runtime_data" : [
         {
           "name" : "port_num",
@@ -2432,7 +2691,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
+            "filename" : "./include/control/next.p4",
             "line" : 44,
             "column" : 8,
             "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
@@ -2451,7 +2710,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
+            "filename" : "./include/control/next.p4",
             "line" : 48,
             "column" : 8,
             "source_fragment" : "hdr.ethernet.dst_addr = dmac; ..."
@@ -2470,7 +2729,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
+            "filename" : "./include/control/next.p4",
             "line" : 32,
             "column" : 8,
             "source_fragment" : "standard_metadata.egress_spec = port_num; ..."
@@ -2485,7 +2744,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
+            "filename" : "./include/control/next.p4",
             "line" : 59,
             "column" : 8,
             "source_fragment" : "hdr.mpls.setValid()"
@@ -2504,7 +2763,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/../define.p4",
+            "filename" : "./include/control/../define.p4",
             "line" : 33,
             "column" : 31,
             "source_fragment" : "0x8847; ..."
@@ -2523,7 +2782,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
+            "filename" : "./include/control/next.p4",
             "line" : 61,
             "column" : 8,
             "source_fragment" : "hdr.mpls.label = label; ..."
@@ -2542,7 +2801,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
+            "filename" : "./include/control/next.p4",
             "line" : 62,
             "column" : 8,
             "source_fragment" : "hdr.mpls.tc = tc; ..."
@@ -2561,7 +2820,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
+            "filename" : "./include/control/next.p4",
             "line" : 63,
             "column" : 8,
             "source_fragment" : "hdr.mpls.bos = 1w1"
@@ -2580,7 +2839,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/../define.p4",
+            "filename" : "./include/control/../define.p4",
             "line" : 67,
             "column" : 32,
             "source_fragment" : "64; ..."
@@ -2589,8 +2848,62 @@
       ]
     },
     {
+      "name" : "FabricIngress.next.set_mcast_group",
+      "id" : 39,
+      "runtime_data" : [
+        {
+          "name" : "gid",
+          "bitwidth" : 16
+        },
+        {
+          "name" : "smac",
+          "bitwidth" : 48
+        }
+      ],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["standard_metadata", "mcast_grp"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 0
+            }
+          ],
+          "source_info" : {
+            "filename" : "./include/control/next.p4",
+            "line" : 122,
+            "column" : 8,
+            "source_fragment" : "standard_metadata.mcast_grp = gid"
+          }
+        },
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["ethernet", "src_addr"]
+            },
+            {
+              "type" : "runtime_data",
+              "value" : 1
+            }
+          ],
+          "source_info" : {
+            "filename" : "./include/control/next.p4",
+            "line" : 44,
+            "column" : 8,
+            "source_fragment" : "hdr.ethernet.src_addr = smac; ..."
+          }
+        }
+      ]
+    },
+    {
       "name" : "act",
-      "id" : 32,
+      "id" : 40,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2606,7 +2919,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"
@@ -2621,7 +2934,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/packetio.p4",
+            "filename" : "./include/control/packetio.p4",
             "line" : 27,
             "column" : 12,
             "source_fragment" : "hdr.packet_out.setInvalid()"
@@ -2631,7 +2944,7 @@
     },
     {
       "name" : "act_0",
-      "id" : 33,
+      "id" : 41,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2661,7 +2974,7 @@
     },
     {
       "name" : "act_1",
-      "id" : 34,
+      "id" : 42,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2691,7 +3004,7 @@
     },
     {
       "name" : "act_2",
-      "id" : 35,
+      "id" : 43,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2699,7 +3012,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["spgw", "s1u_enb_addr"]
+              "value" : ["userMetadata.spgw", "s1u_enb_addr"]
             },
             {
               "type" : "field",
@@ -2707,7 +3020,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"
@@ -2718,7 +3031,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["spgw", "s1u_sgw_addr"]
+              "value" : ["userMetadata.spgw", "s1u_sgw_addr"]
             },
             {
               "type" : "field",
@@ -2726,7 +3039,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"
@@ -2745,7 +3058,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 154,
             "column" : 17,
             "source_fragment" : "= gtpu_ipv4; ..."
@@ -2764,7 +3077,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 155,
             "column" : 16,
             "source_fragment" : "= gtpu_udp; ..."
@@ -2774,7 +3087,7 @@
     },
     {
       "name" : "act_3",
-      "id" : 36,
+      "id" : 44,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2782,7 +3095,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["spgw", "do_spgw"]
+              "value" : ["userMetadata.spgw", "do_spgw"]
             },
             {
               "type" : "expression",
@@ -2800,7 +3113,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 159,
             "column" : 16,
             "source_fragment" : "spgw_meta.do_spgw = true"
@@ -2811,7 +3124,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["spgw", "direction"]
+              "value" : ["userMetadata.spgw", "direction"]
             },
             {
               "type" : "hexstr",
@@ -2819,7 +3132,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/../define.p4",
+            "filename" : "./include/control/../define.p4",
             "line" : 88,
             "column" : 31,
             "source_fragment" : "1w0; ..."
@@ -2829,7 +3142,7 @@
     },
     {
       "name" : "act_4",
-      "id" : 37,
+      "id" : 45,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2859,7 +3172,7 @@
     },
     {
       "name" : "act_5",
-      "id" : 38,
+      "id" : 46,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2889,7 +3202,7 @@
     },
     {
       "name" : "act_6",
-      "id" : 39,
+      "id" : 47,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2897,7 +3210,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["spgw", "do_spgw"]
+              "value" : ["userMetadata.spgw", "do_spgw"]
             },
             {
               "type" : "expression",
@@ -2915,7 +3228,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 163,
             "column" : 12,
             "source_fragment" : "spgw_meta.do_spgw = true"
@@ -2926,7 +3239,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["spgw", "direction"]
+              "value" : ["userMetadata.spgw", "direction"]
             },
             {
               "type" : "hexstr",
@@ -2934,7 +3247,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/../define.p4",
+            "filename" : "./include/control/../define.p4",
             "line" : 89,
             "column" : 33,
             "source_fragment" : "1w1; ..."
@@ -2944,7 +3257,7 @@
     },
     {
       "name" : "act_7",
-      "id" : 40,
+      "id" : 48,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -2975,7 +3288,7 @@
           "parameters" : [
             {
               "type" : "field",
-              "value" : ["spgw", "do_spgw"]
+              "value" : ["userMetadata.spgw", "do_spgw"]
             },
             {
               "type" : "expression",
@@ -2993,7 +3306,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 146,
             "column" : 8,
             "source_fragment" : "spgw_meta.do_spgw = false"
@@ -3003,7 +3316,7 @@
     },
     {
       "name" : "act_8",
-      "id" : 41,
+      "id" : 49,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3029,7 +3342,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
+            "filename" : "./include/control/../spgw.p4",
             "line" : 169,
             "column" : 12,
             "source_fragment" : "return"
@@ -3039,7 +3352,7 @@
     },
     {
       "name" : "act_9",
-      "id" : 42,
+      "id" : 50,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3069,7 +3382,7 @@
     },
     {
       "name" : "act_10",
-      "id" : 43,
+      "id" : 51,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3099,7 +3412,33 @@
     },
     {
       "name" : "act_11",
-      "id" : 44,
+      "id" : 52,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["userMetadata.spgw", "ipv4_len"]
+            },
+            {
+              "type" : "field",
+              "value" : ["ipv4", "total_len"]
+            }
+          ],
+          "source_info" : {
+            "filename" : "./include/control/../spgw.p4",
+            "line" : 199,
+            "column" : 8,
+            "source_fragment" : "spgw_meta.ipv4_len = ipv4.total_len"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_12",
+      "id" : 53,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3115,7 +3454,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/../define.p4",
+            "filename" : "./include/control/../define.p4",
             "line" : 35,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
@@ -3134,7 +3473,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/../define.p4",
+            "filename" : "./include/control/../define.p4",
             "line" : 35,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
@@ -3143,8 +3482,8 @@
       ]
     },
     {
-      "name" : "act_12",
-      "id" : 45,
+      "name" : "act_13",
+      "id" : 54,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3173,8 +3512,8 @@
       ]
     },
     {
-      "name" : "act_13",
-      "id" : 46,
+      "name" : "act_14",
+      "id" : 55,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3203,8 +3542,8 @@
       ]
     },
     {
-      "name" : "act_14",
-      "id" : 47,
+      "name" : "act_15",
+      "id" : 56,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3243,7 +3582,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
+            "filename" : "./include/control/next.p4",
             "line" : 143,
             "column" : 20,
             "source_fragment" : "hdr.ipv4.ttl = hdr.ipv4.ttl - 1"
@@ -3252,8 +3591,57 @@
       ]
     },
     {
-      "name" : "act_15",
-      "id" : 48,
+      "name" : "act_16",
+      "id" : 57,
+      "runtime_data" : [],
+      "primitives" : [
+        {
+          "op" : "assign",
+          "parameters" : [
+            {
+              "type" : "field",
+              "value" : ["ipv6", "hop_limit"]
+            },
+            {
+              "type" : "expression",
+              "value" : {
+                "type" : "expression",
+                "value" : {
+                  "op" : "&",
+                  "left" : {
+                    "type" : "expression",
+                    "value" : {
+                      "op" : "+",
+                      "left" : {
+                        "type" : "field",
+                        "value" : ["ipv6", "hop_limit"]
+                      },
+                      "right" : {
+                        "type" : "hexstr",
+                        "value" : "0xff"
+                      }
+                    }
+                  },
+                  "right" : {
+                    "type" : "hexstr",
+                    "value" : "0xff"
+                  }
+                }
+              }
+            }
+          ],
+          "source_info" : {
+            "filename" : "./include/control/next.p4",
+            "line" : 147,
+            "column" : 20,
+            "source_fragment" : "hdr.ipv6.hop_limit = hdr.ipv6.hop_limit - 1"
+          }
+        }
+      ]
+    },
+    {
+      "name" : "act_17",
+      "id" : 58,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3287,7 +3675,7 @@
           "parameters" : [
             {
               "type" : "counter_array",
-              "value" : "port_counters_control.egress_port_counter"
+              "value" : "FabricIngress.port_counters_control.egress_port_counter"
             },
             {
               "type" : "field",
@@ -3295,7 +3683,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)"
@@ -3304,8 +3692,8 @@
       ]
     },
     {
-      "name" : "act_16",
-      "id" : 49,
+      "name" : "act_18",
+      "id" : 59,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3339,7 +3727,7 @@
           "parameters" : [
             {
               "type" : "counter_array",
-              "value" : "port_counters_control.ingress_port_counter"
+              "value" : "FabricIngress.port_counters_control.ingress_port_counter"
             },
             {
               "type" : "field",
@@ -3347,7 +3735,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)"
@@ -3356,8 +3744,8 @@
       ]
     },
     {
-      "name" : "act_17",
-      "id" : 50,
+      "name" : "act_19",
+      "id" : 60,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3373,7 +3761,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
+            "filename" : "./include/control/next.p4",
             "line" : 167,
             "column" : 12,
             "source_fragment" : "hdr.ethernet.ether_type = hdr.vlan_tag.ether_type"
@@ -3388,7 +3776,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/next.p4",
+            "filename" : "./include/control/next.p4",
             "line" : 168,
             "column" : 12,
             "source_fragment" : "hdr.vlan_tag.setInvalid()"
@@ -3397,8 +3785,8 @@
       ]
     },
     {
-      "name" : "spgw_egress.gtpu_encap",
-      "id" : 51,
+      "name" : "FabricEgress.spgw_egress.gtpu_encap",
+      "id" : 61,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3410,8 +3798,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 211,
+            "filename" : "./include/control/../spgw.p4",
+            "line" : 214,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.setValid()"
           }
@@ -3429,8 +3817,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 212,
+            "filename" : "./include/control/../spgw.p4",
+            "line" : 215,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.version = 4"
           }
@@ -3448,7 +3836,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/../define.p4",
+            "filename" : "./include/control/../define.p4",
             "line" : 54,
             "column" : 28,
             "source_fragment" : "5; ..."
@@ -3467,8 +3855,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 214,
+            "filename" : "./include/control/../spgw.p4",
+            "line" : 217,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.diffserv = 0"
           }
@@ -3492,7 +3880,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["ipv4", "total_len"]
+                        "value" : ["userMetadata.spgw", "ipv4_len"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3509,10 +3897,10 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 215,
+            "filename" : "./include/control/../spgw.p4",
+            "line" : 218,
             "column" : 8,
-            "source_fragment" : "gtpu_ipv4.total_len = ipv4.total_len ..."
+            "source_fragment" : "gtpu_ipv4.total_len = spgw_meta.ipv4_len ..."
           }
         },
         {
@@ -3528,8 +3916,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 217,
+            "filename" : "./include/control/../spgw.p4",
+            "line" : 220,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.identification = 0x1513"
           }
@@ -3547,8 +3935,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 218,
+            "filename" : "./include/control/../spgw.p4",
+            "line" : 221,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.flags = 0"
           }
@@ -3566,8 +3954,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 219,
+            "filename" : "./include/control/../spgw.p4",
+            "line" : 222,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.frag_offset = 0"
           }
@@ -3585,7 +3973,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/../define.p4",
+            "filename" : "./include/control/../define.p4",
             "line" : 78,
             "column" : 32,
             "source_fragment" : "64; ..."
@@ -3604,7 +3992,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/../define.p4",
+            "filename" : "./include/control/../define.p4",
             "line" : 51,
             "column" : 25,
             "source_fragment" : "17; ..."
@@ -3619,12 +4007,12 @@
             },
             {
               "type" : "field",
-              "value" : ["spgw", "s1u_enb_addr"]
+              "value" : ["userMetadata.spgw", "s1u_enb_addr"]
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 222,
+            "filename" : "./include/control/../spgw.p4",
+            "line" : 225,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.dst_addr = spgw_meta.s1u_enb_addr"
           }
@@ -3638,12 +4026,12 @@
             },
             {
               "type" : "field",
-              "value" : ["spgw", "s1u_sgw_addr"]
+              "value" : ["userMetadata.spgw", "s1u_sgw_addr"]
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 223,
+            "filename" : "./include/control/../spgw.p4",
+            "line" : 226,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.src_addr = spgw_meta.s1u_sgw_addr"
           }
@@ -3661,8 +4049,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 224,
+            "filename" : "./include/control/../spgw.p4",
+            "line" : 227,
             "column" : 8,
             "source_fragment" : "gtpu_ipv4.hdr_checksum = 0"
           }
@@ -3676,8 +4064,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 226,
+            "filename" : "./include/control/../spgw.p4",
+            "line" : 229,
             "column" : 8,
             "source_fragment" : "gtpu_udp.setValid()"
           }
@@ -3695,8 +4083,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 227,
+            "filename" : "./include/control/../spgw.p4",
+            "line" : 230,
             "column" : 8,
             "source_fragment" : "gtpu_udp.src_port = 2152"
           }
@@ -3714,8 +4102,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 228,
+            "filename" : "./include/control/../spgw.p4",
+            "line" : 231,
             "column" : 8,
             "source_fragment" : "gtpu_udp.dst_port = 2152"
           }
@@ -3739,7 +4127,7 @@
                       "op" : "+",
                       "left" : {
                         "type" : "field",
-                        "value" : ["ipv4", "total_len"]
+                        "value" : ["userMetadata.spgw", "ipv4_len"]
                       },
                       "right" : {
                         "type" : "hexstr",
@@ -3756,10 +4144,10 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 229,
+            "filename" : "./include/control/../spgw.p4",
+            "line" : 232,
             "column" : 8,
-            "source_fragment" : "gtpu_udp.len = ipv4.total_len ..."
+            "source_fragment" : "gtpu_udp.len = spgw_meta.ipv4_len ..."
           }
         },
         {
@@ -3775,8 +4163,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 231,
+            "filename" : "./include/control/../spgw.p4",
+            "line" : 234,
             "column" : 8,
             "source_fragment" : "gtpu_udp.checksum = 0"
           }
@@ -3790,8 +4178,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 233,
+            "filename" : "./include/control/../spgw.p4",
+            "line" : 236,
             "column" : 8,
             "source_fragment" : "gtpu.setValid()"
           }
@@ -3809,8 +4197,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 234,
+            "filename" : "./include/control/../spgw.p4",
+            "line" : 237,
             "column" : 8,
             "source_fragment" : "gtpu.version = 0x01"
           }
@@ -3828,8 +4216,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 235,
+            "filename" : "./include/control/../spgw.p4",
+            "line" : 238,
             "column" : 8,
             "source_fragment" : "gtpu.pt = 0x01"
           }
@@ -3847,8 +4235,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 236,
+            "filename" : "./include/control/../spgw.p4",
+            "line" : 239,
             "column" : 8,
             "source_fragment" : "gtpu.spare = 0"
           }
@@ -3866,8 +4254,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 237,
+            "filename" : "./include/control/../spgw.p4",
+            "line" : 240,
             "column" : 8,
             "source_fragment" : "gtpu.ex_flag = 0"
           }
@@ -3885,8 +4273,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 238,
+            "filename" : "./include/control/../spgw.p4",
+            "line" : 241,
             "column" : 8,
             "source_fragment" : "gtpu.seq_flag = 0"
           }
@@ -3904,8 +4292,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 239,
+            "filename" : "./include/control/../spgw.p4",
+            "line" : 242,
             "column" : 8,
             "source_fragment" : "gtpu.npdu_flag = 0"
           }
@@ -3923,8 +4311,8 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 240,
+            "filename" : "./include/control/../spgw.p4",
+            "line" : 243,
             "column" : 8,
             "source_fragment" : "gtpu.msgtype = 0xff"
           }
@@ -3938,14 +4326,14 @@
             },
             {
               "type" : "field",
-              "value" : ["ipv4", "total_len"]
+              "value" : ["userMetadata.spgw", "ipv4_len"]
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 241,
+            "filename" : "./include/control/../spgw.p4",
+            "line" : 244,
             "column" : 8,
-            "source_fragment" : "gtpu.msglen = ipv4.total_len"
+            "source_fragment" : "gtpu.msglen = spgw_meta.ipv4_len"
           }
         },
         {
@@ -3957,12 +4345,12 @@
             },
             {
               "type" : "field",
-              "value" : ["spgw", "teid"]
+              "value" : ["userMetadata.spgw", "teid"]
             }
           ],
           "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 242,
+            "filename" : "./include/control/../spgw.p4",
+            "line" : 245,
             "column" : 8,
             "source_fragment" : "gtpu.teid = spgw_meta.teid"
           }
@@ -3970,8 +4358,8 @@
       ]
     },
     {
-      "name" : "act_18",
-      "id" : 52,
+      "name" : "act_20",
+      "id" : 62,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -3983,7 +4371,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/packetio.p4",
+            "filename" : "./include/control/packetio.p4",
             "line" : 39,
             "column" : 12,
             "source_fragment" : "hdr.packet_in.setValid()"
@@ -4002,7 +4390,7 @@
             }
           ],
           "source_info" : {
-            "filename" : "include/control/packetio.p4",
+            "filename" : "./include/control/packetio.p4",
             "line" : 40,
             "column" : 12,
             "source_fragment" : "hdr.packet_in.ingress_port = standard_metadata.ingress_port"
@@ -4011,8 +4399,8 @@
       ]
     },
     {
-      "name" : "act_19",
-      "id" : 53,
+      "name" : "act_21",
+      "id" : 63,
       "runtime_data" : [],
       "primitives" : [
         {
@@ -4085,14 +4473,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [32],
+          "action_ids" : [40],
           "actions" : ["act"],
           "base_default_next" : null,
           "next_tables" : {
             "act" : null
           },
           "default_entry" : {
-            "action_id" : 32,
+            "action_id" : 40,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -4108,14 +4496,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [40],
+          "action_ids" : [48],
           "actions" : ["act_7"],
           "base_default_next" : "node_5",
           "next_tables" : {
             "act_7" : "node_5"
           },
           "default_entry" : {
-            "action_id" : 40,
+            "action_id" : 48,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -4131,24 +4519,24 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [35],
+          "action_ids" : [43],
           "actions" : ["act_2"],
-          "base_default_next" : "spgw_ingress.s1u_filter_table",
+          "base_default_next" : "FabricIngress.spgw_ingress.s1u_filter_table",
           "next_tables" : {
-            "act_2" : "spgw_ingress.s1u_filter_table"
+            "act_2" : "FabricIngress.spgw_ingress.s1u_filter_table"
           },
           "default_entry" : {
-            "action_id" : 35,
+            "action_id" : 43,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "spgw_ingress.s1u_filter_table",
+          "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"
@@ -4156,7 +4544,8 @@
           "key" : [
             {
               "match_type" : "exact",
-              "target" : ["spgw", "s1u_sgw_addr"],
+              "name" : "spgw_meta.s1u_sgw_addr",
+              "target" : ["userMetadata.spgw", "s1u_sgw_addr"],
               "mask" : null
             }
           ],
@@ -4190,14 +4579,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [33],
+          "action_ids" : [41],
           "actions" : ["act_0"],
           "base_default_next" : "node_10",
           "next_tables" : {
             "act_0" : "node_10"
           },
           "default_entry" : {
-            "action_id" : 33,
+            "action_id" : 41,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -4213,14 +4602,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [34],
+          "action_ids" : [42],
           "actions" : ["act_1"],
           "base_default_next" : "node_10",
           "next_tables" : {
             "act_1" : "node_10"
           },
           "default_entry" : {
-            "action_id" : 34,
+            "action_id" : 42,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -4236,24 +4625,24 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [36],
+          "action_ids" : [44],
           "actions" : ["act_3"],
           "base_default_next" : "node_17",
           "next_tables" : {
             "act_3" : "node_17"
           },
           "default_entry" : {
-            "action_id" : 36,
+            "action_id" : 44,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "spgw_ingress.ue_filter_table",
+          "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"
@@ -4261,6 +4650,7 @@
           "key" : [
             {
               "match_type" : "lpm",
+              "name" : "ipv4.dst_addr",
               "target" : ["ipv4", "dst_addr"],
               "mask" : null
             }
@@ -4295,14 +4685,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [37],
+          "action_ids" : [45],
           "actions" : ["act_4"],
           "base_default_next" : "node_15",
           "next_tables" : {
             "act_4" : "node_15"
           },
           "default_entry" : {
-            "action_id" : 37,
+            "action_id" : 45,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -4318,14 +4708,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [38],
+          "action_ids" : [46],
           "actions" : ["act_5"],
           "base_default_next" : "node_15",
           "next_tables" : {
             "act_5" : "node_15"
           },
           "default_entry" : {
-            "action_id" : 38,
+            "action_id" : 46,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -4341,14 +4731,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [39],
+          "action_ids" : [47],
           "actions" : ["act_6"],
           "base_default_next" : "node_17",
           "next_tables" : {
             "act_6" : "node_17"
           },
           "default_entry" : {
-            "action_id" : 39,
+            "action_id" : 47,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -4364,14 +4754,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [41],
+          "action_ids" : [49],
           "actions" : ["act_8"],
           "base_default_next" : "node_19",
           "next_tables" : {
             "act_8" : "node_19"
           },
           "default_entry" : {
-            "action_id" : 41,
+            "action_id" : 49,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -4387,24 +4777,24 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [12],
-          "actions" : ["spgw_ingress.gtpu_decap"],
+          "action_ids" : [16],
+          "actions" : ["FabricIngress.spgw_ingress.gtpu_decap"],
           "base_default_next" : "node_22",
           "next_tables" : {
-            "spgw_ingress.gtpu_decap" : "node_22"
+            "FabricIngress.spgw_ingress.gtpu_decap" : "node_22"
           },
           "default_entry" : {
-            "action_id" : 12,
+            "action_id" : 16,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "spgw_ingress.dl_sess_lookup",
+          "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"
@@ -4412,6 +4802,7 @@
           "key" : [
             {
               "match_type" : "exact",
+              "name" : "ipv4.dst_addr",
               "target" : ["ipv4", "dst_addr"],
               "mask" : null
             }
@@ -4422,8 +4813,8 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [13, 2],
-          "actions" : ["spgw_ingress.set_dl_sess_info", "NoAction"],
+          "action_ids" : [17, 2],
+          "actions" : ["FabricIngress.spgw_ingress.set_dl_sess_info", "NoAction"],
           "base_default_next" : null,
           "next_tables" : {
             "__HIT__" : "tbl_act_9",
@@ -4446,14 +4837,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [42],
+          "action_ids" : [50],
           "actions" : ["act_9"],
           "base_default_next" : "node_26",
           "next_tables" : {
             "act_9" : "node_26"
           },
           "default_entry" : {
-            "action_id" : 42,
+            "action_id" : 50,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -4469,14 +4860,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [43],
+          "action_ids" : [51],
           "actions" : ["act_10"],
           "base_default_next" : "node_26",
           "next_tables" : {
             "act_10" : "node_26"
           },
           "default_entry" : {
-            "action_id" : 43,
+            "action_id" : 51,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -4492,24 +4883,24 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [11],
-          "actions" : ["spgw_ingress.drop_now"],
-          "base_default_next" : "spgw_ingress.ue_cdr_table",
+          "action_ids" : [15],
+          "actions" : ["FabricIngress.spgw_ingress.drop_now"],
+          "base_default_next" : "FabricIngress.spgw_ingress.ue_cdr_table",
           "next_tables" : {
-            "spgw_ingress.drop_now" : "spgw_ingress.ue_cdr_table"
+            "FabricIngress.spgw_ingress.drop_now" : "FabricIngress.spgw_ingress.ue_cdr_table"
           },
           "default_entry" : {
-            "action_id" : 11,
+            "action_id" : 15,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "spgw_ingress.ue_cdr_table",
+          "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"
@@ -4517,6 +4908,7 @@
           "key" : [
             {
               "match_type" : "exact",
+              "name" : "ipv4.dst_addr",
               "target" : ["ipv4", "dst_addr"],
               "mask" : null
             }
@@ -4527,12 +4919,12 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [14, 3],
-          "actions" : ["spgw_ingress.update_ue_cdr", "NoAction"],
-          "base_default_next" : "filtering.ingress_port_vlan",
+          "action_ids" : [18, 3],
+          "actions" : ["FabricIngress.spgw_ingress.update_ue_cdr", "NoAction"],
+          "base_default_next" : "tbl_act_11",
           "next_tables" : {
-            "spgw_ingress.update_ue_cdr" : "filtering.ingress_port_vlan",
-            "NoAction" : "filtering.ingress_port_vlan"
+            "FabricIngress.spgw_ingress.update_ue_cdr" : "tbl_act_11",
+            "NoAction" : "tbl_act_11"
           },
           "default_entry" : {
             "action_id" : 3,
@@ -4542,10 +4934,33 @@
           }
         },
         {
-          "name" : "filtering.ingress_port_vlan",
+          "name" : "tbl_act_11",
           "id" : 18,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [52],
+          "actions" : ["act_11"],
+          "base_default_next" : "FabricIngress.filtering.ingress_port_vlan",
+          "next_tables" : {
+            "act_11" : "FabricIngress.filtering.ingress_port_vlan"
+          },
+          "default_entry" : {
+            "action_id" : 52,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.filtering.ingress_port_vlan",
+          "id" : 19,
           "source_info" : {
-            "filename" : "include/control/filtering.p4",
+            "filename" : "./include/control/filtering.p4",
             "line" : 57,
             "column" : 10,
             "source_fragment" : "ingress_port_vlan"
@@ -4553,16 +4968,19 @@
           "key" : [
             {
               "match_type" : "exact",
+              "name" : "standard_metadata.ingress_port",
               "target" : ["standard_metadata", "ingress_port"],
               "mask" : null
             },
             {
               "match_type" : "exact",
+              "name" : "hdr.vlan_tag.is_valid",
               "target" : ["vlan_tag", "$valid$"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
+              "name" : "hdr.vlan_tag.vlan_id",
               "target" : ["vlan_tag", "vlan_id"],
               "mask" : null
             }
@@ -4573,27 +4991,27 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [17, 16, 9, 15],
-          "actions" : ["filtering.push_internal_vlan", "filtering.set_vlan", "nop", "filtering.drop"],
-          "base_default_next" : "filtering.fwd_classifier",
+          "action_ids" : [21, 20, 13, 19],
+          "actions" : ["FabricIngress.filtering.push_internal_vlan", "FabricIngress.filtering.set_vlan", "nop", "FabricIngress.filtering.drop"],
+          "base_default_next" : "FabricIngress.filtering.fwd_classifier",
           "next_tables" : {
-            "filtering.push_internal_vlan" : "filtering.fwd_classifier",
-            "filtering.set_vlan" : "filtering.fwd_classifier",
-            "nop" : "filtering.fwd_classifier",
-            "filtering.drop" : "filtering.fwd_classifier"
+            "FabricIngress.filtering.push_internal_vlan" : "FabricIngress.filtering.fwd_classifier",
+            "FabricIngress.filtering.set_vlan" : "FabricIngress.filtering.fwd_classifier",
+            "nop" : "FabricIngress.filtering.fwd_classifier",
+            "FabricIngress.filtering.drop" : "FabricIngress.filtering.fwd_classifier"
           },
           "default_entry" : {
-            "action_id" : 9,
+            "action_id" : 13,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "filtering.fwd_classifier",
-          "id" : 19,
+          "name" : "FabricIngress.filtering.fwd_classifier",
+          "id" : 20,
           "source_info" : {
-            "filename" : "include/control/filtering.p4",
+            "filename" : "./include/control/filtering.p4",
             "line" : 76,
             "column" : 10,
             "source_fragment" : "fwd_classifier"
@@ -4601,16 +5019,19 @@
           "key" : [
             {
               "match_type" : "exact",
+              "name" : "standard_metadata.ingress_port",
               "target" : ["standard_metadata", "ingress_port"],
               "mask" : null
             },
             {
               "match_type" : "exact",
+              "name" : "hdr.ethernet.dst_addr",
               "target" : ["ethernet", "dst_addr"],
               "mask" : null
             },
             {
               "match_type" : "exact",
+              "name" : "fabric_metadata.original_ether_type",
               "target" : ["scalars", "fabric_metadata_t.original_ether_type"],
               "mask" : null
             }
@@ -4621,24 +5042,24 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [18],
-          "actions" : ["filtering.set_forwarding_type"],
-          "base_default_next" : "node_31",
+          "action_ids" : [22],
+          "actions" : ["FabricIngress.filtering.set_forwarding_type"],
+          "base_default_next" : "node_32",
           "next_tables" : {
-            "filtering.set_forwarding_type" : "node_31"
+            "FabricIngress.filtering.set_forwarding_type" : "node_32"
           },
           "default_entry" : {
-            "action_id" : 18,
+            "action_id" : 22,
             "action_const" : true,
             "action_data" : ["0x0"],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "forwarding.bridging",
-          "id" : 20,
+          "name" : "FabricIngress.forwarding.bridging",
+          "id" : 21,
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
+            "filename" : "./include/control/forwarding.p4",
             "line" : 52,
             "column" : 10,
             "source_fragment" : "bridging"
@@ -4646,11 +5067,13 @@
           "key" : [
             {
               "match_type" : "exact",
+              "name" : "hdr.vlan_tag.vlan_id",
               "target" : ["vlan_tag", "vlan_id"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
+              "name" : "hdr.ethernet.dst_addr",
               "target" : ["ethernet", "dst_addr"],
               "mask" : null
             }
@@ -4661,12 +5084,12 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [20, 4],
-          "actions" : ["forwarding.set_next_id", "NoAction"],
-          "base_default_next" : "forwarding.acl",
+          "action_ids" : [24, 4],
+          "actions" : ["FabricIngress.forwarding.set_next_id", "NoAction"],
+          "base_default_next" : "FabricIngress.forwarding.acl",
           "next_tables" : {
-            "forwarding.set_next_id" : "forwarding.acl",
-            "NoAction" : "forwarding.acl"
+            "FabricIngress.forwarding.set_next_id" : "FabricIngress.forwarding.acl",
+            "NoAction" : "FabricIngress.forwarding.acl"
           },
           "default_entry" : {
             "action_id" : 4,
@@ -4676,10 +5099,10 @@
           }
         },
         {
-          "name" : "forwarding.mpls",
-          "id" : 21,
+          "name" : "FabricIngress.forwarding.mpls",
+          "id" : 22,
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
+            "filename" : "./include/control/forwarding.p4",
             "line" : 64,
             "column" : 10,
             "source_fragment" : "mpls"
@@ -4687,6 +5110,7 @@
           "key" : [
             {
               "match_type" : "exact",
+              "name" : "hdr.mpls.label",
               "target" : ["mpls", "label"],
               "mask" : null
             }
@@ -4697,12 +5121,12 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [23, 5],
-          "actions" : ["forwarding.pop_mpls_and_next", "NoAction"],
-          "base_default_next" : "tbl_act_11",
+          "action_ids" : [30, 5],
+          "actions" : ["FabricIngress.forwarding.pop_mpls_and_next", "NoAction"],
+          "base_default_next" : "tbl_act_12",
           "next_tables" : {
-            "forwarding.pop_mpls_and_next" : "tbl_act_11",
-            "NoAction" : "tbl_act_11"
+            "FabricIngress.forwarding.pop_mpls_and_next" : "tbl_act_12",
+            "NoAction" : "tbl_act_12"
           },
           "default_entry" : {
             "action_id" : 5,
@@ -4712,8 +5136,8 @@
           }
         },
         {
-          "name" : "tbl_act_11",
-          "id" : 22,
+          "name" : "tbl_act_12",
+          "id" : 23,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -4721,24 +5145,24 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [44],
-          "actions" : ["act_11"],
-          "base_default_next" : "forwarding.acl",
+          "action_ids" : [53],
+          "actions" : ["act_12"],
+          "base_default_next" : "FabricIngress.forwarding.acl",
           "next_tables" : {
-            "act_11" : "forwarding.acl"
+            "act_12" : "FabricIngress.forwarding.acl"
           },
           "default_entry" : {
-            "action_id" : 44,
+            "action_id" : 53,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "forwarding.unicast_v4",
-          "id" : 23,
+          "name" : "FabricIngress.forwarding.unicast_v4",
+          "id" : 24,
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
+            "filename" : "./include/control/forwarding.p4",
             "line" : 75,
             "column" : 10,
             "source_fragment" : "unicast_v4"
@@ -4746,6 +5170,7 @@
           "key" : [
             {
               "match_type" : "lpm",
+              "name" : "hdr.ipv4.dst_addr",
               "target" : ["ipv4", "dst_addr"],
               "mask" : null
             }
@@ -4756,12 +5181,12 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [21, 6],
-          "actions" : ["forwarding.set_next_id", "NoAction"],
-          "base_default_next" : "forwarding.acl",
+          "action_ids" : [25, 6],
+          "actions" : ["FabricIngress.forwarding.set_next_id", "NoAction"],
+          "base_default_next" : "FabricIngress.forwarding.acl",
           "next_tables" : {
-            "forwarding.set_next_id" : "forwarding.acl",
-            "NoAction" : "forwarding.acl"
+            "FabricIngress.forwarding.set_next_id" : "FabricIngress.forwarding.acl",
+            "NoAction" : "FabricIngress.forwarding.acl"
           },
           "default_entry" : {
             "action_id" : 6,
@@ -4771,10 +5196,133 @@
           }
         },
         {
-          "name" : "forwarding.acl",
-          "id" : 24,
+          "name" : "FabricIngress.forwarding.multicast_v4",
+          "id" : 25,
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
+            "filename" : "./include/control/forwarding.p4",
+            "line" : 89,
+            "column" : 10,
+            "source_fragment" : "multicast_v4"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "hdr.vlan_tag.vlan_id",
+              "target" : ["vlan_tag", "vlan_id"],
+              "mask" : null
+            },
+            {
+              "match_type" : "lpm",
+              "name" : "hdr.ipv4.dst_addr",
+              "target" : ["ipv4", "dst_addr"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "lpm",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [26, 7],
+          "actions" : ["FabricIngress.forwarding.set_next_id", "NoAction"],
+          "base_default_next" : "FabricIngress.forwarding.acl",
+          "next_tables" : {
+            "FabricIngress.forwarding.set_next_id" : "FabricIngress.forwarding.acl",
+            "NoAction" : "FabricIngress.forwarding.acl"
+          },
+          "default_entry" : {
+            "action_id" : 7,
+            "action_const" : false,
+            "action_data" : [],
+            "action_entry_const" : false
+          }
+        },
+        {
+          "name" : "FabricIngress.forwarding.unicast_v6",
+          "id" : 26,
+          "source_info" : {
+            "filename" : "./include/control/forwarding.p4",
+            "line" : 105,
+            "column" : 10,
+            "source_fragment" : "unicast_v6"
+          },
+          "key" : [
+            {
+              "match_type" : "lpm",
+              "name" : "hdr.ipv6.dst_addr",
+              "target" : ["ipv6", "dst_addr"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "lpm",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [27, 8],
+          "actions" : ["FabricIngress.forwarding.set_next_id", "NoAction"],
+          "base_default_next" : "FabricIngress.forwarding.acl",
+          "next_tables" : {
+            "FabricIngress.forwarding.set_next_id" : "FabricIngress.forwarding.acl",
+            "NoAction" : "FabricIngress.forwarding.acl"
+          },
+          "default_entry" : {
+            "action_id" : 8,
+            "action_const" : false,
+            "action_data" : [],
+            "action_entry_const" : false
+          }
+        },
+        {
+          "name" : "FabricIngress.forwarding.multicast_v6",
+          "id" : 27,
+          "source_info" : {
+            "filename" : "./include/control/forwarding.p4",
+            "line" : 119,
+            "column" : 10,
+            "source_fragment" : "multicast_v6"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "hdr.vlan_tag.vlan_id",
+              "target" : ["vlan_tag", "vlan_id"],
+              "mask" : null
+            },
+            {
+              "match_type" : "lpm",
+              "name" : "hdr.ipv6.dst_addr",
+              "target" : ["ipv6", "dst_addr"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "lpm",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [28, 9],
+          "actions" : ["FabricIngress.forwarding.set_next_id", "NoAction"],
+          "base_default_next" : "FabricIngress.forwarding.acl",
+          "next_tables" : {
+            "FabricIngress.forwarding.set_next_id" : "FabricIngress.forwarding.acl",
+            "NoAction" : "FabricIngress.forwarding.acl"
+          },
+          "default_entry" : {
+            "action_id" : 9,
+            "action_const" : false,
+            "action_data" : [],
+            "action_entry_const" : false
+          }
+        },
+        {
+          "name" : "FabricIngress.forwarding.acl",
+          "id" : 28,
+          "source_info" : {
+            "filename" : "./include/control/forwarding.p4",
             "line" : 133,
             "column" : 10,
             "source_fragment" : "acl"
@@ -4782,61 +5330,73 @@
           "key" : [
             {
               "match_type" : "ternary",
+              "name" : "standard_metadata.ingress_port",
               "target" : ["standard_metadata", "ingress_port"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
+              "name" : "fabric_metadata.ip_proto",
               "target" : ["scalars", "fabric_metadata_t.ip_proto"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
+              "name" : "fabric_metadata.l4_src_port",
               "target" : ["scalars", "fabric_metadata_t.l4_src_port"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
+              "name" : "fabric_metadata.l4_dst_port",
               "target" : ["scalars", "fabric_metadata_t.l4_dst_port"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
+              "name" : "fabric_metadata.original_ether_type",
               "target" : ["scalars", "fabric_metadata_t.original_ether_type"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
+              "name" : "hdr.ethernet.dst_addr",
               "target" : ["ethernet", "dst_addr"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
+              "name" : "hdr.ethernet.src_addr",
               "target" : ["ethernet", "src_addr"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
+              "name" : "hdr.vlan_tag.vlan_id",
               "target" : ["vlan_tag", "vlan_id"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
+              "name" : "hdr.ipv4.src_addr",
               "target" : ["ipv4", "src_addr"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
+              "name" : "hdr.ipv4.dst_addr",
               "target" : ["ipv4", "dst_addr"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
+              "name" : "hdr.icmp.icmp_type",
               "target" : ["icmp", "icmp_type"],
               "mask" : null
             },
             {
               "match_type" : "ternary",
+              "name" : "hdr.icmp.icmp_code",
               "target" : ["icmp", "icmp_code"],
               "mask" : null
             }
@@ -4847,27 +5407,27 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [22, 24, 19, 10],
-          "actions" : ["forwarding.set_next_id", "forwarding.duplicate_to_controller", "forwarding.drop", "nop"],
-          "base_default_next" : "next.simple",
+          "action_ids" : [29, 31, 23, 14],
+          "actions" : ["FabricIngress.forwarding.set_next_id", "FabricIngress.forwarding.duplicate_to_controller", "FabricIngress.forwarding.drop", "nop"],
+          "base_default_next" : "FabricIngress.next.simple",
           "next_tables" : {
-            "forwarding.set_next_id" : "next.simple",
-            "forwarding.duplicate_to_controller" : "next.simple",
-            "forwarding.drop" : "next.simple",
-            "nop" : "next.simple"
+            "FabricIngress.forwarding.set_next_id" : "FabricIngress.next.simple",
+            "FabricIngress.forwarding.duplicate_to_controller" : "FabricIngress.next.simple",
+            "FabricIngress.forwarding.drop" : "FabricIngress.next.simple",
+            "nop" : "FabricIngress.next.simple"
           },
           "default_entry" : {
-            "action_id" : 10,
+            "action_id" : 14,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "next.simple",
-          "id" : 25,
+          "name" : "FabricIngress.next.simple",
+          "id" : 29,
           "source_info" : {
-            "filename" : "include/control/next.p4",
+            "filename" : "./include/control/next.p4",
             "line" : 83,
             "column" : 10,
             "source_fragment" : "simple"
@@ -4875,6 +5435,7 @@
           "key" : [
             {
               "match_type" : "exact",
+              "name" : "fabric_metadata.next_id",
               "target" : ["scalars", "fabric_metadata_t.next_id"],
               "mask" : null
             }
@@ -4885,124 +5446,22 @@
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [25, 26, 27, 29, 7],
-          "actions" : ["next.output", "next.set_vlan_output", "next.l3_routing", "next.mpls_routing_v4", "NoAction"],
+          "action_ids" : [32, 33, 34, 36, 10],
+          "actions" : ["FabricIngress.next.output", "FabricIngress.next.set_vlan_output", "FabricIngress.next.l3_routing", "FabricIngress.next.mpls_routing_v4", "NoAction"],
           "base_default_next" : null,
           "next_tables" : {
-            "__HIT__" : "tbl_act_12",
-            "__MISS__" : "tbl_act_13"
+            "__HIT__" : "tbl_act_13",
+            "__MISS__" : "tbl_act_14"
           },
           "default_entry" : {
-            "action_id" : 7,
+            "action_id" : 10,
             "action_const" : false,
             "action_data" : [],
             "action_entry_const" : false
           }
         },
         {
-          "name" : "tbl_act_12",
-          "id" : 26,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [45],
-          "actions" : ["act_12"],
-          "base_default_next" : "node_42",
-          "next_tables" : {
-            "act_12" : "node_42"
-          },
-          "default_entry" : {
-            "action_id" : 45,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
           "name" : "tbl_act_13",
-          "id" : 27,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [46],
-          "actions" : ["act_13"],
-          "base_default_next" : "node_42",
-          "next_tables" : {
-            "act_13" : "node_42"
-          },
-          "default_entry" : {
-            "action_id" : 46,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "tbl_act_14",
-          "id" : 28,
-          "key" : [],
-          "match_type" : "exact",
-          "type" : "simple",
-          "max_size" : 1024,
-          "with_counters" : false,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [47],
-          "actions" : ["act_14"],
-          "base_default_next" : "next.hashed",
-          "next_tables" : {
-            "act_14" : "next.hashed"
-          },
-          "default_entry" : {
-            "action_id" : 47,
-            "action_const" : true,
-            "action_data" : [],
-            "action_entry_const" : true
-          }
-        },
-        {
-          "name" : "next.hashed",
-          "id" : 29,
-          "source_info" : {
-            "filename" : "include/control/next.p4",
-            "line" : 97,
-            "column" : 10,
-            "source_fragment" : "hashed"
-          },
-          "key" : [
-            {
-              "match_type" : "exact",
-              "target" : ["scalars", "fabric_metadata_t.next_id"],
-              "mask" : null
-            }
-          ],
-          "match_type" : "exact",
-          "type" : "indirect_ws",
-          "action_profile" : "next.ecmp_selector",
-          "max_size" : 1024,
-          "with_counters" : true,
-          "support_timeout" : false,
-          "direct_meters" : null,
-          "action_ids" : [28, 30, 31, 8],
-          "actions" : ["next.l3_routing", "next.mpls_routing_v4", "next.mpls_routing_v6", "NoAction"],
-          "base_default_next" : "node_47",
-          "next_tables" : {
-            "next.l3_routing" : "node_47",
-            "next.mpls_routing_v4" : "node_47",
-            "next.mpls_routing_v6" : "node_47",
-            "NoAction" : "node_47"
-          }
-        },
-        {
-          "name" : "tbl_act_15",
           "id" : 30,
           "key" : [],
           "match_type" : "exact",
@@ -5011,21 +5470,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [48],
-          "actions" : ["act_15"],
+          "action_ids" : [54],
+          "actions" : ["act_13"],
           "base_default_next" : "node_49",
           "next_tables" : {
-            "act_15" : "node_49"
+            "act_13" : "node_49"
           },
           "default_entry" : {
-            "action_id" : 48,
+            "action_id" : 54,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_16",
+          "name" : "tbl_act_14",
           "id" : 31,
           "key" : [],
           "match_type" : "exact",
@@ -5034,21 +5493,21 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [49],
-          "actions" : ["act_16"],
-          "base_default_next" : "node_51",
+          "action_ids" : [55],
+          "actions" : ["act_14"],
+          "base_default_next" : "node_49",
           "next_tables" : {
-            "act_16" : "node_51"
+            "act_14" : "node_49"
           },
           "default_entry" : {
-            "action_id" : 49,
+            "action_id" : 55,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_17",
+          "name" : "tbl_act_15",
           "id" : 32,
           "key" : [],
           "match_type" : "exact",
@@ -5057,14 +5516,177 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [50],
-          "actions" : ["act_17"],
-          "base_default_next" : null,
+          "action_ids" : [56],
+          "actions" : ["act_15"],
+          "base_default_next" : "FabricIngress.next.hashed",
           "next_tables" : {
-            "act_17" : null
+            "act_15" : "FabricIngress.next.hashed"
           },
           "default_entry" : {
-            "action_id" : 50,
+            "action_id" : 56,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_16",
+          "id" : 33,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [57],
+          "actions" : ["act_16"],
+          "base_default_next" : "FabricIngress.next.hashed",
+          "next_tables" : {
+            "act_16" : "FabricIngress.next.hashed"
+          },
+          "default_entry" : {
+            "action_id" : 57,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "FabricIngress.next.hashed",
+          "id" : 34,
+          "source_info" : {
+            "filename" : "./include/control/next.p4",
+            "line" : 97,
+            "column" : 10,
+            "source_fragment" : "hashed"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "fabric_metadata.next_id",
+              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "indirect_ws",
+          "action_profile" : "FabricIngress.next.ecmp_selector",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [35, 37, 38, 11],
+          "actions" : ["FabricIngress.next.l3_routing", "FabricIngress.next.mpls_routing_v4", "FabricIngress.next.mpls_routing_v6", "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",
+            "NoAction" : "FabricIngress.next.multicast"
+          }
+        },
+        {
+          "name" : "FabricIngress.next.multicast",
+          "id" : 35,
+          "source_info" : {
+            "filename" : "./include/control/next.p4",
+            "line" : 128,
+            "column" : 10,
+            "source_fragment" : "multicast"
+          },
+          "key" : [
+            {
+              "match_type" : "exact",
+              "name" : "fabric_metadata.next_id",
+              "target" : ["scalars", "fabric_metadata_t.next_id"],
+              "mask" : null
+            }
+          ],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : true,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [39, 12],
+          "actions" : ["FabricIngress.next.set_mcast_group", "NoAction"],
+          "base_default_next" : "node_57",
+          "next_tables" : {
+            "FabricIngress.next.set_mcast_group" : "node_57",
+            "NoAction" : "node_57"
+          },
+          "default_entry" : {
+            "action_id" : 12,
+            "action_const" : false,
+            "action_data" : [],
+            "action_entry_const" : false
+          }
+        },
+        {
+          "name" : "tbl_act_17",
+          "id" : 36,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [58],
+          "actions" : ["act_17"],
+          "base_default_next" : "node_59",
+          "next_tables" : {
+            "act_17" : "node_59"
+          },
+          "default_entry" : {
+            "action_id" : 58,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_18",
+          "id" : 37,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [59],
+          "actions" : ["act_18"],
+          "base_default_next" : "node_61",
+          "next_tables" : {
+            "act_18" : "node_61"
+          },
+          "default_entry" : {
+            "action_id" : 59,
+            "action_const" : true,
+            "action_data" : [],
+            "action_entry_const" : true
+          }
+        },
+        {
+          "name" : "tbl_act_19",
+          "id" : 38,
+          "key" : [],
+          "match_type" : "exact",
+          "type" : "simple",
+          "max_size" : 1024,
+          "with_counters" : false,
+          "support_timeout" : false,
+          "direct_meters" : null,
+          "action_ids" : [60],
+          "actions" : ["act_19"],
+          "base_default_next" : null,
+          "next_tables" : {
+            "act_19" : null
+          },
+          "default_entry" : {
+            "action_id" : 60,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -5073,7 +5695,7 @@
       ],
       "action_profiles" : [
         {
-          "name" : "next.ecmp_selector",
+          "name" : "FabricIngress.next.ecmp_selector",
           "id" : 0,
           "max_size" : 64,
           "selector" : {
@@ -5108,7 +5730,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()"
@@ -5131,7 +5753,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()"
@@ -5148,7 +5770,7 @@
             }
           },
           "true_next" : "tbl_act_1",
-          "false_next" : "spgw_ingress.ue_filter_table"
+          "false_next" : "FabricIngress.spgw_ingress.ue_filter_table"
         },
         {
           "name" : "node_10",
@@ -5188,7 +5810,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"
@@ -5205,7 +5827,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["spgw", "do_spgw"]
+                    "value" : ["userMetadata.spgw", "do_spgw"]
                   }
                 }
               }
@@ -5236,13 +5858,13 @@
             }
           },
           "true_next" : "node_20",
-          "false_next" : "filtering.ingress_port_vlan"
+          "false_next" : "FabricIngress.filtering.ingress_port_vlan"
         },
         {
           "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"
@@ -5253,7 +5875,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["spgw", "direction"]
+                "value" : ["userMetadata.spgw", "direction"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -5268,7 +5890,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"
@@ -5279,7 +5901,7 @@
               "op" : "==",
               "left" : {
                 "type" : "field",
-                "value" : ["spgw", "direction"]
+                "value" : ["userMetadata.spgw", "direction"]
               },
               "right" : {
                 "type" : "hexstr",
@@ -5287,14 +5909,14 @@
               }
             }
           },
-          "true_next" : "spgw_ingress.dl_sess_lookup",
-          "false_next" : "filtering.ingress_port_vlan"
+          "true_next" : "FabricIngress.spgw_ingress.dl_sess_lookup",
+          "false_next" : "tbl_act_11"
         },
         {
           "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"
@@ -5318,13 +5940,13 @@
             }
           },
           "true_next" : "tbl_spgw_ingress_drop_now",
-          "false_next" : "spgw_ingress.ue_cdr_table"
+          "false_next" : "FabricIngress.spgw_ingress.ue_cdr_table"
         },
         {
-          "name" : "node_31",
+          "name" : "node_32",
           "id" : 9,
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
+            "filename" : "./include/control/forwarding.p4",
             "line" : 163,
             "column" : 11,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_BRIDGING"
@@ -5343,14 +5965,14 @@
               }
             }
           },
-          "true_next" : "forwarding.bridging",
-          "false_next" : "node_33"
+          "true_next" : "FabricIngress.forwarding.bridging",
+          "false_next" : "node_34"
         },
         {
-          "name" : "node_33",
+          "name" : "node_34",
           "id" : 10,
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
+            "filename" : "./include/control/forwarding.p4",
             "line" : 164,
             "column" : 17,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_MPLS"
@@ -5369,15 +5991,15 @@
               }
             }
           },
-          "true_next" : "forwarding.mpls",
-          "false_next" : "node_36"
+          "true_next" : "FabricIngress.forwarding.mpls",
+          "false_next" : "node_37"
         },
         {
-          "name" : "node_36",
+          "name" : "node_37",
           "id" : 11,
           "source_info" : {
-            "filename" : "include/control/forwarding.p4",
-            "line" : 179,
+            "filename" : "./include/control/forwarding.p4",
+            "line" : 171,
             "column" : 17,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_IPV4_UNICAST"
           },
@@ -5395,12 +6017,90 @@
               }
             }
           },
-          "true_next" : "forwarding.unicast_v4",
-          "false_next" : "forwarding.acl"
+          "true_next" : "FabricIngress.forwarding.unicast_v4",
+          "false_next" : "node_39"
         },
         {
-          "name" : "node_42",
+          "name" : "node_39",
           "id" : 12,
+          "source_info" : {
+            "filename" : "./include/control/forwarding.p4",
+            "line" : 173,
+            "column" : 17,
+            "source_fragment" : "fabric_metadata.fwd_type == FWD_IPV4_MULTICAST"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "field",
+                "value" : ["scalars", "fabric_metadata_t.fwd_type"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x03"
+              }
+            }
+          },
+          "true_next" : "FabricIngress.forwarding.multicast_v4",
+          "false_next" : "node_41"
+        },
+        {
+          "name" : "node_41",
+          "id" : 13,
+          "source_info" : {
+            "filename" : "./include/control/forwarding.p4",
+            "line" : 176,
+            "column" : 17,
+            "source_fragment" : "fabric_metadata.fwd_type == FWD_IPV6_UNICAST"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "field",
+                "value" : ["scalars", "fabric_metadata_t.fwd_type"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x04"
+              }
+            }
+          },
+          "true_next" : "FabricIngress.forwarding.unicast_v6",
+          "false_next" : "node_43"
+        },
+        {
+          "name" : "node_43",
+          "id" : 14,
+          "source_info" : {
+            "filename" : "./include/control/forwarding.p4",
+            "line" : 178,
+            "column" : 17,
+            "source_fragment" : "fabric_metadata.fwd_type == FWD_IPV6_MULTICAST"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "==",
+              "left" : {
+                "type" : "field",
+                "value" : ["scalars", "fabric_metadata_t.fwd_type"]
+              },
+              "right" : {
+                "type" : "hexstr",
+                "value" : "0x05"
+              }
+            }
+          },
+          "true_next" : "FabricIngress.forwarding.multicast_v6",
+          "false_next" : "FabricIngress.forwarding.acl"
+        },
+        {
+          "name" : "node_49",
+          "id" : 15,
           "expression" : {
             "type" : "expression",
             "value" : {
@@ -5412,14 +6112,14 @@
               }
             }
           },
-          "true_next" : "node_43",
-          "false_next" : "next.hashed"
+          "true_next" : "node_50",
+          "false_next" : "FabricIngress.next.hashed"
         },
         {
-          "name" : "node_43",
-          "id" : 13,
+          "name" : "node_50",
+          "id" : 16,
           "source_info" : {
-            "filename" : "include/control/next.p4",
+            "filename" : "./include/control/next.p4",
             "line" : 141,
             "column" : 16,
             "source_fragment" : "!hdr.mpls.isValid()"
@@ -5442,14 +6142,14 @@
               }
             }
           },
-          "true_next" : "node_44",
-          "false_next" : "next.hashed"
+          "true_next" : "node_51",
+          "false_next" : "FabricIngress.next.hashed"
         },
         {
-          "name" : "node_44",
-          "id" : 14,
+          "name" : "node_51",
+          "id" : 17,
           "source_info" : {
-            "filename" : "include/control/next.p4",
+            "filename" : "./include/control/next.p4",
             "line" : 142,
             "column" : 19,
             "source_fragment" : "hdr.ipv4.isValid()"
@@ -5465,14 +6165,37 @@
               }
             }
           },
-          "true_next" : "tbl_act_14",
-          "false_next" : "next.hashed"
+          "true_next" : "tbl_act_15",
+          "false_next" : "node_53"
         },
         {
-          "name" : "node_47",
-          "id" : 15,
+          "name" : "node_53",
+          "id" : 18,
           "source_info" : {
-            "filename" : "include/control/port_counter.p4",
+            "filename" : "./include/control/next.p4",
+            "line" : 146,
+            "column" : 25,
+            "source_fragment" : "hdr.ipv6.isValid()"
+          },
+          "expression" : {
+            "type" : "expression",
+            "value" : {
+              "op" : "d2b",
+              "left" : null,
+              "right" : {
+                "type" : "field",
+                "value" : ["ipv6", "$valid$"]
+              }
+            }
+          },
+          "true_next" : "tbl_act_16",
+          "false_next" : "FabricIngress.next.hashed"
+        },
+        {
+          "name" : "node_57",
+          "id" : 19,
+          "source_info" : {
+            "filename" : "./include/control/port_counter.p4",
             "line" : 27,
             "column" : 12,
             "source_fragment" : "standard_metadata.egress_spec < 511"
@@ -5491,14 +6214,14 @@
               }
             }
           },
-          "true_next" : "tbl_act_15",
-          "false_next" : "node_49"
+          "true_next" : "tbl_act_17",
+          "false_next" : "node_59"
         },
         {
-          "name" : "node_49",
-          "id" : 16,
+          "name" : "node_59",
+          "id" : 20,
           "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"
@@ -5517,14 +6240,14 @@
               }
             }
           },
-          "true_next" : "tbl_act_16",
-          "false_next" : "node_51"
+          "true_next" : "tbl_act_18",
+          "false_next" : "node_61"
         },
         {
-          "name" : "node_51",
-          "id" : 17,
+          "name" : "node_61",
+          "id" : 21,
           "source_info" : {
-            "filename" : "include/control/next.p4",
+            "filename" : "./include/control/next.p4",
             "line" : 166,
             "column" : 12,
             "source_fragment" : "fabric_metadata.pop_vlan_at_egress"
@@ -5541,7 +6264,7 @@
             }
           },
           "false_next" : null,
-          "true_next" : "tbl_act_17"
+          "true_next" : "tbl_act_19"
         }
       ]
     },
@@ -5554,11 +6277,11 @@
         "column" : 8,
         "source_fragment" : "FabricEgress"
       },
-      "init_table" : "node_55",
+      "init_table" : "node_65",
       "tables" : [
         {
-          "name" : "tbl_act_18",
-          "id" : 33,
+          "name" : "tbl_act_20",
+          "id" : 39,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -5566,22 +6289,22 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [52],
-          "actions" : ["act_18"],
-          "base_default_next" : "tbl_act_19",
+          "action_ids" : [62],
+          "actions" : ["act_20"],
+          "base_default_next" : "tbl_act_21",
           "next_tables" : {
-            "act_18" : "tbl_act_19"
+            "act_20" : "tbl_act_21"
           },
           "default_entry" : {
-            "action_id" : 52,
+            "action_id" : 62,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
           }
         },
         {
-          "name" : "tbl_act_19",
-          "id" : 34,
+          "name" : "tbl_act_21",
+          "id" : 40,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -5589,14 +6312,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [53],
-          "actions" : ["act_19"],
-          "base_default_next" : "node_58",
+          "action_ids" : [63],
+          "actions" : ["act_21"],
+          "base_default_next" : "node_68",
           "next_tables" : {
-            "act_19" : "node_58"
+            "act_21" : "node_68"
           },
           "default_entry" : {
-            "action_id" : 53,
+            "action_id" : 63,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -5604,7 +6327,7 @@
         },
         {
           "name" : "tbl_spgw_egress_gtpu_encap",
-          "id" : 35,
+          "id" : 41,
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -5612,14 +6335,14 @@
           "with_counters" : false,
           "support_timeout" : false,
           "direct_meters" : null,
-          "action_ids" : [51],
-          "actions" : ["spgw_egress.gtpu_encap"],
+          "action_ids" : [61],
+          "actions" : ["FabricEgress.spgw_egress.gtpu_encap"],
           "base_default_next" : null,
           "next_tables" : {
-            "spgw_egress.gtpu_encap" : null
+            "FabricEgress.spgw_egress.gtpu_encap" : null
           },
           "default_entry" : {
-            "action_id" : 51,
+            "action_id" : 61,
             "action_const" : true,
             "action_data" : [],
             "action_entry_const" : true
@@ -5629,10 +6352,10 @@
       "action_profiles" : [],
       "conditionals" : [
         {
-          "name" : "node_55",
-          "id" : 18,
+          "name" : "node_65",
+          "id" : 22,
           "source_info" : {
-            "filename" : "include/control/packetio.p4",
+            "filename" : "./include/control/packetio.p4",
             "line" : 38,
             "column" : 12,
             "source_fragment" : "standard_metadata.egress_port == 255"
@@ -5651,15 +6374,15 @@
               }
             }
           },
-          "true_next" : "tbl_act_18",
-          "false_next" : "tbl_act_19"
+          "true_next" : "tbl_act_20",
+          "false_next" : "tbl_act_21"
         },
         {
-          "name" : "node_58",
-          "id" : 19,
+          "name" : "node_68",
+          "id" : 23,
           "source_info" : {
-            "filename" : "include/spgw.p4",
-            "line" : 246,
+            "filename" : "./include/control/../spgw.p4",
+            "line" : 249,
             "column" : 12,
             "source_fragment" : "spgw_meta.do_spgw && spgw_meta.direction == DIR_DOWNLINK"
           },
@@ -5674,7 +6397,7 @@
                   "left" : null,
                   "right" : {
                     "type" : "field",
-                    "value" : ["spgw", "do_spgw"]
+                    "value" : ["userMetadata.spgw", "do_spgw"]
                   }
                 }
               },
@@ -5684,7 +6407,7 @@
                   "op" : "==",
                   "left" : {
                     "type" : "field",
-                    "value" : ["spgw", "direction"]
+                    "value" : ["userMetadata.spgw", "direction"]
                   },
                   "right" : {
                     "type" : "hexstr",
@@ -5780,6 +6503,10 @@
       ["standard_metadata", "ingress_global_timestamp"]
     ],
     [
+      "intrinsic_metadata.egress_global_timestamp",
+      ["standard_metadata", "egress_global_timestamp"]
+    ],
+    [
       "intrinsic_metadata.lf_field_list",
       ["standard_metadata", "lf_field_list"]
     ],
@@ -5794,6 +6521,10 @@
     [
       "intrinsic_metadata.egress_rid",
       ["standard_metadata", "egress_rid"]
+    ],
+    [
+      "intrinsic_metadata.recirculate_flag",
+      ["standard_metadata", "recirculate_flag"]
     ]
   ]
 }
\ No newline at end of file