diff --git a/pipelines/fabric/src/main/resources/include/size.p4 b/pipelines/fabric/src/main/resources/include/size.p4
index 0555a61..8cd2fcc 100644
--- a/pipelines/fabric/src/main/resources/include/size.p4
+++ b/pipelines/fabric/src/main/resources/include/size.p4
@@ -8,6 +8,7 @@
 #define BRIDGING_TABLE_SIZE 1024
 #define MPLS_TABLE_SIZE 1024
 #define ROUTING_V4_TABLE_SIZE 1024
+#define ROUTING_V6_TABLE_SIZE 1024
 #define ACL_TABLE_SIZE 1024
 #define XCONNECT_NEXT_TABLE_SIZE 1024
 #define NEXT_VLAN_TABLE_SIZE 1024
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
index 99384fe..93932bf 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
@@ -1650,7 +1650,7 @@
       "binding" : "FabricIngress.filtering.fwd_classifier",
       "source_info" : {
         "filename" : "include/control/filtering.p4",
-        "line" : 79,
+        "line" : 80,
         "column" : 50,
         "source_fragment" : "fwd_classifier_counter"
       }
@@ -1674,7 +1674,7 @@
       "binding" : "FabricIngress.forwarding.mpls",
       "source_info" : {
         "filename" : "include/control/forwarding.p4",
-        "line" : 59,
+        "line" : 63,
         "column" : 50,
         "source_fragment" : "mpls_counter"
       }
@@ -1686,7 +1686,7 @@
       "binding" : "FabricIngress.forwarding.routing_v4",
       "source_info" : {
         "filename" : "include/control/forwarding.p4",
-        "line" : 82,
+        "line" : 87,
         "column" : 50,
         "source_fragment" : "routing_v4_counter"
       }
@@ -1698,7 +1698,7 @@
       "binding" : "FabricIngress.forwarding.routing_v6",
       "source_info" : {
         "filename" : "include/control/forwarding.p4",
-        "line" : 110,
+        "line" : 119,
         "column" : 50,
         "source_fragment" : "routing_v6_counter"
       }
@@ -1734,7 +1734,7 @@
       "binding" : "FabricIngress.next.xconnect",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 91,
+        "line" : 92,
         "column" : 50,
         "source_fragment" : "xconnect_counter"
       }
@@ -1746,7 +1746,7 @@
       "binding" : "FabricIngress.next.simple",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 123,
+        "line" : 125,
         "column" : 50,
         "source_fragment" : "simple_counter"
       }
@@ -1758,7 +1758,7 @@
       "binding" : "FabricIngress.next.hashed",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 162,
+        "line" : 166,
         "column" : 50,
         "source_fragment" : "hashed_counter"
       }
@@ -1770,7 +1770,7 @@
       "binding" : "FabricIngress.next.multicast",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 205,
+        "line" : 210,
         "column" : 50,
         "source_fragment" : "multicast_counter"
       }
@@ -1818,7 +1818,7 @@
       "binding" : "FabricEgress.egress_next.egress_vlan",
       "source_info" : {
         "filename" : "include/control/next.p4",
-        "line" : 277,
+        "line" : 283,
         "column" : 50,
         "source_fragment" : "egress_vlan_counter"
       }
@@ -2417,7 +2417,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 82,
+            "line" : 83,
             "column" : 33,
             "source_fragment" : "= fwd_type; ..."
           }
@@ -2479,7 +2479,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 62,
+            "line" : 66,
             "column" : 35,
             "source_fragment" : "= 0; ..."
           }
@@ -2833,7 +2833,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 99,
+            "line" : 100,
             "column" : 32,
             "source_fragment" : "= next_id; ..."
           }
@@ -3280,7 +3280,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 208,
+            "line" : 213,
             "column" : 8,
             "source_fragment" : "standard_metadata.mcast_grp = group_id"
           }
@@ -3309,7 +3309,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 209,
+            "line" : 214,
             "column" : 37,
             "source_fragment" : "= true; ..."
           }
@@ -3367,7 +3367,7 @@
           ],
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 57,
+            "line" : 58,
             "column" : 50,
             "source_fragment" : "hdr.gtpu_ipv4"
           }
@@ -3382,7 +3382,7 @@
           ],
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 57,
+            "line" : 58,
             "column" : 65,
             "source_fragment" : "hdr.gtpu_udp"
           }
@@ -3613,7 +3613,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 103,
+            "line" : 105,
             "column" : 37,
             "source_fragment" : "= hdr.vlan_tag.eth_type; ..."
           }
@@ -3632,7 +3632,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 104,
+            "line" : 106,
             "column" : 36,
             "source_fragment" : "= hdr.vlan_tag.vlan_id; ..."
           }
@@ -3651,7 +3651,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 105,
+            "line" : 107,
             "column" : 37,
             "source_fragment" : "= hdr.vlan_tag.pri; ..."
           }
@@ -3670,7 +3670,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 106,
+            "line" : 108,
             "column" : 37,
             "source_fragment" : "= hdr.vlan_tag.cfi; ..."
           }
@@ -3696,7 +3696,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 113,
+            "line" : 115,
             "column" : 37,
             "source_fragment" : "= DEFAULT_MPLS_TTL + 1; ..."
           }
@@ -12236,7 +12236,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 246,
+            "line" : 252,
             "column" : 8,
             "source_fragment" : "hdr.mpls.setInvalid()"
           }
@@ -12255,7 +12255,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 248,
+            "line" : 254,
             "column" : 33,
             "source_fragment" : "= fabric_metadata.ip_eth_type; ..."
           }
@@ -12277,7 +12277,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 253,
+            "line" : 259,
             "column" : 8,
             "source_fragment" : "hdr.mpls.setValid()"
           }
@@ -12296,7 +12296,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 254,
+            "line" : 260,
             "column" : 8,
             "source_fragment" : "hdr.mpls.label = fabric_metadata.mpls_label; ..."
           }
@@ -12315,7 +12315,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 255,
+            "line" : 261,
             "column" : 8,
             "source_fragment" : "hdr.mpls.tc = 3w0"
           }
