diff --git a/c_gen/templates/loci_show.h b/c_gen/templates/loci_show.h
index 91d3a57..a28a7d4 100644
--- a/c_gen/templates/loci_show.h
+++ b/c_gen/templates/loci_show.h
@@ -115,6 +115,8 @@
 #define LOCI_SHOW_u16_egress_tpid(writer, cookie, val)     LOCI_SHOW_x16(writer, cookie, val)
 #define LOCI_SHOW_u16_ingress_vlan_id(writer, cookie, val) LOCI_SHOW_u16(writer, cookie, val)
 #define LOCI_SHOW_u16_egress_vlan_id(writer, cookie, val)  LOCI_SHOW_u16(writer, cookie, val)
+#define LOCI_SHOW_u32_enabled(writer, cookie, val)         LOCI_SHOW_u32(writer, cookie, val)
+#define LOCI_SHOW_u32_enable(writer, cookie, val)          LOCI_SHOW_u32(writer, cookie, val)
 
 
 
diff --git a/loxi_front_end/type_maps.py b/loxi_front_end/type_maps.py
index 53334f7..be81172 100644
--- a/loxi_front_end/type_maps.py
+++ b/loxi_front_end/type_maps.py
@@ -823,6 +823,10 @@
             "of_bsn_virtual_port_create_request"     : 15,
             "of_bsn_virtual_port_create_reply"       : 16,
             "of_bsn_virtual_port_remove"             : 17,
+            "of_bsn_bw_enable_set"                   : 18,
+            "of_bsn_bw_enable_get_request"           : 19,
+            "of_bsn_bw_enable_get_reply"             : 20,
+            "of_bsn_bw_clear_data"                   : 21,
             },
         nicira = {   # Nicira extensions, value is subtype
             "of_nicira_controller_role_request"      : 10,
@@ -840,6 +844,10 @@
             "of_bsn_virtual_port_create_request"     : 15,
             "of_bsn_virtual_port_create_reply"       : 16,
             "of_bsn_virtual_port_remove"             : 17,
+            "of_bsn_bw_enable_set"                   : 18,
+            "of_bsn_bw_enable_get_request"           : 19,
+            "of_bsn_bw_enable_get_reply"             : 20,
+            "of_bsn_bw_clear_data"                   : 21,
             },
         ),
     of_g.VERSION_1_2:dict(  # Version 1.0 extensions
@@ -853,6 +861,10 @@
             "of_bsn_virtual_port_create_request"     : 15,
             "of_bsn_virtual_port_create_reply"       : 16,
             "of_bsn_virtual_port_remove"             : 17,
+            "of_bsn_bw_enable_set"                   : 18,
+            "of_bsn_bw_enable_get_request"           : 19,
+            "of_bsn_bw_enable_get_reply"             : 20,
+            "of_bsn_bw_clear_data"                   : 21,
             },
         ),
     of_g.VERSION_1_3:dict(  # Version 1.0 extensions
@@ -866,6 +878,10 @@
             "of_bsn_virtual_port_create_request"     : 15,
             "of_bsn_virtual_port_create_reply"       : 16,
             "of_bsn_virtual_port_remove"             : 17,
+            "of_bsn_bw_enable_set"                   : 18,
+            "of_bsn_bw_enable_get_request"           : 19,
+            "of_bsn_bw_enable_get_reply"             : 20,
+            "of_bsn_bw_clear_data"                   : 21,
             },
         ),
 }
