diff --git a/tests/MyGame/Example/Referrable.java b/tests/MyGame/Example/Referrable.java
index 1f92958..da8dea6 100644
--- a/tests/MyGame/Example/Referrable.java
+++ b/tests/MyGame/Example/Referrable.java
@@ -9,7 +9,7 @@
 
 @SuppressWarnings("unused")
 public final class Referrable extends Table {
-  public static void ValidateVersion() { Constants.FLATBUFFERS_1_12_0(); }
+  public static void ValidateVersion() { Constants.FLATBUFFERS_2_0_0(); }
   public static Referrable getRootAsReferrable(ByteBuffer _bb) { return getRootAsReferrable(_bb, new Referrable()); }
   public static Referrable getRootAsReferrable(ByteBuffer _bb, Referrable obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
   public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); }
@@ -68,5 +68,20 @@
     public Referrable getByKey(long key) {  return __lookup_by_key(null, __vector(), key, bb); }
     public Referrable getByKey(Referrable obj, long key) {  return __lookup_by_key(obj, __vector(), key, bb); }
   }
+  public ReferrableT unpack() {
+    ReferrableT _o = new ReferrableT();
+    unpackTo(_o);
+    return _o;
+  }
+  public void unpackTo(ReferrableT _o) {
+    long _oId = id();
+    _o.setId(_oId);
+  }
+  public static int pack(FlatBufferBuilder builder, ReferrableT _o) {
+    if (_o == null) return 0;
+    return createReferrable(
+      builder,
+      _o.getId());
+  }
 }
 