@@ -12334,7 +12334,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 256,
+            "line" : 262,
             "column" : 8,
             "source_fragment" : "hdr.mpls.bos = 1w1"
           }
@@ -12353,7 +12353,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 257,
+            "line" : 263,
             "column" : 8,
             "source_fragment" : "hdr.mpls.ttl = fabric_metadata.mpls_ttl; // Decrement after push. ..."
           }
@@ -12394,7 +12394,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 265,
+            "line" : 271,
             "column" : 8,
             "source_fragment" : "hdr.vlan_tag.setValid()"
           }
@@ -12413,7 +12413,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 266,
+            "line" : 272,
             "column" : 8,
             "source_fragment" : "hdr.vlan_tag.cfi = fabric_metadata.vlan_cfi; ..."
           }
@@ -12432,7 +12432,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 267,
+            "line" : 273,
             "column" : 8,
             "source_fragment" : "hdr.vlan_tag.pri = fabric_metadata.vlan_pri; ..."
           }
@@ -12451,7 +12451,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 268,
+            "line" : 274,
             "column" : 8,
             "source_fragment" : "hdr.vlan_tag.eth_type = fabric_metadata.eth_type; ..."
           }
@@ -12470,7 +12470,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 269,
+            "line" : 275,
             "column" : 8,
             "source_fragment" : "hdr.vlan_tag.vlan_id = fabric_metadata.vlan_id; ..."
           }
@@ -12515,7 +12515,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 280,
+            "line" : 286,
             "column" : 8,
             "source_fragment" : "hdr.ethernet.eth_type = fabric_metadata.eth_type; ..."
           }
@@ -12530,7 +12530,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 281,
+            "line" : 287,
             "column" : 8,
             "source_fragment" : "hdr.vlan_tag.setInvalid()"
           }
@@ -12605,7 +12605,7 @@
           "parameters" : [],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 301,
+            "line" : 308,
             "column" : 12,
             "source_fragment" : "mark_to_drop()"
           }
@@ -12682,7 +12682,7 @@
           "parameters" : [],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 320,
+            "line" : 327,
             "column" : 35,
             "source_fragment" : "mark_to_drop()"
           }
@@ -12731,7 +12731,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 319,
+            "line" : 326,
             "column" : 12,
             "source_fragment" : "hdr.mpls.ttl = hdr.mpls.ttl - 1"
           }
@@ -12748,7 +12748,7 @@
           "parameters" : [],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 324,
+            "line" : 331,
             "column" : 39,
             "source_fragment" : "mark_to_drop()"
           }
@@ -12797,7 +12797,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 323,
+            "line" : 330,
             "column" : 16,
             "source_fragment" : "hdr.ipv4.ttl = hdr.ipv4.ttl - 1"
           }
@@ -12814,7 +12814,7 @@
           "parameters" : [],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 329,
+            "line" : 336,
             "column" : 45,
             "source_fragment" : "mark_to_drop()"
           }
@@ -12863,7 +12863,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 328,
+            "line" : 335,
             "column" : 16,
             "source_fragment" : "hdr.ipv6.hop_limit = hdr.ipv6.hop_limit - 1"
           }
@@ -13139,7 +13139,7 @@
       "id" : 0,
       "source_info" : {
         "filename" : "fabric.p4",
-        "line" : 41,
+        "line" : 42,
         "column" : 8,
         "source_fragment" : "FabricIngress"
       },
