diff --git a/java_gen/java_model.py b/java_gen/java_model.py
index 944b536..d1adce0 100644
--- a/java_gen/java_model.py
+++ b/java_gen/java_model.py
@@ -55,7 +55,64 @@
     virtual_interfaces = set(['OFOxm', 'OFInstruction', 'OFFlowMod', 'OFBsnVport' ])
 
     OxmMapEntry = namedtuple("OxmMapEntry", ["type_name", "value", "masked" ])
-    oxm_map = { "OFOxmInPortMasked": OxmMapEntry("OFPort", "IN_PORT", True) }
+    oxm_map = { "OFOxmInPort":              OxmMapEntry("OFPort", "IN_PORT", False),
+                "OFOxmInPortMasked":        OxmMapEntry("OFPort", "IN_PORT", True),
+                "OFOxmInPhyPort":           OxmMapEntry("OFPort", "IN_PHY_PORT", False),
+                "OFOxmInPhyPortMasked":     OxmMapEntry("OFPort", "IN_PHY_PORT", True),
+                "OFOxmMetadata":            OxmMapEntry("OFMetadata", "METADATA", False),
+                "OFOxmMetadataMasked":      OxmMapEntry("OFMetadata", "METADATA", True),
+                "OFOxmEthDst":              OxmMapEntry("MacAddress", "ETH_DST", False),
+                "OFOxmEthDstMasked":        OxmMapEntry("MacAddress", "ETH_DST", True),
+                "OFOxmEthSrc":              OxmMapEntry("MacAddress", "ETH_SRC", False),
+                "OFOxmEthSrcMasked":        OxmMapEntry("MacAddress", "ETH_SRC", True),
+                "OFOxmEthType":             OxmMapEntry("EthType", "ETH_TYPE", False),
+                "OFOxmEthTypeMasked":       OxmMapEntry("EthType", "ETH_TYPE", True),
+                "OFOxmVlanVid":             OxmMapEntry("VlanVid", "VLAN_VID", False),
+                "OFOxmVlanVidMasked":       OxmMapEntry("VlanVid", "VLAN_VID", True),
+                "OFOxmVlanPcp":             OxmMapEntry("VlanPcp", "VLAN_PCP", False),
+                "OFOxmVlanPcpMasked":       OxmMapEntry("VlanPcp", "VLAN_PCP", True),
+                "OFOxmIpDscp":              OxmMapEntry("IpDscp", "IP_DSCP", False),
+                "OFOxmIpDscpMasked":        OxmMapEntry("IpDscp", "IP_DSCP", True),
+                "OFOxmIpEcn":               OxmMapEntry("IpEcn", "IP_ECN", False),
+                "OFOxmIpEcnMasked":         OxmMapEntry("IpEcn", "IP_ECN", True),
+                "OFOxmIpProto":             OxmMapEntry("IpProtocol", "IP_PROTO", False),
+                "OFOxmIpProtoMasked":       OxmMapEntry("IpProtocol", "IP_PROTO", True),
+                "OFOxmIpv4Src":             OxmMapEntry("IPv4", "IPV4_SRC", False),
+                "OFOxmIpv4SrcMasked":       OxmMapEntry("IPv4", "IPV4_SRC", True),
+                "OFOxmIpv4Dst":             OxmMapEntry("IPv4", "IPV4_DST", False),
+                "OFOxmIpv4DstMasked":       OxmMapEntry("IPv4", "IPV4_DST", True),
+                "OFOxmTcpSrc":              OxmMapEntry("TransportPort", "TCP_SRC", False),
+                "OFOxmTcpSrcMasked":        OxmMapEntry("TransportPort", "TCP_SRC", True),
+                "OFOxmTcpDst":              OxmMapEntry("TransportPort", "TCP_DST", False),
+                "OFOxmTcpDstMasked":        OxmMapEntry("TransportPort", "TCP_DST", True),
+                "OFOxmUdpSrc":              OxmMapEntry("TransportPort", "UDP_SRC", False),
+                "OFOxmUdpSrcMasked":        OxmMapEntry("TransportPort", "UDP_SRC", True),
+                "OFOxmUdpDst":              OxmMapEntry("TransportPort", "UDP_DST", False),
+                "OFOxmUdpDstMasked":        OxmMapEntry("TransportPort", "UDP_DST", True),
+                "OFOxmSctpSrc":             OxmMapEntry("TransportPort", "SCTP_SRC", False),
+                "OFOxmSctpSrcMasked":       OxmMapEntry("TransportPort", "SCTP_SRC", True),
+                "OFOxmSctpDst":             OxmMapEntry("TransportPort", "SCTP_DST", False),
+                "OFOxmSctpDstMasked":       OxmMapEntry("TransportPort", "SCTP_DST", True),
+                "OFOxmIcmpv4Type":          OxmMapEntry("ICMPv4Type", "ICMPV4_TYPE", False),
+                "OFOxmIcmpv4TypeMasked":    OxmMapEntry("ICMPv4Type", "ICMPV4_TYPE", True),
+                "OFOxmIcmpv4Code":          OxmMapEntry("ICMPv4Code", "ICMPV4_CODE", False),
+                "OFOxmIcmpv4CodeMasked":    OxmMapEntry("ICMPv4Code", "ICMPV4_CODE", True),
+                "OFOxmArpOp":               OxmMapEntry("ArpOpcode", "ARP_OP", False),
+                "OFOxmArpOpMasked":         OxmMapEntry("ArpOpcode", "ARP_OP", True),
+                "OFOxmArpSpa":              OxmMapEntry("IPv4", "ARP_SPA", False),
+                "OFOxmArpSpaMasked":        OxmMapEntry("IPv4", "ARP_SPA", True),
+                "OFOxmArpTpa":              OxmMapEntry("IPv4", "ARP_TPA", False),
+                "OFOxmArpTpaMasked":        OxmMapEntry("IPv4", "ARP_TPA", True),
+                "OFOxmArpSha":              OxmMapEntry("MacAddress", "ARP_SHA", False),
+                "OFOxmArpShaMasked":        OxmMapEntry("MacAddress", "ARP_SHA", True),
+                "OFOxmArpTha":              OxmMapEntry("MacAddress", "ARP_THA", False),
+                "OFOxmArpThaMasked":        OxmMapEntry("MacAddress", "ARP_THA", True),
+                "OFOxmIpv6Src":             OxmMapEntry("IPv6", "IPV6_SRC", False),
+                "OFOxmIpv6SrcMasked":       OxmMapEntry("IPv6", "IPV6_SRC", True),
+                "OFOxmIpv6Dst":             OxmMapEntry("IPv6", "IPV6_DST", False),
+                "OFOxmIpv6DstMasked":       OxmMapEntry("IPv6", "IPV6_DST", True),
+                "OFOxmIpv6Flabel":          OxmMapEntry("IPv6FlowLabel", "IPV6_FLABEL", False),
+                "OFOxmIpv6FlabelMasked":    OxmMapEntry("IPv6FlowLabel", "IPV6_FLABEL", True) }
 
     @property
     @memoize