diff --git a/of-save/lib/gen-src/main/java/org/projectfloodlight/openflow/protocol/ver13/OFTableFeaturePropMatchVer13.java b/of-save/lib/gen-src/main/java/org/projectfloodlight/openflow/protocol/ver13/OFTableFeaturePropMatchVer13.java
new file mode 100644
index 0000000..ab2cbe8
--- /dev/null
+++ b/of-save/lib/gen-src/main/java/org/projectfloodlight/openflow/protocol/ver13/OFTableFeaturePropMatchVer13.java
@@ -0,0 +1,274 @@
+// Copyright (c) 2008 The Board of Trustees of The Leland Stanford Junior University
+// Copyright (c) 2011, 2012 Open Networking Foundation
+// Copyright (c) 2012, 2013 Big Switch Networks, Inc.
+// This library was generated by the LoxiGen Compiler.
+// See the file LICENSE.txt which should have been included in the source distribution
+
+// Automatically generated by LOXI from template of_class.java
+// Do not modify
+
+package org.projectfloodlight.openflow.protocol.ver13;
+
+import org.projectfloodlight.openflow.protocol.*;
+import org.projectfloodlight.openflow.protocol.action.*;
+import org.projectfloodlight.openflow.protocol.actionid.*;
+import org.projectfloodlight.openflow.protocol.bsntlv.*;
+import org.projectfloodlight.openflow.protocol.errormsg.*;
+import org.projectfloodlight.openflow.protocol.meterband.*;
+import org.projectfloodlight.openflow.protocol.instruction.*;
+import org.projectfloodlight.openflow.protocol.instructionid.*;
+import org.projectfloodlight.openflow.protocol.match.*;
+import org.projectfloodlight.openflow.protocol.oxm.*;
+import org.projectfloodlight.openflow.protocol.queueprop.*;
+import org.projectfloodlight.openflow.types.*;
+import org.projectfloodlight.openflow.util.*;
+import org.projectfloodlight.openflow.exceptions.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import java.util.List;
+import com.google.common.collect.ImmutableList;
+import java.util.Set;
+import org.jboss.netty.buffer.ChannelBuffer;
+import com.google.common.hash.PrimitiveSink;
+import com.google.common.hash.Funnel;
+
+class OFTableFeaturePropMatchVer13 implements OFTableFeaturePropMatch {
+    private static final Logger logger = LoggerFactory.getLogger(OFTableFeaturePropMatchVer13.class);
+    // version: 1.3
+    final static byte WIRE_VERSION = 4;
+    final static int MINIMUM_LENGTH = 4;
+
+        private final static List<U32> DEFAULT_OXM_IDS = ImmutableList.<U32>of();
+
+    // OF message fields
+    private final List<U32> oxmIds;
+//
+    // Immutable default instance
+    final static OFTableFeaturePropMatchVer13 DEFAULT = new OFTableFeaturePropMatchVer13(
+        DEFAULT_OXM_IDS
+    );
+
+    // package private constructor - used by readers, builders, and factory
+    OFTableFeaturePropMatchVer13(List<U32> oxmIds) {
+        this.oxmIds = oxmIds;
+    }
+
+    // Accessors for OF message fields
+    @Override
+    public int getType() {
+        return 0x8;
+    }
+
+    @Override
+    public List<U32> getOxmIds() {
+        return oxmIds;
+    }
+
+    @Override
+    public OFVersion getVersion() {
+        return OFVersion.OF_13;
+    }
+
+
+
+    public OFTableFeaturePropMatch.Builder createBuilder() {
+        return new BuilderWithParent(this);
+    }
+
+    static class BuilderWithParent implements OFTableFeaturePropMatch.Builder {
+        final OFTableFeaturePropMatchVer13 parentMessage;
+
+        // OF message fields
+        private boolean oxmIdsSet;
+        private List<U32> oxmIds;
+
+        BuilderWithParent(OFTableFeaturePropMatchVer13 parentMessage) {
+            this.parentMessage = parentMessage;
+        }
+
+    @Override
+    public int getType() {
+        return 0x8;
+    }
+
+    @Override
+    public List<U32> getOxmIds() {
+        return oxmIds;
+    }
+
+    @Override
+    public OFTableFeaturePropMatch.Builder setOxmIds(List<U32> oxmIds) {
+        this.oxmIds = oxmIds;
+        this.oxmIdsSet = true;
+        return this;
+    }
+    @Override
+    public OFVersion getVersion() {
+        return OFVersion.OF_13;
+    }
+
+
+
+        @Override
+        public OFTableFeaturePropMatch build() {
+                List<U32> oxmIds = this.oxmIdsSet ? this.oxmIds : parentMessage.oxmIds;
+                if(oxmIds == null)
+                    throw new NullPointerException("Property oxmIds must not be null");
+
+                //
+                return new OFTableFeaturePropMatchVer13(
+                    oxmIds
+                );
+        }
+
+    }
+
+    static class Builder implements OFTableFeaturePropMatch.Builder {
+        // OF message fields
+        private boolean oxmIdsSet;
+        private List<U32> oxmIds;
+
+    @Override
+    public int getType() {
+        return 0x8;
+    }
+
+    @Override
+    public List<U32> getOxmIds() {
+        return oxmIds;
+    }
+
+    @Override
+    public OFTableFeaturePropMatch.Builder setOxmIds(List<U32> oxmIds) {
+        this.oxmIds = oxmIds;
+        this.oxmIdsSet = true;
+        return this;
+    }
+    @Override
+    public OFVersion getVersion() {
+        return OFVersion.OF_13;
+    }
+
+//
+        @Override
+        public OFTableFeaturePropMatch build() {
+            List<U32> oxmIds = this.oxmIdsSet ? this.oxmIds : DEFAULT_OXM_IDS;
+            if(oxmIds == null)
+                throw new NullPointerException("Property oxmIds must not be null");
+
+
+            return new OFTableFeaturePropMatchVer13(
+                    oxmIds
+                );
+        }
+
+    }
+
+
+    final static Reader READER = new Reader();
+    static class Reader implements OFMessageReader<OFTableFeaturePropMatch> {
+        @Override
+        public OFTableFeaturePropMatch readFrom(ChannelBuffer bb) throws OFParseError {
+            int start = bb.readerIndex();
+            // fixed value property type == 0x8
+            short type = bb.readShort();
+            if(type != (short) 0x8)
+                throw new OFParseError("Wrong type: Expected=0x8(0x8), got="+type);
+            int length = U16.f(bb.readShort());
+            if(length < MINIMUM_LENGTH)
+                throw new OFParseError("Wrong length: Expected to be >= " + MINIMUM_LENGTH + ", was: " + length);
+            if(bb.readableBytes() + (bb.readerIndex() - start) < length) {
+                // Buffer does not have all data yet
+                bb.readerIndex(start);
+                return null;
+            }
+            if(logger.isTraceEnabled())
+                logger.trace("readFrom - length={}", length);
+            List<U32> oxmIds = ChannelUtils.readList(bb, length - (bb.readerIndex() - start), U32.READER);
+
+            OFTableFeaturePropMatchVer13 tableFeaturePropMatchVer13 = new OFTableFeaturePropMatchVer13(
+                    oxmIds
+                    );
+            if(logger.isTraceEnabled())
+                logger.trace("readFrom - read={}", tableFeaturePropMatchVer13);
+            return tableFeaturePropMatchVer13;
+        }
+    }
+
+    public void putTo(PrimitiveSink sink) {
+        FUNNEL.funnel(this, sink);
+    }
+
+    final static OFTableFeaturePropMatchVer13Funnel FUNNEL = new OFTableFeaturePropMatchVer13Funnel();
+    static class OFTableFeaturePropMatchVer13Funnel implements Funnel<OFTableFeaturePropMatchVer13> {
+        private static final long serialVersionUID = 1L;
+        @Override
+        public void funnel(OFTableFeaturePropMatchVer13 message, PrimitiveSink sink) {
+            // fixed value property type = 0x8
+            sink.putShort((short) 0x8);
+            // FIXME: skip funnel of length
+            FunnelUtils.putList(message.oxmIds, sink);
+        }
+    }
+
+
+    public void writeTo(ChannelBuffer bb) {
+        WRITER.write(bb, this);
+    }
+
+    final static Writer WRITER = new Writer();
+    static class Writer implements OFMessageWriter<OFTableFeaturePropMatchVer13> {
+        @Override
+        public void write(ChannelBuffer bb, OFTableFeaturePropMatchVer13 message) {
+            int startIndex = bb.writerIndex();
+            // fixed value property type = 0x8
+            bb.writeShort((short) 0x8);
+            // length is length of variable message, will be updated at the end
+            int lengthIndex = bb.writerIndex();
+            bb.writeShort(U16.t(0));
+
+            ChannelUtils.writeList(bb, message.oxmIds);
+
+            // update length field
+            int length = bb.writerIndex() - startIndex;
+            bb.setShort(lengthIndex, length);
+
+        }
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder b = new StringBuilder("OFTableFeaturePropMatchVer13(");
+        b.append("oxmIds=").append(oxmIds);
+        b.append(")");
+        return b.toString();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        OFTableFeaturePropMatchVer13 other = (OFTableFeaturePropMatchVer13) obj;
+
+        if (oxmIds == null) {
+            if (other.oxmIds != null)
+                return false;
+        } else if (!oxmIds.equals(other.oxmIds))
+            return false;
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+
+        result = prime * result + ((oxmIds == null) ? 0 : oxmIds.hashCode());
+        return result;
+    }
+
+}