diff --git a/openflow_input/bsn_bw b/openflow_input/bsn_bw
new file mode 100644
index 0000000..4a7d49c
--- /dev/null
+++ b/openflow_input/bsn_bw
@@ -0,0 +1,69 @@
+// Copyright 2013, Big Switch Networks, Inc.
+//
+// LoxiGen is licensed under the Eclipse Public License,
+// version 1.0 (EPL), with // the following special exception:
+//
+// LOXI Exception
+//
+// As a special exception to the terms of the EPL, you may
+// distribute libraries generated by LoxiGen (LoxiGen Libraries)
+// under the terms of your choice, provided that copyright and
+// licensing notices generated by LoxiGen are not altered or removed
+// from the LoxiGen Libraries and the notice provided below is (i)
+// included in the LoxiGen Libraries, if distributed in source code
+// form and (ii) included in any documentation for the LoxiGen
+// Libraries, if distributed in binary form.
+//
+// Notice: "Copyright 2013, Big Switch Networks, Inc.
+// This library was generated by the LoxiGen Compiler."
+//
+// You may not use this file except in compliance with the EPL or
+// LOXI Exception. You may obtain a copy of the EPL at:
+//
+// http://www.eclipse.org/legal/epl-v10.html
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an "AS
+// IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+// express or implied. See the EPL for the specific language
+// governing permissions and limitations under the EPL.
+
+#version any
+
+struct ofp_bsn_bw_enable_set {
+    uint8_t version;
+    uint8_t type;           // OFPT_VENDOR
+    uint16_t length;
+    uint32_t xid;
+    uint32_t experimenter;  // OF_EXPERIMENTER_ID_BSN
+    uint32_t subtype;       // BSN_BW_ENABLE_SET
+    uint32_t enable;        // 0 to disable the extension, 1 to enable it
+};
+
+struct ofp_bsn_bw_enable_get_request {
+    uint8_t version;
+    uint8_t type;           // OFPT_VENDOR
+    uint16_t length;
+    uint32_t xid;
+    uint32_t experimenter;  // OF_EXPERIMENTER_ID_BSN
+    uint32_t subtype;       // BSN_BW_ENABLE_GET_REQUEST
+};
+
+struct ofp_bsn_bw_enable_get_reply {
+    uint8_t version;
+    uint8_t type;           // OFPT_VENDOR
+    uint16_t length;
+    uint32_t xid;
+    uint32_t experimenter;  // OF_EXPERIMENTER_ID_BSN
+    uint32_t subtype;       // BSN_BW_ENABLE_GET_REQUEST
+    uint32_t enabled;       // 0 if feature is disabled; 1 if feature enabled
+};
+
+struct ofp_bsn_bw_clear_data {
+    uint8_t version;
+    uint8_t type;           // OFPT_VENDOR
+    uint16_t length;
+    uint32_t xid;
+    uint32_t experimenter;  // OF_EXPERIMENTER_ID_BSN
+    uint32_t subtype;       // BSN_BW_CLEAR_DATA
+};
diff --git a/openflow_input/bsn_vport b/openflow_input/bsn_vport
index f23219d..fe1be70 100644
--- a/openflow_input/bsn_vport
+++ b/openflow_input/bsn_vport
@@ -1,29 +1,32 @@
 // Copyright 2013, Big Switch Networks, Inc.
 //
-// LoxiGen is licensed under the Eclipse Public License, version 1.0 (EPL), with
-// the following special exception:
+// LoxiGen is licensed under the Eclipse Public License,
+// version 1.0 (EPL), with // the following special exception:
 //
 // LOXI Exception
 //
-// As a special exception to the terms of the EPL, you may distribute libraries
-// generated by LoxiGen (LoxiGen Libraries) under the terms of your choice, provided
-// that copyright and licensing notices generated by LoxiGen are not altered or removed
-// from the LoxiGen Libraries and the notice provided below is (i) included in
-// the LoxiGen Libraries, if distributed in source code form and (ii) included in any
-// documentation for the LoxiGen Libraries, if distributed in binary form.
+// As a special exception to the terms of the EPL, you may
+// distribute libraries generated by LoxiGen (LoxiGen Libraries)
+// under the terms of your choice, provided that copyright and
+// licensing notices generated by LoxiGen are not altered or removed
+// from the LoxiGen Libraries and the notice provided below is (i)
+// included in the LoxiGen Libraries, if distributed in source code
+// form and (ii) included in any documentation for the LoxiGen
+// Libraries, if distributed in binary form.
 //
-// Notice: "Copyright 2013, Big Switch Networks, Inc. This library was generated by the LoxiGen Compiler."
+// Notice: "Copyright 2013, Big Switch Networks, Inc.
+// This library was generated by the LoxiGen Compiler."
 //
-// You may not use this file except in compliance with the EPL or LOXI Exception. You may obtain
-// a copy of the EPL at:
+// You may not use this file except in compliance with the EPL or
+// LOXI Exception. You may obtain a copy of the EPL at:
 //
 // http://www.eclipse.org/legal/epl-v10.html
 //
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-// EPL for the specific language governing permissions and limitations
-// under the EPL.
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an "AS
+// IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+// express or implied. See the EPL for the specific language
+// governing permissions and limitations under the EPL.
 
 #version any