@@ -13148,6 +13148,12 @@
         {
           "name" : "tbl_act",
           "id" : 0,
+          "source_info" : {
+            "filename" : "fabric.p4",
+            "line" : 58,
+            "column" : 50,
+            "source_fragment" : "hdr.gtpu_ipv4, hdr.gtpu_udp"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -13171,6 +13177,12 @@
         {
           "name" : "tbl_act_0",
           "id" : 1,
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 30,
+            "column" : 32,
+            "source_fragment" : "return"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -13194,6 +13206,12 @@
         {
           "name" : "tbl_act_1",
           "id" : 2,
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 31,
+            "column" : 18,
+            "source_fragment" : "= ipv4; ..."
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -13217,6 +13235,12 @@
         {
           "name" : "tbl_act_2",
           "id" : 3,
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 35,
+            "column" : 16,
+            "source_fragment" : "="
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -13240,6 +13264,12 @@
         {
           "name" : "tbl_act_3",
           "id" : 4,
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 37,
+            "column" : 12,
+            "source_fragment" : "udp.setInvalid()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -13263,6 +13293,12 @@
         {
           "name" : "tbl_act_4",
           "id" : 5,
+          "source_info" : {
+            "filename" : "include/control/packetio.p4",
+            "line" : 25,
+            "column" : 42,
+            "source_fragment" : "= hdr.packet_out.egress_port; ..."
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -13286,6 +13322,12 @@
         {
           "name" : "tbl_act_5",
           "id" : 6,
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 105,
+            "column" : 37,
+            "source_fragment" : "= hdr.vlan_tag.eth_type; ..."
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -13309,6 +13351,12 @@
         {
           "name" : "tbl_act_6",
           "id" : 7,
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 115,
+            "column" : 37,
+            "source_fragment" : "="
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -13384,7 +13432,7 @@
           "id" : 9,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 86,
+            "line" : 87,
             "column" : 10,
             "source_fragment" : "fwd_classifier"
           },
@@ -13536,6 +13584,12 @@
         {
           "name" : "tbl_act_10",
           "id" : 14,
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 148,
+            "column" : 16,
+            "source_fragment" : "mark_to_drop()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -13559,6 +13613,12 @@
         {
           "name" : "tbl_act_11",
           "id" : 15,
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 150,
+            "column" : 39,
+            "source_fragment" : "="
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -13582,6 +13642,12 @@
         {
           "name" : "tbl_spgw_ingress_gtpu_decap",
           "id" : 16,
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 151,
+            "column" : 12,
+            "source_fragment" : "gtpu_decap()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -13688,6 +13754,12 @@
         {
           "name" : "tbl_act_14",
           "id" : 20,
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 153,
+            "column" : 39,
+            "source_fragment" : "="
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -13711,6 +13783,12 @@
         {
           "name" : "tbl_act_15",
           "id" : 21,
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 155,
+            "column" : 39,
+            "source_fragment" : "= SPGW_DIR_UNKNOWN; ..."
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -13734,6 +13812,12 @@
         {
           "name" : "tbl_act_16",
           "id" : 22,
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 174,
+            "column" : 34,
+            "source_fragment" : "="
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -13759,7 +13843,7 @@
           "id" : 23,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 43,
+            "line" : 46,
             "column" : 10,
             "source_fragment" : "bridging"
           },
@@ -13802,7 +13886,7 @@
           "id" : 24,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 67,
+            "line" : 71,
             "column" : 10,
             "source_fragment" : "mpls"
           },
@@ -13839,7 +13923,7 @@
           "id" : 25,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 93,
+            "line" : 101,
             "column" : 10,
             "source_fragment" : "routing_v4"
           },
@@ -13877,7 +13961,7 @@
           "id" : 26,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 117,
+            "line" : 126,
             "column" : 10,
             "source_fragment" : "routing_v6"
           },
@@ -13994,7 +14078,7 @@
           ],
           "match_type" : "ternary",
           "type" : "simple",
-          "max_size" : 128,
+          "max_size" : 1024,
           "with_counters" : true,
           "support_timeout" : false,
           "direct_meters" : null,
@@ -14020,7 +14104,7 @@
           "id" : 28,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 103,
+            "line" : 104,
             "column" : 10,
             "source_fragment" : "xconnect"
           },
@@ -14064,7 +14148,7 @@
           "id" : 29,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 141,
+            "line" : 143,
             "column" : 10,
             "source_fragment" : "simple"
           },
@@ -14103,7 +14187,7 @@
           "id" : 30,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 180,
+            "line" : 184,
             "column" : 10,
             "source_fragment" : "hashed"
           },
@@ -14137,7 +14221,7 @@
           "id" : 31,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 213,
+            "line" : 218,
             "column" : 10,
             "source_fragment" : "multicast"
           },
@@ -14209,6 +14293,12 @@
         {
           "name" : "tbl_act_17",
           "id" : 33,
+          "source_info" : {
+            "filename" : "include/control/port_counter.p4",
+            "line" : 31,
+            "column" : 12,
+            "source_fragment" : "egress_port_counter.count((bit<32>)standard_metadata.egress_spec)"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -14232,6 +14322,12 @@
         {
           "name" : "tbl_act_18",
           "id" : 34,
+          "source_info" : {
+            "filename" : "include/control/port_counter.p4",
+            "line" : 34,
+            "column" : 12,
+            "source_fragment" : "ingress_port_counter.count((bit<32>)standard_metadata.ingress_port)"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -14329,6 +14425,12 @@
         {
           "name" : "tbl_act_19",
           "id" : 37,
+          "source_info" : {
+            "filename" : "include/int/int_main.p4",
+            "line" : 89,
+            "column" : 12,
+            "source_fragment" : "clone(CloneType.I2E, REPORT_MIRROR_SESSION_ID)"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -14356,11 +14458,11 @@
           "id" : 0,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 161,
-            "column" : 55,
+            "line" : 165,
+            "column" : 57,
             "source_fragment" : "hashed_selector"
           },
-          "max_size" : 64,
+          "max_size" : 1024,
           "selector" : {
             "algo" : "crc16",
             "input" : [
@@ -14494,7 +14596,7 @@
           "id" : 4,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 102,
+            "line" : 104,
             "column" : 12,
             "source_fragment" : "hdr.vlan_tag.isValid()"
           },
@@ -14517,7 +14619,7 @@
           "id" : 5,
           "source_info" : {
             "filename" : "include/control/filtering.p4",
-            "line" : 108,
+            "line" : 110,
             "column" : 12,
             "source_fragment" : "!hdr.mpls.isValid()"
           },
@@ -14641,7 +14743,7 @@
           "id" : 10,
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 66,
+            "line" : 67,
             "column" : 12,
             "source_fragment" : "fabric_metadata.skip_forwarding == false"
           },
@@ -14674,7 +14776,7 @@
           "id" : 11,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 131,
+            "line" : 141,
             "column" : 12,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_BRIDGING"
           },
@@ -14700,7 +14802,7 @@
           "id" : 12,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 132,
+            "line" : 142,
             "column" : 17,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_MPLS"
           },
@@ -14726,7 +14828,7 @@
           "id" : 13,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 133,
+            "line" : 143,
             "column" : 17,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_IPV4_UNICAST"
           },
@@ -14752,7 +14854,7 @@
           "id" : 14,
           "source_info" : {
             "filename" : "include/control/forwarding.p4",
-            "line" : 135,
+            "line" : 145,
             "column" : 17,
             "source_fragment" : "fabric_metadata.fwd_type == FWD_IPV6_UNICAST"
           },
@@ -14778,7 +14880,7 @@
           "id" : 15,
           "source_info" : {
             "filename" : "fabric.p4",
-            "line" : 70,
+            "line" : 71,
             "column" : 12,
             "source_fragment" : "fabric_metadata.skip_next == false"
           },
@@ -14898,7 +15000,7 @@
       "id" : 1,
       "source_info" : {
         "filename" : "fabric.p4",
-        "line" : 84,
+        "line" : 85,
         "column" : 8,
         "source_fragment" : "FabricEgress"
       },
@@ -14907,6 +15009,12 @@
         {
           "name" : "tbl_act_20",
           "id" : 38,
+          "source_info" : {
+            "filename" : "include/control/packetio.p4",
+            "line" : 47,
+            "column" : 16,
+            "source_fragment" : "mark_to_drop()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -14930,6 +15038,12 @@
         {
           "name" : "tbl_act_21",
           "id" : 39,
+          "source_info" : {
+            "filename" : "include/control/packetio.p4",
+            "line" : 49,
+            "column" : 12,
+            "source_fragment" : "hdr.packet_in.setValid(); ..."
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -14953,6 +15067,12 @@
         {
           "name" : "tbl_act_22",
           "id" : 40,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 308,
+            "column" : 12,
+            "source_fragment" : "mark_to_drop()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -14976,6 +15096,12 @@
         {
           "name" : "tbl_egress_next_pop_mpls_if_present",
           "id" : 41,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 312,
+            "column" : 36,
+            "source_fragment" : "pop_mpls_if_present()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -14999,6 +15125,12 @@
         {
           "name" : "tbl_egress_next_set_mpls",
           "id" : 42,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 314,
+            "column" : 12,
+            "source_fragment" : "set_mpls()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -15024,7 +15156,7 @@
           "id" : 43,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 285,
+            "line" : 291,
             "column" : 10,
             "source_fragment" : "egress_vlan"
           },
@@ -15111,6 +15243,12 @@
         {
           "name" : "tbl_egress_next_push_vlan",
           "id" : 46,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 320,
+            "column" : 16,
+            "source_fragment" : "push_vlan()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -15134,6 +15272,12 @@
         {
           "name" : "tbl_act_25",
           "id" : 47,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 326,
+            "column" : 25,
+            "source_fragment" : "="
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -15157,6 +15301,12 @@
         {
           "name" : "tbl_act_26",
           "id" : 48,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 327,
+            "column" : 35,
+            "source_fragment" : "mark_to_drop()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -15180,6 +15330,12 @@
         {
           "name" : "tbl_act_27",
           "id" : 49,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 330,
+            "column" : 29,
+            "source_fragment" : "="
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -15203,6 +15359,12 @@
         {
           "name" : "tbl_act_28",
           "id" : 50,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 331,
+            "column" : 39,
+            "source_fragment" : "mark_to_drop()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -15226,6 +15388,12 @@
         {
           "name" : "tbl_act_29",
           "id" : 51,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 335,
+            "column" : 35,
+            "source_fragment" : "="
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -15249,6 +15417,12 @@
         {
           "name" : "tbl_act_30",
           "id" : 52,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 336,
+            "column" : 45,
+            "source_fragment" : "mark_to_drop()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -15272,6 +15446,12 @@
         {
           "name" : "tbl_spgw_egress_gtpu_encap",
           "id" : 53,
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 227,
+            "column" : 12,
+            "source_fragment" : "gtpu_encap()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -15410,6 +15590,12 @@
         {
           "name" : "tbl_act_32",
           "id" : 57,
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 420,
+            "column" : 12,
+            "source_fragment" : "return"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -16149,6 +16335,12 @@
         {
           "name" : "tbl_act_33",
           "id" : 60,
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 425,
+            "column" : 37,
+            "source_fragment" : "="
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -16172,6 +16364,12 @@
         {
           "name" : "tbl_act_34",
           "id" : 61,
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 428,
+            "column" : 31,
+            "source_fragment" : "="
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -16195,6 +16393,12 @@
         {
           "name" : "tbl_act_35",
           "id" : 62,
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 431,
+            "column" : 24,
+            "source_fragment" : "="
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -16218,6 +16422,12 @@
         {
           "name" : "tbl_act_36",
           "id" : 63,
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 434,
+            "column" : 37,
+            "source_fragment" : "="
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -16271,6 +16481,12 @@
         {
           "name" : "tbl_process_int_main_process_int_sink_restore_header",
           "id" : 65,
+          "source_info" : {
+            "filename" : "include/int/int_sink.p4",
+            "line" : 53,
+            "column" : 8,
+            "source_fragment" : "restore_header()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -16294,6 +16510,12 @@
         {
           "name" : "tbl_process_int_main_process_int_sink_int_sink",
           "id" : 66,
+          "source_info" : {
+            "filename" : "include/int/int_sink.p4",
+            "line" : 54,
+            "column" : 8,
+            "source_fragment" : "int_sink()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -16441,7 +16663,7 @@
           "id" : 22,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 299,
+            "line" : 306,
             "column" : 12,
             "source_fragment" : "fabric_metadata.is_multicast == true ..."
           },
@@ -16494,7 +16716,7 @@
           "id" : 23,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 304,
+            "line" : 311,
             "column" : 12,
             "source_fragment" : "fabric_metadata.mpls_label == 0"
           },
@@ -16520,7 +16742,7 @@
           "id" : 24,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 305,
+            "line" : 312,
             "column" : 16,
             "source_fragment" : "hdr.mpls.isValid()"
           },
@@ -16543,7 +16765,7 @@
           "id" : 25,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 310,
+            "line" : 317,
             "column" : 12,
             "source_fragment" : "!egress_vlan.apply().hit"
           },
@@ -16573,7 +16795,7 @@
           "id" : 26,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 312,
+            "line" : 319,
             "column" : 16,
             "source_fragment" : "fabric_metadata.vlan_id != DEFAULT_VLAN_ID"
           },
@@ -16599,7 +16821,7 @@
           "id" : 27,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 318,
+            "line" : 325,
             "column" : 12,
             "source_fragment" : "hdr.mpls.isValid()"
           },
@@ -16622,7 +16844,7 @@
           "id" : 28,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 320,
+            "line" : 327,
             "column" : 16,
             "source_fragment" : "hdr.mpls.ttl == 0"
           },
@@ -16648,7 +16870,7 @@
           "id" : 29,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 322,
+            "line" : 329,
             "column" : 15,
             "source_fragment" : "hdr.ipv4.isValid()"
           },
@@ -16671,7 +16893,7 @@
           "id" : 30,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 324,
+            "line" : 331,
             "column" : 20,
             "source_fragment" : "hdr.ipv4.ttl == 0"
           },
@@ -16697,7 +16919,7 @@
           "id" : 31,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 327,
+            "line" : 334,
             "column" : 21,
             "source_fragment" : "hdr.ipv6.isValid()"
           },
@@ -16720,7 +16942,7 @@
           "id" : 32,
           "source_info" : {
             "filename" : "include/control/next.p4",
-            "line" : 329,
+            "line" : 336,
             "column" : 20,
             "source_fragment" : "hdr.ipv6.hop_limit == 0"
           },
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt b/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt
index 7b0b869..1f9c03c 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt
@@ -359,7 +359,7 @@
   }
   const_default_action_id: 16827694
   direct_resource_ids: 318801025
-  size: 128
+  size: 1024
 }
 tables {
   preamble {
@@ -1053,7 +1053,8 @@
   }
   table_ids: 33608588
   with_selector: true
-  size: 64
+  size: 1024
+  max_group_size: 16
 }
 counters {
   preamble {
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
index 2730427..29ea24b 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/bmv2.json
@@ -9851,6 +9851,12 @@
         {
           "name" : "tbl_act",
           "id" : 0,
+          "source_info" : {
+            "filename" : "include/control/packetio.p4",
+            "line" : 25,
+            "column" : 42,
+            "source_fragment" : "= hdr.packet_out.egress_port; ..."
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -9874,6 +9880,12 @@
         {
           "name" : "tbl_act_0",
           "id" : 1,
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 105,
+            "column" : 37,
+            "source_fragment" : "= hdr.vlan_tag.eth_type; ..."
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -9897,6 +9909,12 @@
         {
           "name" : "tbl_act_1",
           "id" : 2,
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 115,
+            "column" : 37,
+            "source_fragment" : "="
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -10394,6 +10412,12 @@
         {
           "name" : "tbl_act_2",
           "id" : 13,
+          "source_info" : {
+            "filename" : "include/control/port_counter.p4",
+            "line" : 31,
+            "column" : 12,
+            "source_fragment" : "egress_port_counter.count((bit<32>)standard_metadata.egress_spec)"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -10417,6 +10441,12 @@
         {
           "name" : "tbl_act_3",
           "id" : 14,
+          "source_info" : {
+            "filename" : "include/control/port_counter.p4",
+            "line" : 34,
+            "column" : 12,
+            "source_fragment" : "ingress_port_counter.count((bit<32>)standard_metadata.ingress_port)"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -10802,6 +10832,12 @@
         {
           "name" : "tbl_act_4",
           "id" : 16,
+          "source_info" : {
+            "filename" : "include/control/packetio.p4",
+            "line" : 47,
+            "column" : 16,
+            "source_fragment" : "mark_to_drop()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -10825,6 +10861,12 @@
         {
           "name" : "tbl_act_5",
           "id" : 17,
+          "source_info" : {
+            "filename" : "include/control/packetio.p4",
+            "line" : 49,
+            "column" : 12,
+            "source_fragment" : "hdr.packet_in.setValid(); ..."
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -10848,6 +10890,12 @@
         {
           "name" : "tbl_act_6",
           "id" : 18,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 308,
+            "column" : 12,
+            "source_fragment" : "mark_to_drop()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -10871,6 +10919,12 @@
         {
           "name" : "tbl_egress_next_pop_mpls_if_present",
           "id" : 19,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 312,
+            "column" : 36,
+            "source_fragment" : "pop_mpls_if_present()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -10894,6 +10948,12 @@
         {
           "name" : "tbl_egress_next_set_mpls",
           "id" : 20,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 314,
+            "column" : 12,
+            "source_fragment" : "set_mpls()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -11006,6 +11066,12 @@
         {
           "name" : "tbl_egress_next_push_vlan",
           "id" : 24,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 320,
+            "column" : 16,
+            "source_fragment" : "push_vlan()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -11029,6 +11095,12 @@
         {
           "name" : "tbl_act_9",
           "id" : 25,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 326,
+            "column" : 25,
+            "source_fragment" : "="
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -11052,6 +11124,12 @@
         {
           "name" : "tbl_act_10",
           "id" : 26,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 327,
+            "column" : 35,
+            "source_fragment" : "mark_to_drop()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -11075,6 +11153,12 @@
         {
           "name" : "tbl_act_11",
           "id" : 27,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 330,
+            "column" : 29,
+            "source_fragment" : "="
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -11098,6 +11182,12 @@
         {
           "name" : "tbl_act_12",
           "id" : 28,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 331,
+            "column" : 39,
+            "source_fragment" : "mark_to_drop()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -11236,6 +11326,12 @@
         {
           "name" : "tbl_act_14",
           "id" : 32,
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 420,
+            "column" : 12,
+            "source_fragment" : "return"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -11975,6 +12071,12 @@
         {
           "name" : "tbl_act_15",
           "id" : 35,
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 425,
+            "column" : 37,
+            "source_fragment" : "="
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -11998,6 +12100,12 @@
         {
           "name" : "tbl_act_16",
           "id" : 36,
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 428,
+            "column" : 31,
+            "source_fragment" : "="
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -12021,6 +12129,12 @@
         {
           "name" : "tbl_act_17",
           "id" : 37,
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 431,
+            "column" : 24,
+            "source_fragment" : "="
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -12044,6 +12158,12 @@
         {
           "name" : "tbl_act_18",
           "id" : 38,
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 434,
+            "column" : 37,
+            "source_fragment" : "="
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/p4info.txt b/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/p4info.txt
index beb1309..02d6c94 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/p4info.txt
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-int/bmv2/default/p4info.txt
@@ -780,11 +780,11 @@
     id: 285217164
     name: "FabricIngress.next.hashed_selector"
     alias: "hashed_selector"
-    annotations: "@max_group_size(16)"
   }
   table_ids: 33608588
   with_selector: true
   size: 1024
+  max_group_size: 16
 }
 counters {
   preamble {
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
index 659a31b..c823b48 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/bmv2.json
@@ -11419,6 +11419,12 @@
         {
           "name" : "tbl_act",
           "id" : 0,
+          "source_info" : {
+            "filename" : "fabric.p4",
+            "line" : 58,
+            "column" : 50,
+            "source_fragment" : "hdr.gtpu_ipv4, hdr.gtpu_udp"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -11442,6 +11448,12 @@
         {
           "name" : "tbl_act_0",
           "id" : 1,
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 30,
+            "column" : 32,
+            "source_fragment" : "return"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -11465,6 +11477,12 @@
         {
           "name" : "tbl_act_1",
           "id" : 2,
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 31,
+            "column" : 18,
+            "source_fragment" : "= ipv4; ..."
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -11488,6 +11506,12 @@
         {
           "name" : "tbl_act_2",
           "id" : 3,
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 35,
+            "column" : 16,
+            "source_fragment" : "="
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -11511,6 +11535,12 @@
         {
           "name" : "tbl_act_3",
           "id" : 4,
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 37,
+            "column" : 12,
+            "source_fragment" : "udp.setInvalid()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -11534,6 +11564,12 @@
         {
           "name" : "tbl_act_4",
           "id" : 5,
+          "source_info" : {
+            "filename" : "include/control/packetio.p4",
+            "line" : 25,
+            "column" : 42,
+            "source_fragment" : "= hdr.packet_out.egress_port; ..."
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -11557,6 +11593,12 @@
         {
           "name" : "tbl_act_5",
           "id" : 6,
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 105,
+            "column" : 37,
+            "source_fragment" : "= hdr.vlan_tag.eth_type; ..."
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -11580,6 +11622,12 @@
         {
           "name" : "tbl_act_6",
           "id" : 7,
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 115,
+            "column" : 37,
+            "source_fragment" : "="
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -11807,6 +11855,12 @@
         {
           "name" : "tbl_act_10",
           "id" : 14,
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 148,
+            "column" : 16,
+            "source_fragment" : "mark_to_drop()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -11830,6 +11884,12 @@
         {
           "name" : "tbl_act_11",
           "id" : 15,
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 150,
+            "column" : 39,
+            "source_fragment" : "="
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -11853,6 +11913,12 @@
         {
           "name" : "tbl_spgw_ingress_gtpu_decap",
           "id" : 16,
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 151,
+            "column" : 12,
+            "source_fragment" : "gtpu_decap()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -11959,6 +12025,12 @@
         {
           "name" : "tbl_act_14",
           "id" : 20,
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 153,
+            "column" : 39,
+            "source_fragment" : "="
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -11982,6 +12054,12 @@
         {
           "name" : "tbl_act_15",
           "id" : 21,
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 155,
+            "column" : 39,
+            "source_fragment" : "= SPGW_DIR_UNKNOWN; ..."
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -12005,6 +12083,12 @@
         {
           "name" : "tbl_act_16",
           "id" : 22,
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 174,
+            "column" : 34,
+            "source_fragment" : "="
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -12404,6 +12488,12 @@
         {
           "name" : "tbl_act_17",
           "id" : 31,
+          "source_info" : {
+            "filename" : "include/control/port_counter.p4",
+            "line" : 31,
+            "column" : 12,
+            "source_fragment" : "egress_port_counter.count((bit<32>)standard_metadata.egress_spec)"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -12427,6 +12517,12 @@
         {
           "name" : "tbl_act_18",
           "id" : 32,
+          "source_info" : {
+            "filename" : "include/control/port_counter.p4",
+            "line" : 34,
+            "column" : 12,
+            "source_fragment" : "ingress_port_counter.count((bit<32>)standard_metadata.ingress_port)"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -12983,6 +13079,12 @@
         {
           "name" : "tbl_act_19",
           "id" : 34,
+          "source_info" : {
+            "filename" : "include/control/packetio.p4",
+            "line" : 47,
+            "column" : 16,
+            "source_fragment" : "mark_to_drop()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -13006,6 +13108,12 @@
         {
           "name" : "tbl_act_20",
           "id" : 35,
+          "source_info" : {
+            "filename" : "include/control/packetio.p4",
+            "line" : 49,
+            "column" : 12,
+            "source_fragment" : "hdr.packet_in.setValid(); ..."
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -13029,6 +13137,12 @@
         {
           "name" : "tbl_act_21",
           "id" : 36,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 308,
+            "column" : 12,
+            "source_fragment" : "mark_to_drop()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -13052,6 +13166,12 @@
         {
           "name" : "tbl_egress_next_pop_mpls_if_present",
           "id" : 37,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 312,
+            "column" : 36,
+            "source_fragment" : "pop_mpls_if_present()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -13075,6 +13195,12 @@
         {
           "name" : "tbl_egress_next_set_mpls",
           "id" : 38,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 314,
+            "column" : 12,
+            "source_fragment" : "set_mpls()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -13187,6 +13313,12 @@
         {
           "name" : "tbl_egress_next_push_vlan",
           "id" : 42,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 320,
+            "column" : 16,
+            "source_fragment" : "push_vlan()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -13210,6 +13342,12 @@
         {
           "name" : "tbl_act_24",
           "id" : 43,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 326,
+            "column" : 25,
+            "source_fragment" : "="
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -13233,6 +13371,12 @@
         {
           "name" : "tbl_act_25",
           "id" : 44,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 327,
+            "column" : 35,
+            "source_fragment" : "mark_to_drop()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -13256,6 +13400,12 @@
         {
           "name" : "tbl_act_26",
           "id" : 45,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 330,
+            "column" : 29,
+            "source_fragment" : "="
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -13279,6 +13429,12 @@
         {
           "name" : "tbl_act_27",
           "id" : 46,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 331,
+            "column" : 39,
+            "source_fragment" : "mark_to_drop()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -13302,6 +13458,12 @@
         {
           "name" : "tbl_spgw_egress_gtpu_encap",
           "id" : 47,
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 227,
+            "column" : 12,
+            "source_fragment" : "gtpu_encap()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -13440,6 +13602,12 @@
         {
           "name" : "tbl_act_29",
           "id" : 51,
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 420,
+            "column" : 12,
+            "source_fragment" : "return"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -14179,6 +14347,12 @@
         {
           "name" : "tbl_act_30",
           "id" : 54,
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 425,
+            "column" : 37,
+            "source_fragment" : "="
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -14202,6 +14376,12 @@
         {
           "name" : "tbl_act_31",
           "id" : 55,
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 428,
+            "column" : 31,
+            "source_fragment" : "="
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -14225,6 +14405,12 @@
         {
           "name" : "tbl_act_32",
           "id" : 56,
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 431,
+            "column" : 24,
+            "source_fragment" : "="
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -14248,6 +14434,12 @@
         {
           "name" : "tbl_act_33",
           "id" : 57,
+          "source_info" : {
+            "filename" : "include/int/int_transit.p4",
+            "line" : 434,
+            "column" : 37,
+            "source_fragment" : "="
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/p4info.txt b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/p4info.txt
index a42d2e9..ee97871 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/p4info.txt
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw-int/bmv2/default/p4info.txt
@@ -844,11 +844,11 @@
     id: 285217164
     name: "FabricIngress.next.hashed_selector"
     alias: "hashed_selector"
-    annotations: "@max_group_size(16)"
   }
   table_ids: 33608588
   with_selector: true
   size: 1024
+  max_group_size: 16
 }
 counters {
   preamble {
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json
index c068c36..441b476 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/bmv2.json
@@ -4328,6 +4328,12 @@
         {
           "name" : "tbl_act",
           "id" : 0,
+          "source_info" : {
+            "filename" : "fabric.p4",
+            "line" : 58,
+            "column" : 50,
+            "source_fragment" : "hdr.gtpu_ipv4, hdr.gtpu_udp"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -4351,6 +4357,12 @@
         {
           "name" : "tbl_act_0",
           "id" : 1,
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 30,
+            "column" : 32,
+            "source_fragment" : "return"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -4374,6 +4386,12 @@
         {
           "name" : "tbl_act_1",
           "id" : 2,
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 31,
+            "column" : 18,
+            "source_fragment" : "= ipv4; ..."
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -4397,6 +4415,12 @@
         {
           "name" : "tbl_act_2",
           "id" : 3,
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 35,
+            "column" : 16,
+            "source_fragment" : "="
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -4420,6 +4444,12 @@
         {
           "name" : "tbl_act_3",
           "id" : 4,
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 37,
+            "column" : 12,
+            "source_fragment" : "udp.setInvalid()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -4443,6 +4473,12 @@
         {
           "name" : "tbl_act_4",
           "id" : 5,
+          "source_info" : {
+            "filename" : "include/control/packetio.p4",
+            "line" : 25,
+            "column" : 42,
+            "source_fragment" : "= hdr.packet_out.egress_port; ..."
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -4466,6 +4502,12 @@
         {
           "name" : "tbl_act_5",
           "id" : 6,
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 105,
+            "column" : 37,
+            "source_fragment" : "= hdr.vlan_tag.eth_type; ..."
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -4489,6 +4531,12 @@
         {
           "name" : "tbl_act_6",
           "id" : 7,
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 115,
+            "column" : 37,
+            "source_fragment" : "="
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -4716,6 +4764,12 @@
         {
           "name" : "tbl_act_10",
           "id" : 14,
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 148,
+            "column" : 16,
+            "source_fragment" : "mark_to_drop()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -4739,6 +4793,12 @@
         {
           "name" : "tbl_act_11",
           "id" : 15,
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 150,
+            "column" : 39,
+            "source_fragment" : "="
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -4762,6 +4822,12 @@
         {
           "name" : "tbl_spgw_ingress_gtpu_decap",
           "id" : 16,
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 151,
+            "column" : 12,
+            "source_fragment" : "gtpu_decap()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -4868,6 +4934,12 @@
         {
           "name" : "tbl_act_14",
           "id" : 20,
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 153,
+            "column" : 39,
+            "source_fragment" : "="
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -4891,6 +4963,12 @@
         {
           "name" : "tbl_act_15",
           "id" : 21,
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 155,
+            "column" : 39,
+            "source_fragment" : "= SPGW_DIR_UNKNOWN; ..."
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -4914,6 +4992,12 @@
         {
           "name" : "tbl_act_16",
           "id" : 22,
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 174,
+            "column" : 34,
+            "source_fragment" : "="
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -5313,6 +5397,12 @@
         {
           "name" : "tbl_act_17",
           "id" : 31,
+          "source_info" : {
+            "filename" : "include/control/port_counter.p4",
+            "line" : 31,
+            "column" : 12,
+            "source_fragment" : "egress_port_counter.count((bit<32>)standard_metadata.egress_spec)"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -5336,6 +5426,12 @@
         {
           "name" : "tbl_act_18",
           "id" : 32,
+          "source_info" : {
+            "filename" : "include/control/port_counter.p4",
+            "line" : 34,
+            "column" : 12,
+            "source_fragment" : "ingress_port_counter.count((bit<32>)standard_metadata.ingress_port)"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -5855,6 +5951,12 @@
         {
           "name" : "tbl_act_19",
           "id" : 33,
+          "source_info" : {
+            "filename" : "include/control/packetio.p4",
+            "line" : 47,
+            "column" : 16,
+            "source_fragment" : "mark_to_drop()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -5878,6 +5980,12 @@
         {
           "name" : "tbl_act_20",
           "id" : 34,
+          "source_info" : {
+            "filename" : "include/control/packetio.p4",
+            "line" : 49,
+            "column" : 12,
+            "source_fragment" : "hdr.packet_in.setValid(); ..."
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -5901,6 +6009,12 @@
         {
           "name" : "tbl_act_21",
           "id" : 35,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 308,
+            "column" : 12,
+            "source_fragment" : "mark_to_drop()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -5924,6 +6038,12 @@
         {
           "name" : "tbl_egress_next_pop_mpls_if_present",
           "id" : 36,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 312,
+            "column" : 36,
+            "source_fragment" : "pop_mpls_if_present()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -5947,6 +6067,12 @@
         {
           "name" : "tbl_egress_next_set_mpls",
           "id" : 37,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 314,
+            "column" : 12,
+            "source_fragment" : "set_mpls()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -6059,6 +6185,12 @@
         {
           "name" : "tbl_egress_next_push_vlan",
           "id" : 41,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 320,
+            "column" : 16,
+            "source_fragment" : "push_vlan()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -6082,6 +6214,12 @@
         {
           "name" : "tbl_act_24",
           "id" : 42,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 326,
+            "column" : 25,
+            "source_fragment" : "="
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -6105,6 +6243,12 @@
         {
           "name" : "tbl_act_25",
           "id" : 43,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 327,
+            "column" : 35,
+            "source_fragment" : "mark_to_drop()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -6128,6 +6272,12 @@
         {
           "name" : "tbl_act_26",
           "id" : 44,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 330,
+            "column" : 29,
+            "source_fragment" : "="
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -6151,6 +6301,12 @@
         {
           "name" : "tbl_act_27",
           "id" : 45,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 331,
+            "column" : 39,
+            "source_fragment" : "mark_to_drop()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -6174,6 +6330,12 @@
         {
           "name" : "tbl_spgw_egress_gtpu_encap",
           "id" : 46,
+          "source_info" : {
+            "filename" : "include/spgw.p4",
+            "line" : 227,
+            "column" : 12,
+            "source_fragment" : "gtpu_encap()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt
index 7556914..b58cf61 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric-spgw/bmv2/default/p4info.txt
@@ -702,11 +702,11 @@
     id: 285217164
     name: "FabricIngress.next.hashed_selector"
     alias: "hashed_selector"
-    annotations: "@max_group_size(16)"
   }
   table_ids: 33608588
   with_selector: true
   size: 1024
+  max_group_size: 16
 }
 counters {
   preamble {
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json b/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json
index 4c13eb5..edf6f41 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/bmv2.json
@@ -2773,6 +2773,12 @@
         {
           "name" : "tbl_act",
           "id" : 0,
+          "source_info" : {
+            "filename" : "include/control/packetio.p4",
+            "line" : 25,
+            "column" : 42,
+            "source_fragment" : "= hdr.packet_out.egress_port; ..."
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -2796,6 +2802,12 @@
         {
           "name" : "tbl_act_0",
           "id" : 1,
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 105,
+            "column" : 37,
+            "source_fragment" : "= hdr.vlan_tag.eth_type; ..."
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -2819,6 +2831,12 @@
         {
           "name" : "tbl_act_1",
           "id" : 2,
+          "source_info" : {
+            "filename" : "include/control/filtering.p4",
+            "line" : 115,
+            "column" : 37,
+            "source_fragment" : "="
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -3316,6 +3334,12 @@
         {
           "name" : "tbl_act_2",
           "id" : 13,
+          "source_info" : {
+            "filename" : "include/control/port_counter.p4",
+            "line" : 31,
+            "column" : 12,
+            "source_fragment" : "egress_port_counter.count((bit<32>)standard_metadata.egress_spec)"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -3339,6 +3363,12 @@
         {
           "name" : "tbl_act_3",
           "id" : 14,
+          "source_info" : {
+            "filename" : "include/control/port_counter.p4",
+            "line" : 34,
+            "column" : 12,
+            "source_fragment" : "ingress_port_counter.count((bit<32>)standard_metadata.ingress_port)"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -3687,6 +3717,12 @@
         {
           "name" : "tbl_act_4",
           "id" : 15,
+          "source_info" : {
+            "filename" : "include/control/packetio.p4",
+            "line" : 47,
+            "column" : 16,
+            "source_fragment" : "mark_to_drop()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -3710,6 +3746,12 @@
         {
           "name" : "tbl_act_5",
           "id" : 16,
+          "source_info" : {
+            "filename" : "include/control/packetio.p4",
+            "line" : 49,
+            "column" : 12,
+            "source_fragment" : "hdr.packet_in.setValid(); ..."
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -3733,6 +3775,12 @@
         {
           "name" : "tbl_act_6",
           "id" : 17,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 308,
+            "column" : 12,
+            "source_fragment" : "mark_to_drop()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -3756,6 +3804,12 @@
         {
           "name" : "tbl_egress_next_pop_mpls_if_present",
           "id" : 18,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 312,
+            "column" : 36,
+            "source_fragment" : "pop_mpls_if_present()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -3779,6 +3833,12 @@
         {
           "name" : "tbl_egress_next_set_mpls",
           "id" : 19,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 314,
+            "column" : 12,
+            "source_fragment" : "set_mpls()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -3891,6 +3951,12 @@
         {
           "name" : "tbl_egress_next_push_vlan",
           "id" : 23,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 320,
+            "column" : 16,
+            "source_fragment" : "push_vlan()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -3914,6 +3980,12 @@
         {
           "name" : "tbl_act_9",
           "id" : 24,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 326,
+            "column" : 25,
+            "source_fragment" : "="
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -3937,6 +4009,12 @@
         {
           "name" : "tbl_act_10",
           "id" : 25,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 327,
+            "column" : 35,
+            "source_fragment" : "mark_to_drop()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -3960,6 +4038,12 @@
         {
           "name" : "tbl_act_11",
           "id" : 26,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 330,
+            "column" : 29,
+            "source_fragment" : "="
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
@@ -3983,6 +4067,12 @@
         {
           "name" : "tbl_act_12",
           "id" : 27,
+          "source_info" : {
+            "filename" : "include/control/next.p4",
+            "line" : 331,
+            "column" : 39,
+            "source_fragment" : "mark_to_drop()"
+          },
           "key" : [],
           "match_type" : "exact",
           "type" : "simple",
diff --git a/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/p4info.txt b/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/p4info.txt
index 8802c9c..c74940c 100644
--- a/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/p4info.txt
+++ b/pipelines/fabric/src/main/resources/p4c-out/fabric/bmv2/default/p4info.txt
@@ -638,11 +638,11 @@
     id: 285217164
     name: "FabricIngress.next.hashed_selector"
     alias: "hashed_selector"
-    annotations: "@max_group_size(16)"
   }
   table_ids: 33608588
   with_selector: true
   size: 1024
+  max_group_size: 16
 }
 counters {
   preamble {