diff --git a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/context/mau.context.json b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/context/mau.context.json
index 8a5de37..2228613 100644
--- a/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/context/mau.context.json
+++ b/tools/test/p4src/p4-14/p4c-out/tofino/default/mavericks/context/mau.context.json
@@ -1,14 +1,137 @@
 {
   "ProgramInfo": {
     "ProgramName": "default", 
-    "BuildDate": "Fri Sep  8 08:24:01 2017", 
+    "BuildDate": "Wed Sep 13 00:58:27 2017", 
     "CompilerVersion": "5.1.0"
   }, 
   "HashJsonNode": {
-    "TableCount": 0, 
+    "TableCount": 2, 
     "ProxyTables": {}, 
-    "AllTables": {}, 
-    "HashFieldCount": 0
+    "AllTables": {
+      "ingress_port_count_table": {
+        "1": [
+          {
+            "0": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "1": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "2": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "3": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "4": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "5": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "6": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "7": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "8": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ]
+          }
+        ], 
+        "Handle": 16777217
+      }, 
+      "egress_port_count_table": {
+        "1": [
+          {
+            "0": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "1": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "2": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "3": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "4": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "5": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "6": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "7": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ], 
+            "8": [
+              {}, 
+              {
+                "seed": 0
+              }
+            ]
+          }
+        ], 
+        "Handle": 16777218
+      }
+    }, 
+    "HashFieldCount": 2
   }, 
   "EntryFormatNode": {
     "ExmEntryFormat": {
@@ -16664,21 +16787,16 @@
         "stage_tables": [
           {
             "stage_number": 1, 
-            "stage_table_type": "match_with_no_key", 
-            "number_entries": 1, 
+            "stage_table_type": "hash_action", 
+            "number_entries": 1024, 
             "pack_format_length": 1, 
             "pack_format": [
               {
                 "table_word_width": 0, 
                 "memory_word_width": 0, 
-                "entries_per_table_word": 1, 
+                "entries_per_table_word": 0, 
                 "number_memory_units_per_table_word": 0, 
-                "entry_list": [
-                  {
-                    "entry_number": 0, 
-                    "field_list": []
-                  }
-                ]
+                "entry_list": []
               }
             ], 
             "memory_resource_allocation": null, 
@@ -16715,15 +16833,15 @@
                 ], 
                 "match_group_key_bit_width": 16, 
                 "match_group_phv_bit_scrambling": {
-                  "ig_intr_md_for_tm.ucast_egress_port[0]": 0, 
-                  "ig_intr_md_for_tm.ucast_egress_port[1]": 1, 
-                  "ig_intr_md_for_tm.ucast_egress_port[2]": 2, 
-                  "ig_intr_md_for_tm.ucast_egress_port[3]": 3, 
-                  "ig_intr_md_for_tm.ucast_egress_port[4]": 4, 
-                  "ig_intr_md_for_tm.ucast_egress_port[5]": 5, 
-                  "ig_intr_md_for_tm.ucast_egress_port[6]": 6, 
-                  "ig_intr_md_for_tm.ucast_egress_port[7]": 7, 
-                  "ig_intr_md_for_tm.ucast_egress_port[8]": 8
+                  "ig_intr_md_for_tm.ucast_egress_port[0]": 16, 
+                  "ig_intr_md_for_tm.ucast_egress_port[1]": 17, 
+                  "ig_intr_md_for_tm.ucast_egress_port[2]": 18, 
+                  "ig_intr_md_for_tm.ucast_egress_port[3]": 19, 
+                  "ig_intr_md_for_tm.ucast_egress_port[4]": 20, 
+                  "ig_intr_md_for_tm.ucast_egress_port[5]": 21, 
+                  "ig_intr_md_for_tm.ucast_egress_port[6]": 22, 
+                  "ig_intr_md_for_tm.ucast_egress_port[7]": 23, 
+                  "ig_intr_md_for_tm.ucast_egress_port[8]": 24
                 }, 
                 "match_group_match_bit_scrambling": {}, 
                 "seed": [
@@ -16829,8 +16947,8 @@
           {
             "name": "count_ingress", 
             "handle": 536870914, 
-            "allowed_to_be_default_action": true, 
-            "disallowed_as_default_action_reason": null, 
+            "allowed_to_be_default_action": false, 
+            "disallowed_as_default_action_reason": "USES_HASH_DIST", 
             "override_stat_addr_pfe": true, 
             "override_stat_addr": false, 
             "override_stat_full_addr": 0, 
@@ -16861,8 +16979,8 @@
         "default_action": {
           "name": "count_ingress", 
           "handle": 536870914, 
-          "allowed_to_be_default_action": true, 
-          "disallowed_as_default_action_reason": null, 
+          "allowed_to_be_default_action": false, 
+          "disallowed_as_default_action_reason": "USES_HASH_DIST", 
           "override_stat_addr_pfe": true, 
           "override_stat_addr": false, 
           "override_stat_full_addr": 0, 
@@ -16902,7 +17020,7 @@
         "p4_stateful_tables": [], 
         "p4_selection_tables": [], 
         "include_idletime": false, 
-        "performs_hash_action": false, 
+        "performs_hash_action": true, 
         "uses_range": false, 
         "number_entries_with_ranges": 0, 
         "uses_versioning": true, 
@@ -16923,21 +17041,16 @@
         "stage_tables": [
           {
             "stage_number": 1, 
-            "stage_table_type": "match_with_no_key", 
-            "number_entries": 1, 
+            "stage_table_type": "hash_action", 
+            "number_entries": 1024, 
             "pack_format_length": 1, 
             "pack_format": [
               {
                 "table_word_width": 0, 
                 "memory_word_width": 0, 
-                "entries_per_table_word": 1, 
+                "entries_per_table_word": 0, 
                 "number_memory_units_per_table_word": 0, 
-                "entry_list": [
-                  {
-                    "entry_number": 0, 
-                    "field_list": []
-                  }
-                ]
+                "entry_list": []
               }
             ], 
             "memory_resource_allocation": null, 
@@ -17070,8 +17183,8 @@
           {
             "name": "count_egress", 
             "handle": 536870916, 
-            "allowed_to_be_default_action": true, 
-            "disallowed_as_default_action_reason": null, 
+            "allowed_to_be_default_action": false, 
+            "disallowed_as_default_action_reason": "USES_HASH_DIST", 
             "override_stat_addr_pfe": true, 
             "override_stat_addr": false, 
             "override_stat_full_addr": 0, 
@@ -17102,8 +17215,8 @@
         "default_action": {
           "name": "count_egress", 
           "handle": 536870916, 
-          "allowed_to_be_default_action": true, 
-          "disallowed_as_default_action_reason": null, 
+          "allowed_to_be_default_action": false, 
+          "disallowed_as_default_action_reason": "USES_HASH_DIST", 
           "override_stat_addr_pfe": true, 
           "override_stat_addr": false, 
           "override_stat_full_addr": 0, 
@@ -17143,7 +17256,7 @@
         "p4_stateful_tables": [], 
         "p4_selection_tables": [], 
         "include_idletime": false, 
-        "performs_hash_action": false, 
+        "performs_hash_action": true, 
         "uses_range": false, 
         "number_entries_with_ranges": 0, 
         "uses_versioning": true, 
@@ -18534,7 +18647,7 @@
         "name": "ingress_port_counter", 
         "handle": 67108865, 
         "direction": "ingress", 
-        "number_entries": 510, 
+        "number_entries": 512, 
         "stage_tables_length": 1, 
         "stage_tables": [
           {
@@ -18642,7 +18755,7 @@
         "name": "egress_port_counter", 
         "handle": 67108866, 
         "direction": "ingress", 
-        "number_entries": 510, 
+        "number_entries": 512, 
         "stage_tables_length": 1, 
         "stage_tables": [
           {