diff --git a/wireshark_gen/templates/openflow.lua b/wireshark_gen/templates/openflow.lua
index 16abec0..098557b 100644
--- a/wireshark_gen/templates/openflow.lua
+++ b/wireshark_gen/templates/openflow.lua
@@ -24,16 +24,14 @@
 
 :: #endfor
 
-local f_version = ProtoField.uint8("of.version", "Version", base.HEX, openflow_versions)
-local f_type = ProtoField.uint8("of.type", "Type", base.HEX, enum_v1_ofp_type)
-local f_length = ProtoField.uint16("of.length", "Length")
-local f_xid = ProtoField.uint32("of.xid", "XID", base.HEX)
+:: for field in fields:
+f_${field.name} = ProtoField.new("${field.name}", "of.${field.name}", "FT_${field.type}", nil, "BASE_${field.base}")
+:: #endfor
 
 p_of.fields = {
-    f_version,
-    f_type,
-    f_length,
-    f_xid,
+:: for field in fields:
+    f_${field.name},
+:: #endfor
 }
 
 :: for supercls in set(sorted(superclasses.values())):