diff --git a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
index b79ed6d..7f6ef0d 100644
--- a/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
+++ b/pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json
@@ -3342,7 +3342,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 117,
+            "line" : 120,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -3402,7 +3402,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 118,
+            "line" : 121,
             "column" : 31,
             "source_fragment" : "0x86dd; ..."
           }
@@ -5316,7 +5316,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 150,
+            "line" : 153,
             "column" : 36,
             "source_fragment" : "2w1; ..."
           }
@@ -5402,7 +5402,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 151,
+            "line" : 154,
             "column" : 38,
             "source_fragment" : "2w2; ..."
           }
@@ -5428,7 +5428,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 149,
+            "line" : 152,
             "column" : 37,
             "source_fragment" : "2w0; ..."
           }
@@ -6314,7 +6314,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 132,
+            "line" : 135,
             "column" : 28,
             "source_fragment" : "5; ..."
           }
@@ -6470,7 +6470,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 145,
+            "line" : 148,
             "column" : 32,
             "source_fragment" : "64; ..."
           }
@@ -6489,7 +6489,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 129,
+            "line" : 132,
             "column" : 25,
             "source_fragment" : "17; ..."
           }
@@ -6872,7 +6872,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 121,
+            "line" : 124,
             "column" : 33,
             "source_fragment" : "0x8864; ..."
           }
@@ -7043,7 +7043,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 123,
+            "line" : 126,
             "column" : 35,
             "source_fragment" : "0x0021; ..."
           }
@@ -7069,7 +7069,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 121,
+            "line" : 124,
             "column" : 33,
             "source_fragment" : "0x8864; ..."
           }
@@ -7240,7 +7240,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 124,
+            "line" : 127,
             "column" : 35,
             "source_fragment" : "0x0057; ..."
           }
@@ -7317,7 +7317,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 160,
+            "line" : 163,
             "column" : 36,
             "source_fragment" : "4; ..."
           }
@@ -7735,7 +7735,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 156,
+            "line" : 159,
             "column" : 24,
             "source_fragment" : "0x1; ..."
           }
@@ -13765,7 +13765,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 117,
+            "line" : 120,
             "column" : 31,
             "source_fragment" : "0x0800; ..."
           }
@@ -13993,7 +13993,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 129,
+            "line" : 132,
             "column" : 25,
             "source_fragment" : "17; ..."
           }
@@ -14179,7 +14179,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 166,
+            "line" : 169,
             "column" : 31,
             "source_fragment" : "0; ..."
           }
@@ -14274,7 +14274,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 170,
+            "line" : 173,
             "column" : 21,
             "source_fragment" : "1; ..."
           }
@@ -14846,7 +14846,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 115,
+            "line" : 118,
             "column" : 31,
             "source_fragment" : "0x8847; ..."
           }
@@ -14925,7 +14925,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 114,
+            "line" : 117,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -15023,7 +15023,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 114,
+            "line" : 117,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -15140,7 +15140,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 114,
+            "line" : 117,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }
@@ -15159,7 +15159,7 @@
           ],
           "source_info" : {
             "filename" : "include/control/../define.p4",
-            "line" : 114,
+            "line" : 117,
             "column" : 31,
             "source_fragment" : "0x8100; ..."
           }