Update generated Thrift API to version 0.15.0

54 files changed, 17015 insertions, 16865 deletions

diff --git a/pom.xml b/pom.xml
index ed067a1..8d87bc6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -143,7 +143,7 @@
 		<dependency>
 			<groupId>org.apache.thrift</groupId>
 			<artifactId>libthrift</artifactId>
-			<version>0.9.3</version>
+			<version>0.15.0</version>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/AuthorizationError.java b/src/main/java/org/openslx/bwlp/thrift/iface/AuthorizationError.java
index cacc3d8..d39865e 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/AuthorizationError.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/AuthorizationError.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,10 +7,7 @@
 package org.openslx.bwlp.thrift.iface;
 
 
-import java.util.Map;
-import java.util.HashMap;
-import org.apache.thrift.TEnum;
-
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
 public enum AuthorizationError implements org.apache.thrift.TEnum {
   GENERIC_ERROR(0),
   NOT_AUTHENTICATED(1),
@@ -41,6 +38,7 @@ public enum AuthorizationError implements org.apache.thrift.TEnum {
    * Find a the enum type by its integer value, as defined in the Thrift IDL.
    * @return null if the value is not found.
    */
+  @org.apache.thrift.annotation.Nullable
   public static AuthorizationError findByValue(int value) { 
     switch (value) {
       case 0:
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/ClientSessionData.java b/src/main/java/org/openslx/bwlp/thrift/iface/ClientSessionData.java
index 715ff3a..5b40cd0 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/ClientSessionData.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/ClientSessionData.java
@@ -1,40 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.openslx.bwlp.thrift.iface;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
 public class ClientSessionData implements org.apache.thrift.TBase<ClientSessionData, ClientSessionData._Fields>, java.io.Serializable, Cloneable, Comparable<ClientSessionData> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ClientSessionData");
 
@@ -43,16 +16,13 @@ public class ClientSessionData implements org.apache.thrift.TBase<ClientSessionD
   private static final org.apache.thrift.protocol.TField SATELLITES_FIELD_DESC = new org.apache.thrift.protocol.TField("satellites", org.apache.thrift.protocol.TType.LIST, (short)3);
   private static final org.apache.thrift.protocol.TField USER_INFO_FIELD_DESC = new org.apache.thrift.protocol.TField("userInfo", org.apache.thrift.protocol.TType.STRUCT, (short)4);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new ClientSessionDataStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new ClientSessionDataTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ClientSessionDataStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ClientSessionDataTupleSchemeFactory();
 
-  public String sessionId; // required
-  public String authToken; // required
-  public List<Satellite> satellites; // required
-  public UserInfo userInfo; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String sessionId; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String authToken; // required
+  public @org.apache.thrift.annotation.Nullable java.util.List<Satellite> satellites; // required
+  public @org.apache.thrift.annotation.Nullable UserInfo userInfo; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -61,10 +31,10 @@ public class ClientSessionData implements org.apache.thrift.TBase<ClientSessionD
     SATELLITES((short)3, "satellites"),
     USER_INFO((short)4, "userInfo");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -72,6 +42,7 @@ public class ClientSessionData implements org.apache.thrift.TBase<ClientSessionD
     /**
      * Find the _Fields constant that matches fieldId, or null if its not found.
      */
+    @org.apache.thrift.annotation.Nullable
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
         case 1: // SESSION_ID
@@ -93,21 +64,22 @@ public class ClientSessionData implements org.apache.thrift.TBase<ClientSessionD
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    @org.apache.thrift.annotation.Nullable
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -116,15 +88,15 @@ public class ClientSessionData implements org.apache.thrift.TBase<ClientSessionD
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.SESSION_ID, new org.apache.thrift.meta_data.FieldMetaData("sessionId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , "Token")));
     tmpMap.put(_Fields.AUTH_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("authToken", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -134,7 +106,7 @@ public class ClientSessionData implements org.apache.thrift.TBase<ClientSessionD
             new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Satellite.class))));
     tmpMap.put(_Fields.USER_INFO, new org.apache.thrift.meta_data.FieldMetaData("userInfo", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, UserInfo.class)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ClientSessionData.class, metaDataMap);
   }
 
@@ -142,9 +114,9 @@ public class ClientSessionData implements org.apache.thrift.TBase<ClientSessionD
   }
 
   public ClientSessionData(
-    String sessionId,
-    String authToken,
-    List<Satellite> satellites,
+    java.lang.String sessionId,
+    java.lang.String authToken,
+    java.util.List<Satellite> satellites,
     UserInfo userInfo)
   {
     this();
@@ -165,7 +137,7 @@ public class ClientSessionData implements org.apache.thrift.TBase<ClientSessionD
       this.authToken = other.authToken;
     }
     if (other.isSetSatellites()) {
-      List<Satellite> __this__satellites = new ArrayList<Satellite>(other.satellites.size());
+      java.util.List<Satellite> __this__satellites = new java.util.ArrayList<Satellite>(other.satellites.size());
       for (Satellite other_element : other.satellites) {
         __this__satellites.add(new Satellite(other_element));
       }
@@ -188,11 +160,12 @@ public class ClientSessionData implements org.apache.thrift.TBase<ClientSessionD
     this.userInfo = null;
   }
 
-  public String getSessionId() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getSessionId() {
     return this.sessionId;
   }
 
-  public ClientSessionData setSessionId(String sessionId) {
+  public ClientSessionData setSessionId(@org.apache.thrift.annotation.Nullable java.lang.String sessionId) {
     this.sessionId = sessionId;
     return this;
   }
@@ -212,11 +185,12 @@ public class ClientSessionData implements org.apache.thrift.TBase<ClientSessionD
     }
   }
 
-  public String getAuthToken() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getAuthToken() {
     return this.authToken;
   }
 
-  public ClientSessionData setAuthToken(String authToken) {
+  public ClientSessionData setAuthToken(@org.apache.thrift.annotation.Nullable java.lang.String authToken) {
     this.authToken = authToken;
     return this;
   }
@@ -240,22 +214,24 @@ public class ClientSessionData implements org.apache.thrift.TBase<ClientSessionD
     return (this.satellites == null) ? 0 : this.satellites.size();
   }
 
+  @org.apache.thrift.annotation.Nullable
   public java.util.Iterator<Satellite> getSatellitesIterator() {
     return (this.satellites == null) ? null : this.satellites.iterator();
   }
 
   public void addToSatellites(Satellite elem) {
     if (this.satellites == null) {
-      this.satellites = new ArrayList<Satellite>();
+      this.satellites = new java.util.ArrayList<Satellite>();
     }
     this.satellites.add(elem);
   }
 
-  public List<Satellite> getSatellites() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.List<Satellite> getSatellites() {
     return this.satellites;
   }
 
-  public ClientSessionData setSatellites(List<Satellite> satellites) {
+  public ClientSessionData setSatellites(@org.apache.thrift.annotation.Nullable java.util.List<Satellite> satellites) {
     this.satellites = satellites;
     return this;
   }
@@ -275,11 +251,12 @@ public class ClientSessionData implements org.apache.thrift.TBase<ClientSessionD
     }
   }
 
+  @org.apache.thrift.annotation.Nullable
   public UserInfo getUserInfo() {
     return this.userInfo;
   }
 
-  public ClientSessionData setUserInfo(UserInfo userInfo) {
+  public ClientSessionData setUserInfo(@org.apache.thrift.annotation.Nullable UserInfo userInfo) {
     this.userInfo = userInfo;
     return this;
   }
@@ -299,13 +276,13 @@ public class ClientSessionData implements org.apache.thrift.TBase<ClientSessionD
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case SESSION_ID:
       if (value == null) {
         unsetSessionId();
       } else {
-        setSessionId((String)value);
+        setSessionId((java.lang.String)value);
       }
       break;
 
@@ -313,7 +290,7 @@ public class ClientSessionData implements org.apache.thrift.TBase<ClientSessionD
       if (value == null) {
         unsetAuthToken();
       } else {
-        setAuthToken((String)value);
+        setAuthToken((java.lang.String)value);
       }
       break;
 
@@ -321,7 +298,7 @@ public class ClientSessionData implements org.apache.thrift.TBase<ClientSessionD
       if (value == null) {
         unsetSatellites();
       } else {
-        setSatellites((List<Satellite>)value);
+        setSatellites((java.util.List<Satellite>)value);
       }
       break;
 
@@ -336,7 +313,8 @@ public class ClientSessionData implements org.apache.thrift.TBase<ClientSessionD
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SESSION_ID:
       return getSessionId();
@@ -351,13 +329,13 @@ public class ClientSessionData implements org.apache.thrift.TBase<ClientSessionD
       return getUserInfo();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -370,13 +348,11 @@ public class ClientSessionData implements org.apache.thrift.TBase<ClientSessionD
     case USER_INFO:
       return isSetUserInfo();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
+  public boolean equals(java.lang.Object that) {
     if (that instanceof ClientSessionData)
       return this.equals((ClientSessionData)that);
     return false;
@@ -385,6 +361,8 @@ public class ClientSessionData implements org.apache.thrift.TBase<ClientSessionD
   public boolean equals(ClientSessionData that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_sessionId = true && this.isSetSessionId();
     boolean that_present_sessionId = true && that.isSetSessionId();
@@ -427,29 +405,25 @@ public class ClientSessionData implements org.apache.thrift.TBase<ClientSessionD
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_sessionId = true && (isSetSessionId());
-    list.add(present_sessionId);
-    if (present_sessionId)
-      list.add(sessionId);
+    hashCode = hashCode * 8191 + ((isSetSessionId()) ? 131071 : 524287);
+    if (isSetSessionId())
+      hashCode = hashCode * 8191 + sessionId.hashCode();
 
-    boolean present_authToken = true && (isSetAuthToken());
-    list.add(present_authToken);
-    if (present_authToken)
-      list.add(authToken);
+    hashCode = hashCode * 8191 + ((isSetAuthToken()) ? 131071 : 524287);
+    if (isSetAuthToken())
+      hashCode = hashCode * 8191 + authToken.hashCode();
 
-    boolean present_satellites = true && (isSetSatellites());
-    list.add(present_satellites);
-    if (present_satellites)
-      list.add(satellites);
+    hashCode = hashCode * 8191 + ((isSetSatellites()) ? 131071 : 524287);
+    if (isSetSatellites())
+      hashCode = hashCode * 8191 + satellites.hashCode();
 
-    boolean present_userInfo = true && (isSetUserInfo());
-    list.add(present_userInfo);
-    if (present_userInfo)
-      list.add(userInfo);
+    hashCode = hashCode * 8191 + ((isSetUserInfo()) ? 131071 : 524287);
+    if (isSetUserInfo())
+      hashCode = hashCode * 8191 + userInfo.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -460,7 +434,7 @@ public class ClientSessionData implements org.apache.thrift.TBase<ClientSessionD
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetSessionId()).compareTo(other.isSetSessionId());
+    lastComparison = java.lang.Boolean.compare(isSetSessionId(), other.isSetSessionId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -470,7 +444,7 @@ public class ClientSessionData implements org.apache.thrift.TBase<ClientSessionD
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetAuthToken()).compareTo(other.isSetAuthToken());
+    lastComparison = java.lang.Boolean.compare(isSetAuthToken(), other.isSetAuthToken());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -480,7 +454,7 @@ public class ClientSessionData implements org.apache.thrift.TBase<ClientSessionD
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetSatellites()).compareTo(other.isSetSatellites());
+    lastComparison = java.lang.Boolean.compare(isSetSatellites(), other.isSetSatellites());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -490,7 +464,7 @@ public class ClientSessionData implements org.apache.thrift.TBase<ClientSessionD
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetUserInfo()).compareTo(other.isSetUserInfo());
+    lastComparison = java.lang.Boolean.compare(isSetUserInfo(), other.isSetUserInfo());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -503,21 +477,22 @@ public class ClientSessionData implements org.apache.thrift.TBase<ClientSessionD
     return 0;
   }
 
+  @org.apache.thrift.annotation.Nullable
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("ClientSessionData(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("ClientSessionData(");
     boolean first = true;
 
     sb.append("sessionId:");
@@ -571,7 +546,7 @@ public class ClientSessionData implements org.apache.thrift.TBase<ClientSessionD
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
     } catch (org.apache.thrift.TException te) {
@@ -579,13 +554,13 @@ public class ClientSessionData implements org.apache.thrift.TBase<ClientSessionD
     }
   }
 
-  private static class ClientSessionDataStandardSchemeFactory implements SchemeFactory {
+  private static class ClientSessionDataStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public ClientSessionDataStandardScheme getScheme() {
       return new ClientSessionDataStandardScheme();
     }
   }
 
-  private static class ClientSessionDataStandardScheme extends StandardScheme<ClientSessionData> {
+  private static class ClientSessionDataStandardScheme extends org.apache.thrift.scheme.StandardScheme<ClientSessionData> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, ClientSessionData struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -617,8 +592,8 @@ public class ClientSessionData implements org.apache.thrift.TBase<ClientSessionD
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list16 = iprot.readListBegin();
-                struct.satellites = new ArrayList<Satellite>(_list16.size);
-                Satellite _elem17;
+                struct.satellites = new java.util.ArrayList<Satellite>(_list16.size);
+                @org.apache.thrift.annotation.Nullable Satellite _elem17;
                 for (int _i18 = 0; _i18 < _list16.size; ++_i18)
                 {
                   _elem17 = new Satellite();
@@ -689,18 +664,18 @@ public class ClientSessionData implements org.apache.thrift.TBase<ClientSessionD
 
   }
 
-  private static class ClientSessionDataTupleSchemeFactory implements SchemeFactory {
+  private static class ClientSessionDataTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public ClientSessionDataTupleScheme getScheme() {
       return new ClientSessionDataTupleScheme();
     }
   }
 
-  private static class ClientSessionDataTupleScheme extends TupleScheme<ClientSessionData> {
+  private static class ClientSessionDataTupleScheme extends org.apache.thrift.scheme.TupleScheme<ClientSessionData> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, ClientSessionData struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetSessionId()) {
         optionals.set(0);
       }
@@ -736,8 +711,8 @@ public class ClientSessionData implements org.apache.thrift.TBase<ClientSessionD
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, ClientSessionData struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(4);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(4);
       if (incoming.get(0)) {
         struct.sessionId = iprot.readString();
         struct.setSessionIdIsSet(true);
@@ -748,9 +723,9 @@ public class ClientSessionData implements org.apache.thrift.TBase<ClientSessionD
       }
       if (incoming.get(2)) {
         {
-          org.apache.thrift.protocol.TList _list21 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.satellites = new ArrayList<Satellite>(_list21.size);
-          Satellite _elem22;
+          org.apache.thrift.protocol.TList _list21 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.satellites = new java.util.ArrayList<Satellite>(_list21.size);
+          @org.apache.thrift.annotation.Nullable Satellite _elem22;
           for (int _i23 = 0; _i23 < _list21.size; ++_i23)
           {
             _elem22 = new Satellite();
@@ -768,5 +743,8 @@ public class ClientSessionData implements org.apache.thrift.TBase<ClientSessionD
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/DateParamError.java b/src/main/java/org/openslx/bwlp/thrift/iface/DateParamError.java
index 23910bf..fec22bd 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/DateParamError.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/DateParamError.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,10 +7,7 @@
 package org.openslx.bwlp.thrift.iface;
 
 
-import java.util.Map;
-import java.util.HashMap;
-import org.apache.thrift.TEnum;
-
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
 public enum DateParamError implements org.apache.thrift.TEnum {
   TOO_LOW(0),
   TOO_HIGH(1),
@@ -33,6 +30,7 @@ public enum DateParamError implements org.apache.thrift.TEnum {
    * Find a the enum type by its integer value, as defined in the Thrift IDL.
    * @return null if the value is not found.
    */
+  @org.apache.thrift.annotation.Nullable
   public static DateParamError findByValue(int value) { 
     switch (value) {
       case 0:
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/ImageBaseWrite.java b/src/main/java/org/openslx/bwlp/thrift/iface/ImageBaseWrite.java
index 6e35111..1c796fa 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/ImageBaseWrite.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/ImageBaseWrite.java
@@ -1,40 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.openslx.bwlp.thrift.iface;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
 public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, ImageBaseWrite._Fields>, java.io.Serializable, Cloneable, Comparable<ImageBaseWrite> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ImageBaseWrite");
 
@@ -48,25 +21,22 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
   private static final org.apache.thrift.protocol.TField ADD_TAGS_FIELD_DESC = new org.apache.thrift.protocol.TField("addTags", org.apache.thrift.protocol.TType.LIST, (short)8);
   private static final org.apache.thrift.protocol.TField REM_TAGS_FIELD_DESC = new org.apache.thrift.protocol.TField("remTags", org.apache.thrift.protocol.TType.LIST, (short)9);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new ImageBaseWriteStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new ImageBaseWriteTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ImageBaseWriteStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ImageBaseWriteTupleSchemeFactory();
 
-  public String imageName; // required
-  public String description; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String imageName; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String description; // required
   public int osId; // required
-  public String virtId; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String virtId; // required
   public boolean isTemplate; // required
-  public ImagePermissions defaultPermissions; // required
+  public @org.apache.thrift.annotation.Nullable ImagePermissions defaultPermissions; // required
   /**
    * 
    * @see ShareMode
    */
-  public ShareMode shareMode; // required
-  public List<String> addTags; // optional
-  public List<String> remTags; // optional
+  public @org.apache.thrift.annotation.Nullable ShareMode shareMode; // required
+  public @org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> addTags; // optional
+  public @org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> remTags; // optional
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -84,10 +54,10 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
     ADD_TAGS((short)8, "addTags"),
     REM_TAGS((short)9, "remTags");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -95,6 +65,7 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
     /**
      * Find the _Fields constant that matches fieldId, or null if its not found.
      */
+    @org.apache.thrift.annotation.Nullable
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
         case 1: // IMAGE_NAME
@@ -126,21 +97,22 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    @org.apache.thrift.annotation.Nullable
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -149,7 +121,7 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -159,9 +131,9 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
   private static final int __ISTEMPLATE_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.ADD_TAGS,_Fields.REM_TAGS};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.IMAGE_NAME, new org.apache.thrift.meta_data.FieldMetaData("imageName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.DESCRIPTION, new org.apache.thrift.meta_data.FieldMetaData("description", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -182,7 +154,7 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
     tmpMap.put(_Fields.REM_TAGS, new org.apache.thrift.meta_data.FieldMetaData("remTags", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
             new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ImageBaseWrite.class, metaDataMap);
   }
 
@@ -190,10 +162,10 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
   }
 
   public ImageBaseWrite(
-    String imageName,
-    String description,
+    java.lang.String imageName,
+    java.lang.String description,
     int osId,
-    String virtId,
+    java.lang.String virtId,
     boolean isTemplate,
     ImagePermissions defaultPermissions,
     ShareMode shareMode)
@@ -233,11 +205,11 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
       this.shareMode = other.shareMode;
     }
     if (other.isSetAddTags()) {
-      List<String> __this__addTags = new ArrayList<String>(other.addTags);
+      java.util.List<java.lang.String> __this__addTags = new java.util.ArrayList<java.lang.String>(other.addTags);
       this.addTags = __this__addTags;
     }
     if (other.isSetRemTags()) {
-      List<String> __this__remTags = new ArrayList<String>(other.remTags);
+      java.util.List<java.lang.String> __this__remTags = new java.util.ArrayList<java.lang.String>(other.remTags);
       this.remTags = __this__remTags;
     }
   }
@@ -261,11 +233,12 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
     this.remTags = null;
   }
 
-  public String getImageName() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getImageName() {
     return this.imageName;
   }
 
-  public ImageBaseWrite setImageName(String imageName) {
+  public ImageBaseWrite setImageName(@org.apache.thrift.annotation.Nullable java.lang.String imageName) {
     this.imageName = imageName;
     return this;
   }
@@ -285,11 +258,12 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
     }
   }
 
-  public String getDescription() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getDescription() {
     return this.description;
   }
 
-  public ImageBaseWrite setDescription(String description) {
+  public ImageBaseWrite setDescription(@org.apache.thrift.annotation.Nullable java.lang.String description) {
     this.description = description;
     return this;
   }
@@ -320,23 +294,24 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
   }
 
   public void unsetOsId() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __OSID_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __OSID_ISSET_ID);
   }
 
   /** Returns true if field osId is set (has been assigned a value) and false otherwise */
   public boolean isSetOsId() {
-    return EncodingUtils.testBit(__isset_bitfield, __OSID_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __OSID_ISSET_ID);
   }
 
   public void setOsIdIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __OSID_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __OSID_ISSET_ID, value);
   }
 
-  public String getVirtId() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getVirtId() {
     return this.virtId;
   }
 
-  public ImageBaseWrite setVirtId(String virtId) {
+  public ImageBaseWrite setVirtId(@org.apache.thrift.annotation.Nullable java.lang.String virtId) {
     this.virtId = virtId;
     return this;
   }
@@ -367,23 +342,24 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
   }
 
   public void unsetIsTemplate() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISTEMPLATE_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ISTEMPLATE_ISSET_ID);
   }
 
   /** Returns true if field isTemplate is set (has been assigned a value) and false otherwise */
   public boolean isSetIsTemplate() {
-    return EncodingUtils.testBit(__isset_bitfield, __ISTEMPLATE_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ISTEMPLATE_ISSET_ID);
   }
 
   public void setIsTemplateIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISTEMPLATE_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ISTEMPLATE_ISSET_ID, value);
   }
 
+  @org.apache.thrift.annotation.Nullable
   public ImagePermissions getDefaultPermissions() {
     return this.defaultPermissions;
   }
 
-  public ImageBaseWrite setDefaultPermissions(ImagePermissions defaultPermissions) {
+  public ImageBaseWrite setDefaultPermissions(@org.apache.thrift.annotation.Nullable ImagePermissions defaultPermissions) {
     this.defaultPermissions = defaultPermissions;
     return this;
   }
@@ -407,6 +383,7 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
    * 
    * @see ShareMode
    */
+  @org.apache.thrift.annotation.Nullable
   public ShareMode getShareMode() {
     return this.shareMode;
   }
@@ -415,7 +392,7 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
    * 
    * @see ShareMode
    */
-  public ImageBaseWrite setShareMode(ShareMode shareMode) {
+  public ImageBaseWrite setShareMode(@org.apache.thrift.annotation.Nullable ShareMode shareMode) {
     this.shareMode = shareMode;
     return this;
   }
@@ -439,22 +416,24 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
     return (this.addTags == null) ? 0 : this.addTags.size();
   }
 
-  public java.util.Iterator<String> getAddTagsIterator() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.Iterator<java.lang.String> getAddTagsIterator() {
     return (this.addTags == null) ? null : this.addTags.iterator();
   }
 
-  public void addToAddTags(String elem) {
+  public void addToAddTags(java.lang.String elem) {
     if (this.addTags == null) {
-      this.addTags = new ArrayList<String>();
+      this.addTags = new java.util.ArrayList<java.lang.String>();
     }
     this.addTags.add(elem);
   }
 
-  public List<String> getAddTags() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.List<java.lang.String> getAddTags() {
     return this.addTags;
   }
 
-  public ImageBaseWrite setAddTags(List<String> addTags) {
+  public ImageBaseWrite setAddTags(@org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> addTags) {
     this.addTags = addTags;
     return this;
   }
@@ -478,22 +457,24 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
     return (this.remTags == null) ? 0 : this.remTags.size();
   }
 
-  public java.util.Iterator<String> getRemTagsIterator() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.Iterator<java.lang.String> getRemTagsIterator() {
     return (this.remTags == null) ? null : this.remTags.iterator();
   }
 
-  public void addToRemTags(String elem) {
+  public void addToRemTags(java.lang.String elem) {
     if (this.remTags == null) {
-      this.remTags = new ArrayList<String>();
+      this.remTags = new java.util.ArrayList<java.lang.String>();
     }
     this.remTags.add(elem);
   }
 
-  public List<String> getRemTags() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.List<java.lang.String> getRemTags() {
     return this.remTags;
   }
 
-  public ImageBaseWrite setRemTags(List<String> remTags) {
+  public ImageBaseWrite setRemTags(@org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> remTags) {
     this.remTags = remTags;
     return this;
   }
@@ -513,13 +494,13 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case IMAGE_NAME:
       if (value == null) {
         unsetImageName();
       } else {
-        setImageName((String)value);
+        setImageName((java.lang.String)value);
       }
       break;
 
@@ -527,7 +508,7 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
       if (value == null) {
         unsetDescription();
       } else {
-        setDescription((String)value);
+        setDescription((java.lang.String)value);
       }
       break;
 
@@ -535,7 +516,7 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
       if (value == null) {
         unsetOsId();
       } else {
-        setOsId((Integer)value);
+        setOsId((java.lang.Integer)value);
       }
       break;
 
@@ -543,7 +524,7 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
       if (value == null) {
         unsetVirtId();
       } else {
-        setVirtId((String)value);
+        setVirtId((java.lang.String)value);
       }
       break;
 
@@ -551,7 +532,7 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
       if (value == null) {
         unsetIsTemplate();
       } else {
-        setIsTemplate((Boolean)value);
+        setIsTemplate((java.lang.Boolean)value);
       }
       break;
 
@@ -575,7 +556,7 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
       if (value == null) {
         unsetAddTags();
       } else {
-        setAddTags((List<String>)value);
+        setAddTags((java.util.List<java.lang.String>)value);
       }
       break;
 
@@ -583,14 +564,15 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
       if (value == null) {
         unsetRemTags();
       } else {
-        setRemTags((List<String>)value);
+        setRemTags((java.util.List<java.lang.String>)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case IMAGE_NAME:
       return getImageName();
@@ -620,13 +602,13 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
       return getRemTags();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -649,13 +631,11 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
     case REM_TAGS:
       return isSetRemTags();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
+  public boolean equals(java.lang.Object that) {
     if (that instanceof ImageBaseWrite)
       return this.equals((ImageBaseWrite)that);
     return false;
@@ -664,6 +644,8 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
   public boolean equals(ImageBaseWrite that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_imageName = true && this.isSetImageName();
     boolean that_present_imageName = true && that.isSetImageName();
@@ -751,54 +733,41 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_imageName = true && (isSetImageName());
-    list.add(present_imageName);
-    if (present_imageName)
-      list.add(imageName);
+    hashCode = hashCode * 8191 + ((isSetImageName()) ? 131071 : 524287);
+    if (isSetImageName())
+      hashCode = hashCode * 8191 + imageName.hashCode();
 
-    boolean present_description = true && (isSetDescription());
-    list.add(present_description);
-    if (present_description)
-      list.add(description);
+    hashCode = hashCode * 8191 + ((isSetDescription()) ? 131071 : 524287);
+    if (isSetDescription())
+      hashCode = hashCode * 8191 + description.hashCode();
 
-    boolean present_osId = true;
-    list.add(present_osId);
-    if (present_osId)
-      list.add(osId);
+    hashCode = hashCode * 8191 + osId;
 
-    boolean present_virtId = true && (isSetVirtId());
-    list.add(present_virtId);
-    if (present_virtId)
-      list.add(virtId);
+    hashCode = hashCode * 8191 + ((isSetVirtId()) ? 131071 : 524287);
+    if (isSetVirtId())
+      hashCode = hashCode * 8191 + virtId.hashCode();
 
-    boolean present_isTemplate = true;
-    list.add(present_isTemplate);
-    if (present_isTemplate)
-      list.add(isTemplate);
+    hashCode = hashCode * 8191 + ((isTemplate) ? 131071 : 524287);
 
-    boolean present_defaultPermissions = true && (isSetDefaultPermissions());
-    list.add(present_defaultPermissions);
-    if (present_defaultPermissions)
-      list.add(defaultPermissions);
+    hashCode = hashCode * 8191 + ((isSetDefaultPermissions()) ? 131071 : 524287);
+    if (isSetDefaultPermissions())
+      hashCode = hashCode * 8191 + defaultPermissions.hashCode();
 
-    boolean present_shareMode = true && (isSetShareMode());
-    list.add(present_shareMode);
-    if (present_shareMode)
-      list.add(shareMode.getValue());
+    hashCode = hashCode * 8191 + ((isSetShareMode()) ? 131071 : 524287);
+    if (isSetShareMode())
+      hashCode = hashCode * 8191 + shareMode.getValue();
 
-    boolean present_addTags = true && (isSetAddTags());
-    list.add(present_addTags);
-    if (present_addTags)
-      list.add(addTags);
+    hashCode = hashCode * 8191 + ((isSetAddTags()) ? 131071 : 524287);
+    if (isSetAddTags())
+      hashCode = hashCode * 8191 + addTags.hashCode();
 
-    boolean present_remTags = true && (isSetRemTags());
-    list.add(present_remTags);
-    if (present_remTags)
-      list.add(remTags);
+    hashCode = hashCode * 8191 + ((isSetRemTags()) ? 131071 : 524287);
+    if (isSetRemTags())
+      hashCode = hashCode * 8191 + remTags.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -809,7 +778,7 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetImageName()).compareTo(other.isSetImageName());
+    lastComparison = java.lang.Boolean.compare(isSetImageName(), other.isSetImageName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -819,7 +788,7 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetDescription()).compareTo(other.isSetDescription());
+    lastComparison = java.lang.Boolean.compare(isSetDescription(), other.isSetDescription());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -829,7 +798,7 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetOsId()).compareTo(other.isSetOsId());
+    lastComparison = java.lang.Boolean.compare(isSetOsId(), other.isSetOsId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -839,7 +808,7 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetVirtId()).compareTo(other.isSetVirtId());
+    lastComparison = java.lang.Boolean.compare(isSetVirtId(), other.isSetVirtId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -849,7 +818,7 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetIsTemplate()).compareTo(other.isSetIsTemplate());
+    lastComparison = java.lang.Boolean.compare(isSetIsTemplate(), other.isSetIsTemplate());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -859,7 +828,7 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetDefaultPermissions()).compareTo(other.isSetDefaultPermissions());
+    lastComparison = java.lang.Boolean.compare(isSetDefaultPermissions(), other.isSetDefaultPermissions());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -869,7 +838,7 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetShareMode()).compareTo(other.isSetShareMode());
+    lastComparison = java.lang.Boolean.compare(isSetShareMode(), other.isSetShareMode());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -879,7 +848,7 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetAddTags()).compareTo(other.isSetAddTags());
+    lastComparison = java.lang.Boolean.compare(isSetAddTags(), other.isSetAddTags());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -889,7 +858,7 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetRemTags()).compareTo(other.isSetRemTags());
+    lastComparison = java.lang.Boolean.compare(isSetRemTags(), other.isSetRemTags());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -902,21 +871,22 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
     return 0;
   }
 
+  @org.apache.thrift.annotation.Nullable
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("ImageBaseWrite(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("ImageBaseWrite(");
     boolean first = true;
 
     sb.append("imageName:");
@@ -1006,7 +976,7 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -1016,13 +986,13 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
     }
   }
 
-  private static class ImageBaseWriteStandardSchemeFactory implements SchemeFactory {
+  private static class ImageBaseWriteStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public ImageBaseWriteStandardScheme getScheme() {
       return new ImageBaseWriteStandardScheme();
     }
   }
 
-  private static class ImageBaseWriteStandardScheme extends StandardScheme<ImageBaseWrite> {
+  private static class ImageBaseWriteStandardScheme extends org.apache.thrift.scheme.StandardScheme<ImageBaseWrite> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, ImageBaseWrite struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -1095,8 +1065,8 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list34 = iprot.readListBegin();
-                struct.addTags = new ArrayList<String>(_list34.size);
-                String _elem35;
+                struct.addTags = new java.util.ArrayList<java.lang.String>(_list34.size);
+                @org.apache.thrift.annotation.Nullable java.lang.String _elem35;
                 for (int _i36 = 0; _i36 < _list34.size; ++_i36)
                 {
                   _elem35 = iprot.readString();
@@ -1113,8 +1083,8 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list37 = iprot.readListBegin();
-                struct.remTags = new ArrayList<String>(_list37.size);
-                String _elem38;
+                struct.remTags = new java.util.ArrayList<java.lang.String>(_list37.size);
+                @org.apache.thrift.annotation.Nullable java.lang.String _elem38;
                 for (int _i39 = 0; _i39 < _list37.size; ++_i39)
                 {
                   _elem38 = iprot.readString();
@@ -1178,7 +1148,7 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
           oprot.writeFieldBegin(ADD_TAGS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.addTags.size()));
-            for (String _iter40 : struct.addTags)
+            for (java.lang.String _iter40 : struct.addTags)
             {
               oprot.writeString(_iter40);
             }
@@ -1192,7 +1162,7 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
           oprot.writeFieldBegin(REM_TAGS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.remTags.size()));
-            for (String _iter41 : struct.remTags)
+            for (java.lang.String _iter41 : struct.remTags)
             {
               oprot.writeString(_iter41);
             }
@@ -1207,18 +1177,18 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
 
   }
 
-  private static class ImageBaseWriteTupleSchemeFactory implements SchemeFactory {
+  private static class ImageBaseWriteTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public ImageBaseWriteTupleScheme getScheme() {
       return new ImageBaseWriteTupleScheme();
     }
   }
 
-  private static class ImageBaseWriteTupleScheme extends TupleScheme<ImageBaseWrite> {
+  private static class ImageBaseWriteTupleScheme extends org.apache.thrift.scheme.TupleScheme<ImageBaseWrite> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, ImageBaseWrite struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetImageName()) {
         optionals.set(0);
       }
@@ -1271,7 +1241,7 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
       if (struct.isSetAddTags()) {
         {
           oprot.writeI32(struct.addTags.size());
-          for (String _iter42 : struct.addTags)
+          for (java.lang.String _iter42 : struct.addTags)
           {
             oprot.writeString(_iter42);
           }
@@ -1280,7 +1250,7 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
       if (struct.isSetRemTags()) {
         {
           oprot.writeI32(struct.remTags.size());
-          for (String _iter43 : struct.remTags)
+          for (java.lang.String _iter43 : struct.remTags)
           {
             oprot.writeString(_iter43);
           }
@@ -1290,8 +1260,8 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, ImageBaseWrite struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(9);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(9);
       if (incoming.get(0)) {
         struct.imageName = iprot.readString();
         struct.setImageNameIsSet(true);
@@ -1323,9 +1293,9 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
       }
       if (incoming.get(7)) {
         {
-          org.apache.thrift.protocol.TList _list44 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.addTags = new ArrayList<String>(_list44.size);
-          String _elem45;
+          org.apache.thrift.protocol.TList _list44 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+          struct.addTags = new java.util.ArrayList<java.lang.String>(_list44.size);
+          @org.apache.thrift.annotation.Nullable java.lang.String _elem45;
           for (int _i46 = 0; _i46 < _list44.size; ++_i46)
           {
             _elem45 = iprot.readString();
@@ -1336,9 +1306,9 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
       }
       if (incoming.get(8)) {
         {
-          org.apache.thrift.protocol.TList _list47 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.remTags = new ArrayList<String>(_list47.size);
-          String _elem48;
+          org.apache.thrift.protocol.TList _list47 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+          struct.remTags = new java.util.ArrayList<java.lang.String>(_list47.size);
+          @org.apache.thrift.annotation.Nullable java.lang.String _elem48;
           for (int _i49 = 0; _i49 < _list47.size; ++_i49)
           {
             _elem48 = iprot.readString();
@@ -1350,5 +1320,8 @@ public class ImageBaseWrite implements org.apache.thrift.TBase<ImageBaseWrite, I
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/ImageDetailsRead.java b/src/main/java/org/openslx/bwlp/thrift/iface/ImageDetailsRead.java
index e4e7eac..62e6854 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/ImageDetailsRead.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/ImageDetailsRead.java
@@ -1,40 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.openslx.bwlp.thrift.iface;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
 public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRead, ImageDetailsRead._Fields>, java.io.Serializable, Cloneable, Comparable<ImageDetailsRead> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ImageDetailsRead");
 
@@ -55,32 +28,29 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
   private static final org.apache.thrift.protocol.TField DEFAULT_PERMISSIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("defaultPermissions", org.apache.thrift.protocol.TType.STRUCT, (short)16);
   private static final org.apache.thrift.protocol.TField USER_PERMISSIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("userPermissions", org.apache.thrift.protocol.TType.STRUCT, (short)18);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new ImageDetailsReadStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new ImageDetailsReadTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ImageDetailsReadStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ImageDetailsReadTupleSchemeFactory();
 
-  public String imageBaseId; // required
-  public String latestVersionId; // required
-  public List<ImageVersionDetails> versions; // required
-  public String imageName; // required
-  public String description; // required
-  public List<String> tags; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String imageBaseId; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String latestVersionId; // required
+  public @org.apache.thrift.annotation.Nullable java.util.List<ImageVersionDetails> versions; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String imageName; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String description; // required
+  public @org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> tags; // required
   public int osId; // required
-  public String virtId; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String virtId; // required
   public long createTime; // required
   public long updateTime; // required
-  public String ownerId; // required
-  public String updaterId; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String ownerId; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String updaterId; // required
   /**
    * 
    * @see ShareMode
    */
-  public ShareMode shareMode; // required
+  public @org.apache.thrift.annotation.Nullable ShareMode shareMode; // required
   public boolean isTemplate; // required
-  public ImagePermissions defaultPermissions; // required
-  public ImagePermissions userPermissions; // optional
+  public @org.apache.thrift.annotation.Nullable ImagePermissions defaultPermissions; // required
+  public @org.apache.thrift.annotation.Nullable ImagePermissions userPermissions; // optional
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -105,10 +75,10 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
     DEFAULT_PERMISSIONS((short)16, "defaultPermissions"),
     USER_PERMISSIONS((short)18, "userPermissions");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -116,6 +86,7 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
     /**
      * Find the _Fields constant that matches fieldId, or null if its not found.
      */
+    @org.apache.thrift.annotation.Nullable
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
         case 1: // IMAGE_BASE_ID
@@ -161,21 +132,22 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    @org.apache.thrift.annotation.Nullable
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -184,7 +156,7 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -196,9 +168,9 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
   private static final int __ISTEMPLATE_ISSET_ID = 3;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.USER_PERMISSIONS};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.IMAGE_BASE_ID, new org.apache.thrift.meta_data.FieldMetaData("imageBaseId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , "UUID")));
     tmpMap.put(_Fields.LATEST_VERSION_ID, new org.apache.thrift.meta_data.FieldMetaData("latestVersionId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -233,7 +205,7 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
         new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ImagePermissions.class)));
     tmpMap.put(_Fields.USER_PERMISSIONS, new org.apache.thrift.meta_data.FieldMetaData("userPermissions", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ImagePermissions.class)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ImageDetailsRead.class, metaDataMap);
   }
 
@@ -241,18 +213,18 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
   }
 
   public ImageDetailsRead(
-    String imageBaseId,
-    String latestVersionId,
-    List<ImageVersionDetails> versions,
-    String imageName,
-    String description,
-    List<String> tags,
+    java.lang.String imageBaseId,
+    java.lang.String latestVersionId,
+    java.util.List<ImageVersionDetails> versions,
+    java.lang.String imageName,
+    java.lang.String description,
+    java.util.List<java.lang.String> tags,
     int osId,
-    String virtId,
+    java.lang.String virtId,
     long createTime,
     long updateTime,
-    String ownerId,
-    String updaterId,
+    java.lang.String ownerId,
+    java.lang.String updaterId,
     ShareMode shareMode,
     boolean isTemplate,
     ImagePermissions defaultPermissions)
@@ -291,7 +263,7 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
       this.latestVersionId = other.latestVersionId;
     }
     if (other.isSetVersions()) {
-      List<ImageVersionDetails> __this__versions = new ArrayList<ImageVersionDetails>(other.versions.size());
+      java.util.List<ImageVersionDetails> __this__versions = new java.util.ArrayList<ImageVersionDetails>(other.versions.size());
       for (ImageVersionDetails other_element : other.versions) {
         __this__versions.add(new ImageVersionDetails(other_element));
       }
@@ -304,7 +276,7 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
       this.description = other.description;
     }
     if (other.isSetTags()) {
-      List<String> __this__tags = new ArrayList<String>(other.tags);
+      java.util.List<java.lang.String> __this__tags = new java.util.ArrayList<java.lang.String>(other.tags);
       this.tags = __this__tags;
     }
     this.osId = other.osId;
@@ -359,11 +331,12 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
     this.userPermissions = null;
   }
 
-  public String getImageBaseId() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getImageBaseId() {
     return this.imageBaseId;
   }
 
-  public ImageDetailsRead setImageBaseId(String imageBaseId) {
+  public ImageDetailsRead setImageBaseId(@org.apache.thrift.annotation.Nullable java.lang.String imageBaseId) {
     this.imageBaseId = imageBaseId;
     return this;
   }
@@ -383,11 +356,12 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
     }
   }
 
-  public String getLatestVersionId() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getLatestVersionId() {
     return this.latestVersionId;
   }
 
-  public ImageDetailsRead setLatestVersionId(String latestVersionId) {
+  public ImageDetailsRead setLatestVersionId(@org.apache.thrift.annotation.Nullable java.lang.String latestVersionId) {
     this.latestVersionId = latestVersionId;
     return this;
   }
@@ -411,22 +385,24 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
     return (this.versions == null) ? 0 : this.versions.size();
   }
 
+  @org.apache.thrift.annotation.Nullable
   public java.util.Iterator<ImageVersionDetails> getVersionsIterator() {
     return (this.versions == null) ? null : this.versions.iterator();
   }
 
   public void addToVersions(ImageVersionDetails elem) {
     if (this.versions == null) {
-      this.versions = new ArrayList<ImageVersionDetails>();
+      this.versions = new java.util.ArrayList<ImageVersionDetails>();
     }
     this.versions.add(elem);
   }
 
-  public List<ImageVersionDetails> getVersions() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.List<ImageVersionDetails> getVersions() {
     return this.versions;
   }
 
-  public ImageDetailsRead setVersions(List<ImageVersionDetails> versions) {
+  public ImageDetailsRead setVersions(@org.apache.thrift.annotation.Nullable java.util.List<ImageVersionDetails> versions) {
     this.versions = versions;
     return this;
   }
@@ -446,11 +422,12 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
     }
   }
 
-  public String getImageName() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getImageName() {
     return this.imageName;
   }
 
-  public ImageDetailsRead setImageName(String imageName) {
+  public ImageDetailsRead setImageName(@org.apache.thrift.annotation.Nullable java.lang.String imageName) {
     this.imageName = imageName;
     return this;
   }
@@ -470,11 +447,12 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
     }
   }
 
-  public String getDescription() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getDescription() {
     return this.description;
   }
 
-  public ImageDetailsRead setDescription(String description) {
+  public ImageDetailsRead setDescription(@org.apache.thrift.annotation.Nullable java.lang.String description) {
     this.description = description;
     return this;
   }
@@ -498,22 +476,24 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
     return (this.tags == null) ? 0 : this.tags.size();
   }
 
-  public java.util.Iterator<String> getTagsIterator() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.Iterator<java.lang.String> getTagsIterator() {
     return (this.tags == null) ? null : this.tags.iterator();
   }
 
-  public void addToTags(String elem) {
+  public void addToTags(java.lang.String elem) {
     if (this.tags == null) {
-      this.tags = new ArrayList<String>();
+      this.tags = new java.util.ArrayList<java.lang.String>();
     }
     this.tags.add(elem);
   }
 
-  public List<String> getTags() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.List<java.lang.String> getTags() {
     return this.tags;
   }
 
-  public ImageDetailsRead setTags(List<String> tags) {
+  public ImageDetailsRead setTags(@org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> tags) {
     this.tags = tags;
     return this;
   }
@@ -544,23 +524,24 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
   }
 
   public void unsetOsId() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __OSID_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __OSID_ISSET_ID);
   }
 
   /** Returns true if field osId is set (has been assigned a value) and false otherwise */
   public boolean isSetOsId() {
-    return EncodingUtils.testBit(__isset_bitfield, __OSID_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __OSID_ISSET_ID);
   }
 
   public void setOsIdIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __OSID_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __OSID_ISSET_ID, value);
   }
 
-  public String getVirtId() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getVirtId() {
     return this.virtId;
   }
 
-  public ImageDetailsRead setVirtId(String virtId) {
+  public ImageDetailsRead setVirtId(@org.apache.thrift.annotation.Nullable java.lang.String virtId) {
     this.virtId = virtId;
     return this;
   }
@@ -591,16 +572,16 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
   }
 
   public void unsetCreateTime() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __CREATETIME_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __CREATETIME_ISSET_ID);
   }
 
   /** Returns true if field createTime is set (has been assigned a value) and false otherwise */
   public boolean isSetCreateTime() {
-    return EncodingUtils.testBit(__isset_bitfield, __CREATETIME_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __CREATETIME_ISSET_ID);
   }
 
   public void setCreateTimeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __CREATETIME_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __CREATETIME_ISSET_ID, value);
   }
 
   public long getUpdateTime() {
@@ -614,23 +595,24 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
   }
 
   public void unsetUpdateTime() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __UPDATETIME_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __UPDATETIME_ISSET_ID);
   }
 
   /** Returns true if field updateTime is set (has been assigned a value) and false otherwise */
   public boolean isSetUpdateTime() {
-    return EncodingUtils.testBit(__isset_bitfield, __UPDATETIME_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __UPDATETIME_ISSET_ID);
   }
 
   public void setUpdateTimeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __UPDATETIME_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __UPDATETIME_ISSET_ID, value);
   }
 
-  public String getOwnerId() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getOwnerId() {
     return this.ownerId;
   }
 
-  public ImageDetailsRead setOwnerId(String ownerId) {
+  public ImageDetailsRead setOwnerId(@org.apache.thrift.annotation.Nullable java.lang.String ownerId) {
     this.ownerId = ownerId;
     return this;
   }
@@ -650,11 +632,12 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
     }
   }
 
-  public String getUpdaterId() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getUpdaterId() {
     return this.updaterId;
   }
 
-  public ImageDetailsRead setUpdaterId(String updaterId) {
+  public ImageDetailsRead setUpdaterId(@org.apache.thrift.annotation.Nullable java.lang.String updaterId) {
     this.updaterId = updaterId;
     return this;
   }
@@ -678,6 +661,7 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
    * 
    * @see ShareMode
    */
+  @org.apache.thrift.annotation.Nullable
   public ShareMode getShareMode() {
     return this.shareMode;
   }
@@ -686,7 +670,7 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
    * 
    * @see ShareMode
    */
-  public ImageDetailsRead setShareMode(ShareMode shareMode) {
+  public ImageDetailsRead setShareMode(@org.apache.thrift.annotation.Nullable ShareMode shareMode) {
     this.shareMode = shareMode;
     return this;
   }
@@ -717,23 +701,24 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
   }
 
   public void unsetIsTemplate() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISTEMPLATE_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ISTEMPLATE_ISSET_ID);
   }
 
   /** Returns true if field isTemplate is set (has been assigned a value) and false otherwise */
   public boolean isSetIsTemplate() {
-    return EncodingUtils.testBit(__isset_bitfield, __ISTEMPLATE_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ISTEMPLATE_ISSET_ID);
   }
 
   public void setIsTemplateIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISTEMPLATE_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ISTEMPLATE_ISSET_ID, value);
   }
 
+  @org.apache.thrift.annotation.Nullable
   public ImagePermissions getDefaultPermissions() {
     return this.defaultPermissions;
   }
 
-  public ImageDetailsRead setDefaultPermissions(ImagePermissions defaultPermissions) {
+  public ImageDetailsRead setDefaultPermissions(@org.apache.thrift.annotation.Nullable ImagePermissions defaultPermissions) {
     this.defaultPermissions = defaultPermissions;
     return this;
   }
@@ -753,11 +738,12 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
     }
   }
 
+  @org.apache.thrift.annotation.Nullable
   public ImagePermissions getUserPermissions() {
     return this.userPermissions;
   }
 
-  public ImageDetailsRead setUserPermissions(ImagePermissions userPermissions) {
+  public ImageDetailsRead setUserPermissions(@org.apache.thrift.annotation.Nullable ImagePermissions userPermissions) {
     this.userPermissions = userPermissions;
     return this;
   }
@@ -777,13 +763,13 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case IMAGE_BASE_ID:
       if (value == null) {
         unsetImageBaseId();
       } else {
-        setImageBaseId((String)value);
+        setImageBaseId((java.lang.String)value);
       }
       break;
 
@@ -791,7 +777,7 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
       if (value == null) {
         unsetLatestVersionId();
       } else {
-        setLatestVersionId((String)value);
+        setLatestVersionId((java.lang.String)value);
       }
       break;
 
@@ -799,7 +785,7 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
       if (value == null) {
         unsetVersions();
       } else {
-        setVersions((List<ImageVersionDetails>)value);
+        setVersions((java.util.List<ImageVersionDetails>)value);
       }
       break;
 
@@ -807,7 +793,7 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
       if (value == null) {
         unsetImageName();
       } else {
-        setImageName((String)value);
+        setImageName((java.lang.String)value);
       }
       break;
 
@@ -815,7 +801,7 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
       if (value == null) {
         unsetDescription();
       } else {
-        setDescription((String)value);
+        setDescription((java.lang.String)value);
       }
       break;
 
@@ -823,7 +809,7 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
       if (value == null) {
         unsetTags();
       } else {
-        setTags((List<String>)value);
+        setTags((java.util.List<java.lang.String>)value);
       }
       break;
 
@@ -831,7 +817,7 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
       if (value == null) {
         unsetOsId();
       } else {
-        setOsId((Integer)value);
+        setOsId((java.lang.Integer)value);
       }
       break;
 
@@ -839,7 +825,7 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
       if (value == null) {
         unsetVirtId();
       } else {
-        setVirtId((String)value);
+        setVirtId((java.lang.String)value);
       }
       break;
 
@@ -847,7 +833,7 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
       if (value == null) {
         unsetCreateTime();
       } else {
-        setCreateTime((Long)value);
+        setCreateTime((java.lang.Long)value);
       }
       break;
 
@@ -855,7 +841,7 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
       if (value == null) {
         unsetUpdateTime();
       } else {
-        setUpdateTime((Long)value);
+        setUpdateTime((java.lang.Long)value);
       }
       break;
 
@@ -863,7 +849,7 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
       if (value == null) {
         unsetOwnerId();
       } else {
-        setOwnerId((String)value);
+        setOwnerId((java.lang.String)value);
       }
       break;
 
@@ -871,7 +857,7 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
       if (value == null) {
         unsetUpdaterId();
       } else {
-        setUpdaterId((String)value);
+        setUpdaterId((java.lang.String)value);
       }
       break;
 
@@ -887,7 +873,7 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
       if (value == null) {
         unsetIsTemplate();
       } else {
-        setIsTemplate((Boolean)value);
+        setIsTemplate((java.lang.Boolean)value);
       }
       break;
 
@@ -910,7 +896,8 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case IMAGE_BASE_ID:
       return getImageBaseId();
@@ -961,13 +948,13 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
       return getUserPermissions();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -1004,13 +991,11 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
     case USER_PERMISSIONS:
       return isSetUserPermissions();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
+  public boolean equals(java.lang.Object that) {
     if (that instanceof ImageDetailsRead)
       return this.equals((ImageDetailsRead)that);
     return false;
@@ -1019,6 +1004,8 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
   public boolean equals(ImageDetailsRead that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_imageBaseId = true && this.isSetImageBaseId();
     boolean that_present_imageBaseId = true && that.isSetImageBaseId();
@@ -1169,89 +1156,65 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_imageBaseId = true && (isSetImageBaseId());
-    list.add(present_imageBaseId);
-    if (present_imageBaseId)
-      list.add(imageBaseId);
-
-    boolean present_latestVersionId = true && (isSetLatestVersionId());
-    list.add(present_latestVersionId);
-    if (present_latestVersionId)
-      list.add(latestVersionId);
-
-    boolean present_versions = true && (isSetVersions());
-    list.add(present_versions);
-    if (present_versions)
-      list.add(versions);
-
-    boolean present_imageName = true && (isSetImageName());
-    list.add(present_imageName);
-    if (present_imageName)
-      list.add(imageName);
-
-    boolean present_description = true && (isSetDescription());
-    list.add(present_description);
-    if (present_description)
-      list.add(description);
-
-    boolean present_tags = true && (isSetTags());
-    list.add(present_tags);
-    if (present_tags)
-      list.add(tags);
-
-    boolean present_osId = true;
-    list.add(present_osId);
-    if (present_osId)
-      list.add(osId);
-
-    boolean present_virtId = true && (isSetVirtId());
-    list.add(present_virtId);
-    if (present_virtId)
-      list.add(virtId);
-
-    boolean present_createTime = true;
-    list.add(present_createTime);
-    if (present_createTime)
-      list.add(createTime);
-
-    boolean present_updateTime = true;
-    list.add(present_updateTime);
-    if (present_updateTime)
-      list.add(updateTime);
-
-    boolean present_ownerId = true && (isSetOwnerId());
-    list.add(present_ownerId);
-    if (present_ownerId)
-      list.add(ownerId);
-
-    boolean present_updaterId = true && (isSetUpdaterId());
-    list.add(present_updaterId);
-    if (present_updaterId)
-      list.add(updaterId);
-
-    boolean present_shareMode = true && (isSetShareMode());
-    list.add(present_shareMode);
-    if (present_shareMode)
-      list.add(shareMode.getValue());
-
-    boolean present_isTemplate = true;
-    list.add(present_isTemplate);
-    if (present_isTemplate)
-      list.add(isTemplate);
-
-    boolean present_defaultPermissions = true && (isSetDefaultPermissions());
-    list.add(present_defaultPermissions);
-    if (present_defaultPermissions)
-      list.add(defaultPermissions);
-
-    boolean present_userPermissions = true && (isSetUserPermissions());
-    list.add(present_userPermissions);
-    if (present_userPermissions)
-      list.add(userPermissions);
-
-    return list.hashCode();
+    int hashCode = 1;
+
+    hashCode = hashCode * 8191 + ((isSetImageBaseId()) ? 131071 : 524287);
+    if (isSetImageBaseId())
+      hashCode = hashCode * 8191 + imageBaseId.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetLatestVersionId()) ? 131071 : 524287);
+    if (isSetLatestVersionId())
+      hashCode = hashCode * 8191 + latestVersionId.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetVersions()) ? 131071 : 524287);
+    if (isSetVersions())
+      hashCode = hashCode * 8191 + versions.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetImageName()) ? 131071 : 524287);
+    if (isSetImageName())
+      hashCode = hashCode * 8191 + imageName.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetDescription()) ? 131071 : 524287);
+    if (isSetDescription())
+      hashCode = hashCode * 8191 + description.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetTags()) ? 131071 : 524287);
+    if (isSetTags())
+      hashCode = hashCode * 8191 + tags.hashCode();
+
+    hashCode = hashCode * 8191 + osId;
+
+    hashCode = hashCode * 8191 + ((isSetVirtId()) ? 131071 : 524287);
+    if (isSetVirtId())
+      hashCode = hashCode * 8191 + virtId.hashCode();
+
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(createTime);
+
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(updateTime);
+
+    hashCode = hashCode * 8191 + ((isSetOwnerId()) ? 131071 : 524287);
+    if (isSetOwnerId())
+      hashCode = hashCode * 8191 + ownerId.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetUpdaterId()) ? 131071 : 524287);
+    if (isSetUpdaterId())
+      hashCode = hashCode * 8191 + updaterId.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetShareMode()) ? 131071 : 524287);
+    if (isSetShareMode())
+      hashCode = hashCode * 8191 + shareMode.getValue();
+
+    hashCode = hashCode * 8191 + ((isTemplate) ? 131071 : 524287);
+
+    hashCode = hashCode * 8191 + ((isSetDefaultPermissions()) ? 131071 : 524287);
+    if (isSetDefaultPermissions())
+      hashCode = hashCode * 8191 + defaultPermissions.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetUserPermissions()) ? 131071 : 524287);
+    if (isSetUserPermissions())
+      hashCode = hashCode * 8191 + userPermissions.hashCode();
+
+    return hashCode;
   }
 
   @Override
@@ -1262,7 +1225,7 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetImageBaseId()).compareTo(other.isSetImageBaseId());
+    lastComparison = java.lang.Boolean.compare(isSetImageBaseId(), other.isSetImageBaseId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1272,7 +1235,7 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetLatestVersionId()).compareTo(other.isSetLatestVersionId());
+    lastComparison = java.lang.Boolean.compare(isSetLatestVersionId(), other.isSetLatestVersionId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1282,7 +1245,7 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetVersions()).compareTo(other.isSetVersions());
+    lastComparison = java.lang.Boolean.compare(isSetVersions(), other.isSetVersions());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1292,7 +1255,7 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetImageName()).compareTo(other.isSetImageName());
+    lastComparison = java.lang.Boolean.compare(isSetImageName(), other.isSetImageName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1302,7 +1265,7 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetDescription()).compareTo(other.isSetDescription());
+    lastComparison = java.lang.Boolean.compare(isSetDescription(), other.isSetDescription());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1312,7 +1275,7 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetTags()).compareTo(other.isSetTags());
+    lastComparison = java.lang.Boolean.compare(isSetTags(), other.isSetTags());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1322,7 +1285,7 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetOsId()).compareTo(other.isSetOsId());
+    lastComparison = java.lang.Boolean.compare(isSetOsId(), other.isSetOsId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1332,7 +1295,7 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetVirtId()).compareTo(other.isSetVirtId());
+    lastComparison = java.lang.Boolean.compare(isSetVirtId(), other.isSetVirtId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1342,7 +1305,7 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetCreateTime()).compareTo(other.isSetCreateTime());
+    lastComparison = java.lang.Boolean.compare(isSetCreateTime(), other.isSetCreateTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1352,7 +1315,7 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetUpdateTime()).compareTo(other.isSetUpdateTime());
+    lastComparison = java.lang.Boolean.compare(isSetUpdateTime(), other.isSetUpdateTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1362,7 +1325,7 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetOwnerId()).compareTo(other.isSetOwnerId());
+    lastComparison = java.lang.Boolean.compare(isSetOwnerId(), other.isSetOwnerId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1372,7 +1335,7 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetUpdaterId()).compareTo(other.isSetUpdaterId());
+    lastComparison = java.lang.Boolean.compare(isSetUpdaterId(), other.isSetUpdaterId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1382,7 +1345,7 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetShareMode()).compareTo(other.isSetShareMode());
+    lastComparison = java.lang.Boolean.compare(isSetShareMode(), other.isSetShareMode());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1392,7 +1355,7 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetIsTemplate()).compareTo(other.isSetIsTemplate());
+    lastComparison = java.lang.Boolean.compare(isSetIsTemplate(), other.isSetIsTemplate());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1402,7 +1365,7 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetDefaultPermissions()).compareTo(other.isSetDefaultPermissions());
+    lastComparison = java.lang.Boolean.compare(isSetDefaultPermissions(), other.isSetDefaultPermissions());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1412,7 +1375,7 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetUserPermissions()).compareTo(other.isSetUserPermissions());
+    lastComparison = java.lang.Boolean.compare(isSetUserPermissions(), other.isSetUserPermissions());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1425,21 +1388,22 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
     return 0;
   }
 
+  @org.apache.thrift.annotation.Nullable
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("ImageDetailsRead(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("ImageDetailsRead(");
     boolean first = true;
 
     sb.append("imageBaseId:");
@@ -1578,7 +1542,7 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -1588,13 +1552,13 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
     }
   }
 
-  private static class ImageDetailsReadStandardSchemeFactory implements SchemeFactory {
+  private static class ImageDetailsReadStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public ImageDetailsReadStandardScheme getScheme() {
       return new ImageDetailsReadStandardScheme();
     }
   }
 
-  private static class ImageDetailsReadStandardScheme extends StandardScheme<ImageDetailsRead> {
+  private static class ImageDetailsReadStandardScheme extends org.apache.thrift.scheme.StandardScheme<ImageDetailsRead> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, ImageDetailsRead struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -1626,8 +1590,8 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list58 = iprot.readListBegin();
-                struct.versions = new ArrayList<ImageVersionDetails>(_list58.size);
-                ImageVersionDetails _elem59;
+                struct.versions = new java.util.ArrayList<ImageVersionDetails>(_list58.size);
+                @org.apache.thrift.annotation.Nullable ImageVersionDetails _elem59;
                 for (int _i60 = 0; _i60 < _list58.size; ++_i60)
                 {
                   _elem59 = new ImageVersionDetails();
@@ -1661,8 +1625,8 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list61 = iprot.readListBegin();
-                struct.tags = new ArrayList<String>(_list61.size);
-                String _elem62;
+                struct.tags = new java.util.ArrayList<java.lang.String>(_list61.size);
+                @org.apache.thrift.annotation.Nullable java.lang.String _elem62;
                 for (int _i63 = 0; _i63 < _list61.size; ++_i63)
                 {
                   _elem62 = iprot.readString();
@@ -1803,7 +1767,7 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
         oprot.writeFieldBegin(TAGS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.tags.size()));
-          for (String _iter65 : struct.tags)
+          for (java.lang.String _iter65 : struct.tags)
           {
             oprot.writeString(_iter65);
           }
@@ -1866,18 +1830,18 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
 
   }
 
-  private static class ImageDetailsReadTupleSchemeFactory implements SchemeFactory {
+  private static class ImageDetailsReadTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public ImageDetailsReadTupleScheme getScheme() {
       return new ImageDetailsReadTupleScheme();
     }
   }
 
-  private static class ImageDetailsReadTupleScheme extends TupleScheme<ImageDetailsRead> {
+  private static class ImageDetailsReadTupleScheme extends org.apache.thrift.scheme.TupleScheme<ImageDetailsRead> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, ImageDetailsRead struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetImageBaseId()) {
         optionals.set(0);
       }
@@ -1951,7 +1915,7 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
       if (struct.isSetTags()) {
         {
           oprot.writeI32(struct.tags.size());
-          for (String _iter67 : struct.tags)
+          for (java.lang.String _iter67 : struct.tags)
           {
             oprot.writeString(_iter67);
           }
@@ -1991,8 +1955,8 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, ImageDetailsRead struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(16);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(16);
       if (incoming.get(0)) {
         struct.imageBaseId = iprot.readString();
         struct.setImageBaseIdIsSet(true);
@@ -2003,9 +1967,9 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
       }
       if (incoming.get(2)) {
         {
-          org.apache.thrift.protocol.TList _list68 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.versions = new ArrayList<ImageVersionDetails>(_list68.size);
-          ImageVersionDetails _elem69;
+          org.apache.thrift.protocol.TList _list68 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.versions = new java.util.ArrayList<ImageVersionDetails>(_list68.size);
+          @org.apache.thrift.annotation.Nullable ImageVersionDetails _elem69;
           for (int _i70 = 0; _i70 < _list68.size; ++_i70)
           {
             _elem69 = new ImageVersionDetails();
@@ -2025,9 +1989,9 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
       }
       if (incoming.get(5)) {
         {
-          org.apache.thrift.protocol.TList _list71 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.tags = new ArrayList<String>(_list71.size);
-          String _elem72;
+          org.apache.thrift.protocol.TList _list71 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+          struct.tags = new java.util.ArrayList<java.lang.String>(_list71.size);
+          @org.apache.thrift.annotation.Nullable java.lang.String _elem72;
           for (int _i73 = 0; _i73 < _list71.size; ++_i73)
           {
             _elem72 = iprot.readString();
@@ -2081,5 +2045,8 @@ public class ImageDetailsRead implements org.apache.thrift.TBase<ImageDetailsRea
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/ImagePermissions.java b/src/main/java/org/openslx/bwlp/thrift/iface/ImagePermissions.java
index 57cc72e..5b0d739 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/ImagePermissions.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/ImagePermissions.java
@@ -1,40 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.openslx.bwlp.thrift.iface;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
 public class ImagePermissions implements org.apache.thrift.TBase<ImagePermissions, ImagePermissions._Fields>, java.io.Serializable, Cloneable, Comparable<ImagePermissions> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ImagePermissions");
 
@@ -43,11 +16,8 @@ public class ImagePermissions implements org.apache.thrift.TBase<ImagePermission
   private static final org.apache.thrift.protocol.TField EDIT_FIELD_DESC = new org.apache.thrift.protocol.TField("edit", org.apache.thrift.protocol.TType.BOOL, (short)3);
   private static final org.apache.thrift.protocol.TField ADMIN_FIELD_DESC = new org.apache.thrift.protocol.TField("admin", org.apache.thrift.protocol.TType.BOOL, (short)4);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new ImagePermissionsStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new ImagePermissionsTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ImagePermissionsStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ImagePermissionsTupleSchemeFactory();
 
   public boolean link; // required
   public boolean download; // required
@@ -61,10 +31,10 @@ public class ImagePermissions implements org.apache.thrift.TBase<ImagePermission
     EDIT((short)3, "edit"),
     ADMIN((short)4, "admin");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -72,6 +42,7 @@ public class ImagePermissions implements org.apache.thrift.TBase<ImagePermission
     /**
      * Find the _Fields constant that matches fieldId, or null if its not found.
      */
+    @org.apache.thrift.annotation.Nullable
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
         case 1: // LINK
@@ -93,21 +64,22 @@ public class ImagePermissions implements org.apache.thrift.TBase<ImagePermission
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    @org.apache.thrift.annotation.Nullable
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -116,7 +88,7 @@ public class ImagePermissions implements org.apache.thrift.TBase<ImagePermission
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -127,9 +99,9 @@ public class ImagePermissions implements org.apache.thrift.TBase<ImagePermission
   private static final int __EDIT_ISSET_ID = 2;
   private static final int __ADMIN_ISSET_ID = 3;
   private byte __isset_bitfield = 0;
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.LINK, new org.apache.thrift.meta_data.FieldMetaData("link", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
     tmpMap.put(_Fields.DOWNLOAD, new org.apache.thrift.meta_data.FieldMetaData("download", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -138,7 +110,7 @@ public class ImagePermissions implements org.apache.thrift.TBase<ImagePermission
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
     tmpMap.put(_Fields.ADMIN, new org.apache.thrift.meta_data.FieldMetaData("admin", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ImagePermissions.class, metaDataMap);
   }
 
@@ -200,16 +172,16 @@ public class ImagePermissions implements org.apache.thrift.TBase<ImagePermission
   }
 
   public void unsetLink() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __LINK_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __LINK_ISSET_ID);
   }
 
   /** Returns true if field link is set (has been assigned a value) and false otherwise */
   public boolean isSetLink() {
-    return EncodingUtils.testBit(__isset_bitfield, __LINK_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __LINK_ISSET_ID);
   }
 
   public void setLinkIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __LINK_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __LINK_ISSET_ID, value);
   }
 
   public boolean isDownload() {
@@ -223,16 +195,16 @@ public class ImagePermissions implements org.apache.thrift.TBase<ImagePermission
   }
 
   public void unsetDownload() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __DOWNLOAD_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __DOWNLOAD_ISSET_ID);
   }
 
   /** Returns true if field download is set (has been assigned a value) and false otherwise */
   public boolean isSetDownload() {
-    return EncodingUtils.testBit(__isset_bitfield, __DOWNLOAD_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __DOWNLOAD_ISSET_ID);
   }
 
   public void setDownloadIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __DOWNLOAD_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __DOWNLOAD_ISSET_ID, value);
   }
 
   public boolean isEdit() {
@@ -246,16 +218,16 @@ public class ImagePermissions implements org.apache.thrift.TBase<ImagePermission
   }
 
   public void unsetEdit() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __EDIT_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __EDIT_ISSET_ID);
   }
 
   /** Returns true if field edit is set (has been assigned a value) and false otherwise */
   public boolean isSetEdit() {
-    return EncodingUtils.testBit(__isset_bitfield, __EDIT_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __EDIT_ISSET_ID);
   }
 
   public void setEditIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __EDIT_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __EDIT_ISSET_ID, value);
   }
 
   public boolean isAdmin() {
@@ -269,25 +241,25 @@ public class ImagePermissions implements org.apache.thrift.TBase<ImagePermission
   }
 
   public void unsetAdmin() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ADMIN_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ADMIN_ISSET_ID);
   }
 
   /** Returns true if field admin is set (has been assigned a value) and false otherwise */
   public boolean isSetAdmin() {
-    return EncodingUtils.testBit(__isset_bitfield, __ADMIN_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ADMIN_ISSET_ID);
   }
 
   public void setAdminIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ADMIN_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ADMIN_ISSET_ID, value);
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case LINK:
       if (value == null) {
         unsetLink();
       } else {
-        setLink((Boolean)value);
+        setLink((java.lang.Boolean)value);
       }
       break;
 
@@ -295,7 +267,7 @@ public class ImagePermissions implements org.apache.thrift.TBase<ImagePermission
       if (value == null) {
         unsetDownload();
       } else {
-        setDownload((Boolean)value);
+        setDownload((java.lang.Boolean)value);
       }
       break;
 
@@ -303,7 +275,7 @@ public class ImagePermissions implements org.apache.thrift.TBase<ImagePermission
       if (value == null) {
         unsetEdit();
       } else {
-        setEdit((Boolean)value);
+        setEdit((java.lang.Boolean)value);
       }
       break;
 
@@ -311,14 +283,15 @@ public class ImagePermissions implements org.apache.thrift.TBase<ImagePermission
       if (value == null) {
         unsetAdmin();
       } else {
-        setAdmin((Boolean)value);
+        setAdmin((java.lang.Boolean)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case LINK:
       return isLink();
@@ -333,13 +306,13 @@ public class ImagePermissions implements org.apache.thrift.TBase<ImagePermission
       return isAdmin();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -352,13 +325,11 @@ public class ImagePermissions implements org.apache.thrift.TBase<ImagePermission
     case ADMIN:
       return isSetAdmin();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
+  public boolean equals(java.lang.Object that) {
     if (that instanceof ImagePermissions)
       return this.equals((ImagePermissions)that);
     return false;
@@ -367,6 +338,8 @@ public class ImagePermissions implements org.apache.thrift.TBase<ImagePermission
   public boolean equals(ImagePermissions that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_link = true;
     boolean that_present_link = true;
@@ -409,29 +382,17 @@ public class ImagePermissions implements org.apache.thrift.TBase<ImagePermission
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_link = true;
-    list.add(present_link);
-    if (present_link)
-      list.add(link);
+    hashCode = hashCode * 8191 + ((link) ? 131071 : 524287);
 
-    boolean present_download = true;
-    list.add(present_download);
-    if (present_download)
-      list.add(download);
+    hashCode = hashCode * 8191 + ((download) ? 131071 : 524287);
 
-    boolean present_edit = true;
-    list.add(present_edit);
-    if (present_edit)
-      list.add(edit);
+    hashCode = hashCode * 8191 + ((edit) ? 131071 : 524287);
 
-    boolean present_admin = true;
-    list.add(present_admin);
-    if (present_admin)
-      list.add(admin);
+    hashCode = hashCode * 8191 + ((admin) ? 131071 : 524287);
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -442,7 +403,7 @@ public class ImagePermissions implements org.apache.thrift.TBase<ImagePermission
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetLink()).compareTo(other.isSetLink());
+    lastComparison = java.lang.Boolean.compare(isSetLink(), other.isSetLink());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -452,7 +413,7 @@ public class ImagePermissions implements org.apache.thrift.TBase<ImagePermission
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetDownload()).compareTo(other.isSetDownload());
+    lastComparison = java.lang.Boolean.compare(isSetDownload(), other.isSetDownload());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -462,7 +423,7 @@ public class ImagePermissions implements org.apache.thrift.TBase<ImagePermission
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetEdit()).compareTo(other.isSetEdit());
+    lastComparison = java.lang.Boolean.compare(isSetEdit(), other.isSetEdit());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -472,7 +433,7 @@ public class ImagePermissions implements org.apache.thrift.TBase<ImagePermission
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetAdmin()).compareTo(other.isSetAdmin());
+    lastComparison = java.lang.Boolean.compare(isSetAdmin(), other.isSetAdmin());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -485,21 +446,22 @@ public class ImagePermissions implements org.apache.thrift.TBase<ImagePermission
     return 0;
   }
 
+  @org.apache.thrift.annotation.Nullable
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("ImagePermissions(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("ImagePermissions(");
     boolean first = true;
 
     sb.append("link:");
@@ -534,7 +496,7 @@ public class ImagePermissions implements org.apache.thrift.TBase<ImagePermission
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -544,13 +506,13 @@ public class ImagePermissions implements org.apache.thrift.TBase<ImagePermission
     }
   }
 
-  private static class ImagePermissionsStandardSchemeFactory implements SchemeFactory {
+  private static class ImagePermissionsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public ImagePermissionsStandardScheme getScheme() {
       return new ImagePermissionsStandardScheme();
     }
   }
 
-  private static class ImagePermissionsStandardScheme extends StandardScheme<ImagePermissions> {
+  private static class ImagePermissionsStandardScheme extends org.apache.thrift.scheme.StandardScheme<ImagePermissions> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, ImagePermissions struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -627,18 +589,18 @@ public class ImagePermissions implements org.apache.thrift.TBase<ImagePermission
 
   }
 
-  private static class ImagePermissionsTupleSchemeFactory implements SchemeFactory {
+  private static class ImagePermissionsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public ImagePermissionsTupleScheme getScheme() {
       return new ImagePermissionsTupleScheme();
     }
   }
 
-  private static class ImagePermissionsTupleScheme extends TupleScheme<ImagePermissions> {
+  private static class ImagePermissionsTupleScheme extends org.apache.thrift.scheme.TupleScheme<ImagePermissions> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, ImagePermissions struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetLink()) {
         optionals.set(0);
       }
@@ -668,8 +630,8 @@ public class ImagePermissions implements org.apache.thrift.TBase<ImagePermission
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, ImagePermissions struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(4);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(4);
       if (incoming.get(0)) {
         struct.link = iprot.readBool();
         struct.setLinkIsSet(true);
@@ -689,5 +651,8 @@ public class ImagePermissions implements org.apache.thrift.TBase<ImagePermission
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/ImagePublishData.java b/src/main/java/org/openslx/bwlp/thrift/iface/ImagePublishData.java
index 9226df6..541b4ea 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/ImagePublishData.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/ImagePublishData.java
@@ -1,40 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.openslx.bwlp.thrift.iface;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-04-20")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
 public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishData, ImagePublishData._Fields>, java.io.Serializable, Cloneable, Comparable<ImagePublishData> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ImagePublishData");
 
@@ -53,26 +26,23 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
   private static final org.apache.thrift.protocol.TField OWNER_FIELD_DESC = new org.apache.thrift.protocol.TField("owner", org.apache.thrift.protocol.TType.STRUCT, (short)13);
   private static final org.apache.thrift.protocol.TField MACHINE_DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("machineDescription", org.apache.thrift.protocol.TType.STRING, (short)14);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new ImagePublishDataStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new ImagePublishDataTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ImagePublishDataStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ImagePublishDataTupleSchemeFactory();
 
-  public String imageBaseId; // required
-  public String imageVersionId; // required
-  public String imageName; // required
-  public String description; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String imageBaseId; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String imageVersionId; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String imageName; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String description; // required
   public long createTime; // required
-  public UserInfo uploader; // required
+  public @org.apache.thrift.annotation.Nullable UserInfo uploader; // required
   public long fileSize; // required
-  public List<String> software; // required
-  public List<String> tags; // required
+  public @org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> software; // required
+  public @org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> tags; // required
   public int osId; // required
-  public String virtId; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String virtId; // required
   public boolean isTemplate; // required
-  public UserInfo owner; // required
-  public ByteBuffer machineDescription; // required
+  public @org.apache.thrift.annotation.Nullable UserInfo owner; // required
+  public @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer machineDescription; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -91,10 +61,10 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
     OWNER((short)13, "owner"),
     MACHINE_DESCRIPTION((short)14, "machineDescription");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -102,6 +72,7 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
     /**
      * Find the _Fields constant that matches fieldId, or null if its not found.
      */
+    @org.apache.thrift.annotation.Nullable
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
         case 1: // IMAGE_BASE_ID
@@ -143,21 +114,22 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    @org.apache.thrift.annotation.Nullable
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -166,7 +138,7 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -177,9 +149,9 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
   private static final int __OSID_ISSET_ID = 2;
   private static final int __ISTEMPLATE_ISSET_ID = 3;
   private byte __isset_bitfield = 0;
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.IMAGE_BASE_ID, new org.apache.thrift.meta_data.FieldMetaData("imageBaseId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , "UUID")));
     tmpMap.put(_Fields.IMAGE_VERSION_ID, new org.apache.thrift.meta_data.FieldMetaData("imageVersionId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -210,7 +182,7 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
         new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, UserInfo.class)));
     tmpMap.put(_Fields.MACHINE_DESCRIPTION, new org.apache.thrift.meta_data.FieldMetaData("machineDescription", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , true)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ImagePublishData.class, metaDataMap);
   }
 
@@ -218,20 +190,20 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
   }
 
   public ImagePublishData(
-    String imageBaseId,
-    String imageVersionId,
-    String imageName,
-    String description,
+    java.lang.String imageBaseId,
+    java.lang.String imageVersionId,
+    java.lang.String imageName,
+    java.lang.String description,
     long createTime,
     UserInfo uploader,
     long fileSize,
-    List<String> software,
-    List<String> tags,
+    java.util.List<java.lang.String> software,
+    java.util.List<java.lang.String> tags,
     int osId,
-    String virtId,
+    java.lang.String virtId,
     boolean isTemplate,
     UserInfo owner,
-    ByteBuffer machineDescription)
+    java.nio.ByteBuffer machineDescription)
   {
     this();
     this.imageBaseId = imageBaseId;
@@ -277,11 +249,11 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
     }
     this.fileSize = other.fileSize;
     if (other.isSetSoftware()) {
-      List<String> __this__software = new ArrayList<String>(other.software);
+      java.util.List<java.lang.String> __this__software = new java.util.ArrayList<java.lang.String>(other.software);
       this.software = __this__software;
     }
     if (other.isSetTags()) {
-      List<String> __this__tags = new ArrayList<String>(other.tags);
+      java.util.List<java.lang.String> __this__tags = new java.util.ArrayList<java.lang.String>(other.tags);
       this.tags = __this__tags;
     }
     this.osId = other.osId;
@@ -323,11 +295,12 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
     this.machineDescription = null;
   }
 
-  public String getImageBaseId() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getImageBaseId() {
     return this.imageBaseId;
   }
 
-  public ImagePublishData setImageBaseId(String imageBaseId) {
+  public ImagePublishData setImageBaseId(@org.apache.thrift.annotation.Nullable java.lang.String imageBaseId) {
     this.imageBaseId = imageBaseId;
     return this;
   }
@@ -347,11 +320,12 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
     }
   }
 
-  public String getImageVersionId() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getImageVersionId() {
     return this.imageVersionId;
   }
 
-  public ImagePublishData setImageVersionId(String imageVersionId) {
+  public ImagePublishData setImageVersionId(@org.apache.thrift.annotation.Nullable java.lang.String imageVersionId) {
     this.imageVersionId = imageVersionId;
     return this;
   }
@@ -371,11 +345,12 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
     }
   }
 
-  public String getImageName() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getImageName() {
     return this.imageName;
   }
 
-  public ImagePublishData setImageName(String imageName) {
+  public ImagePublishData setImageName(@org.apache.thrift.annotation.Nullable java.lang.String imageName) {
     this.imageName = imageName;
     return this;
   }
@@ -395,11 +370,12 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
     }
   }
 
-  public String getDescription() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getDescription() {
     return this.description;
   }
 
-  public ImagePublishData setDescription(String description) {
+  public ImagePublishData setDescription(@org.apache.thrift.annotation.Nullable java.lang.String description) {
     this.description = description;
     return this;
   }
@@ -430,23 +406,24 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
   }
 
   public void unsetCreateTime() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __CREATETIME_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __CREATETIME_ISSET_ID);
   }
 
   /** Returns true if field createTime is set (has been assigned a value) and false otherwise */
   public boolean isSetCreateTime() {
-    return EncodingUtils.testBit(__isset_bitfield, __CREATETIME_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __CREATETIME_ISSET_ID);
   }
 
   public void setCreateTimeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __CREATETIME_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __CREATETIME_ISSET_ID, value);
   }
 
+  @org.apache.thrift.annotation.Nullable
   public UserInfo getUploader() {
     return this.uploader;
   }
 
-  public ImagePublishData setUploader(UserInfo uploader) {
+  public ImagePublishData setUploader(@org.apache.thrift.annotation.Nullable UserInfo uploader) {
     this.uploader = uploader;
     return this;
   }
@@ -477,38 +454,40 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
   }
 
   public void unsetFileSize() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __FILESIZE_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __FILESIZE_ISSET_ID);
   }
 
   /** Returns true if field fileSize is set (has been assigned a value) and false otherwise */
   public boolean isSetFileSize() {
-    return EncodingUtils.testBit(__isset_bitfield, __FILESIZE_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __FILESIZE_ISSET_ID);
   }
 
   public void setFileSizeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __FILESIZE_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __FILESIZE_ISSET_ID, value);
   }
 
   public int getSoftwareSize() {
     return (this.software == null) ? 0 : this.software.size();
   }
 
-  public java.util.Iterator<String> getSoftwareIterator() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.Iterator<java.lang.String> getSoftwareIterator() {
     return (this.software == null) ? null : this.software.iterator();
   }
 
-  public void addToSoftware(String elem) {
+  public void addToSoftware(java.lang.String elem) {
     if (this.software == null) {
-      this.software = new ArrayList<String>();
+      this.software = new java.util.ArrayList<java.lang.String>();
     }
     this.software.add(elem);
   }
 
-  public List<String> getSoftware() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.List<java.lang.String> getSoftware() {
     return this.software;
   }
 
-  public ImagePublishData setSoftware(List<String> software) {
+  public ImagePublishData setSoftware(@org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> software) {
     this.software = software;
     return this;
   }
@@ -532,22 +511,24 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
     return (this.tags == null) ? 0 : this.tags.size();
   }
 
-  public java.util.Iterator<String> getTagsIterator() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.Iterator<java.lang.String> getTagsIterator() {
     return (this.tags == null) ? null : this.tags.iterator();
   }
 
-  public void addToTags(String elem) {
+  public void addToTags(java.lang.String elem) {
     if (this.tags == null) {
-      this.tags = new ArrayList<String>();
+      this.tags = new java.util.ArrayList<java.lang.String>();
     }
     this.tags.add(elem);
   }
 
-  public List<String> getTags() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.List<java.lang.String> getTags() {
     return this.tags;
   }
 
-  public ImagePublishData setTags(List<String> tags) {
+  public ImagePublishData setTags(@org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> tags) {
     this.tags = tags;
     return this;
   }
@@ -578,23 +559,24 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
   }
 
   public void unsetOsId() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __OSID_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __OSID_ISSET_ID);
   }
 
   /** Returns true if field osId is set (has been assigned a value) and false otherwise */
   public boolean isSetOsId() {
-    return EncodingUtils.testBit(__isset_bitfield, __OSID_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __OSID_ISSET_ID);
   }
 
   public void setOsIdIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __OSID_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __OSID_ISSET_ID, value);
   }
 
-  public String getVirtId() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getVirtId() {
     return this.virtId;
   }
 
-  public ImagePublishData setVirtId(String virtId) {
+  public ImagePublishData setVirtId(@org.apache.thrift.annotation.Nullable java.lang.String virtId) {
     this.virtId = virtId;
     return this;
   }
@@ -625,23 +607,24 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
   }
 
   public void unsetIsTemplate() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISTEMPLATE_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ISTEMPLATE_ISSET_ID);
   }
 
   /** Returns true if field isTemplate is set (has been assigned a value) and false otherwise */
   public boolean isSetIsTemplate() {
-    return EncodingUtils.testBit(__isset_bitfield, __ISTEMPLATE_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ISTEMPLATE_ISSET_ID);
   }
 
   public void setIsTemplateIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISTEMPLATE_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ISTEMPLATE_ISSET_ID, value);
   }
 
+  @org.apache.thrift.annotation.Nullable
   public UserInfo getOwner() {
     return this.owner;
   }
 
-  public ImagePublishData setOwner(UserInfo owner) {
+  public ImagePublishData setOwner(@org.apache.thrift.annotation.Nullable UserInfo owner) {
     this.owner = owner;
     return this;
   }
@@ -666,16 +649,16 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
     return machineDescription == null ? null : machineDescription.array();
   }
 
-  public ByteBuffer bufferForMachineDescription() {
+  public java.nio.ByteBuffer bufferForMachineDescription() {
     return org.apache.thrift.TBaseHelper.copyBinary(machineDescription);
   }
 
   public ImagePublishData setMachineDescription(byte[] machineDescription) {
-    this.machineDescription = machineDescription == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(machineDescription, machineDescription.length));
+    this.machineDescription = machineDescription == null ? (java.nio.ByteBuffer)null   : java.nio.ByteBuffer.wrap(machineDescription.clone());
     return this;
   }
 
-  public ImagePublishData setMachineDescription(ByteBuffer machineDescription) {
+  public ImagePublishData setMachineDescription(@org.apache.thrift.annotation.Nullable java.nio.ByteBuffer machineDescription) {
     this.machineDescription = org.apache.thrift.TBaseHelper.copyBinary(machineDescription);
     return this;
   }
@@ -695,13 +678,13 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case IMAGE_BASE_ID:
       if (value == null) {
         unsetImageBaseId();
       } else {
-        setImageBaseId((String)value);
+        setImageBaseId((java.lang.String)value);
       }
       break;
 
@@ -709,7 +692,7 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
       if (value == null) {
         unsetImageVersionId();
       } else {
-        setImageVersionId((String)value);
+        setImageVersionId((java.lang.String)value);
       }
       break;
 
@@ -717,7 +700,7 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
       if (value == null) {
         unsetImageName();
       } else {
-        setImageName((String)value);
+        setImageName((java.lang.String)value);
       }
       break;
 
@@ -725,7 +708,7 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
       if (value == null) {
         unsetDescription();
       } else {
-        setDescription((String)value);
+        setDescription((java.lang.String)value);
       }
       break;
 
@@ -733,7 +716,7 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
       if (value == null) {
         unsetCreateTime();
       } else {
-        setCreateTime((Long)value);
+        setCreateTime((java.lang.Long)value);
       }
       break;
 
@@ -749,7 +732,7 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
       if (value == null) {
         unsetFileSize();
       } else {
-        setFileSize((Long)value);
+        setFileSize((java.lang.Long)value);
       }
       break;
 
@@ -757,7 +740,7 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
       if (value == null) {
         unsetSoftware();
       } else {
-        setSoftware((List<String>)value);
+        setSoftware((java.util.List<java.lang.String>)value);
       }
       break;
 
@@ -765,7 +748,7 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
       if (value == null) {
         unsetTags();
       } else {
-        setTags((List<String>)value);
+        setTags((java.util.List<java.lang.String>)value);
       }
       break;
 
@@ -773,7 +756,7 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
       if (value == null) {
         unsetOsId();
       } else {
-        setOsId((Integer)value);
+        setOsId((java.lang.Integer)value);
       }
       break;
 
@@ -781,7 +764,7 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
       if (value == null) {
         unsetVirtId();
       } else {
-        setVirtId((String)value);
+        setVirtId((java.lang.String)value);
       }
       break;
 
@@ -789,7 +772,7 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
       if (value == null) {
         unsetIsTemplate();
       } else {
-        setIsTemplate((Boolean)value);
+        setIsTemplate((java.lang.Boolean)value);
       }
       break;
 
@@ -805,14 +788,19 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
       if (value == null) {
         unsetMachineDescription();
       } else {
-        setMachineDescription((ByteBuffer)value);
+        if (value instanceof byte[]) {
+          setMachineDescription((byte[])value);
+        } else {
+          setMachineDescription((java.nio.ByteBuffer)value);
+        }
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case IMAGE_BASE_ID:
       return getImageBaseId();
@@ -857,13 +845,13 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
       return getMachineDescription();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -896,13 +884,11 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
     case MACHINE_DESCRIPTION:
       return isSetMachineDescription();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
+  public boolean equals(java.lang.Object that) {
     if (that instanceof ImagePublishData)
       return this.equals((ImagePublishData)that);
     return false;
@@ -911,6 +897,8 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
   public boolean equals(ImagePublishData that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_imageBaseId = true && this.isSetImageBaseId();
     boolean that_present_imageBaseId = true && that.isSetImageBaseId();
@@ -1043,79 +1031,57 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_imageBaseId = true && (isSetImageBaseId());
-    list.add(present_imageBaseId);
-    if (present_imageBaseId)
-      list.add(imageBaseId);
-
-    boolean present_imageVersionId = true && (isSetImageVersionId());
-    list.add(present_imageVersionId);
-    if (present_imageVersionId)
-      list.add(imageVersionId);
-
-    boolean present_imageName = true && (isSetImageName());
-    list.add(present_imageName);
-    if (present_imageName)
-      list.add(imageName);
-
-    boolean present_description = true && (isSetDescription());
-    list.add(present_description);
-    if (present_description)
-      list.add(description);
-
-    boolean present_createTime = true;
-    list.add(present_createTime);
-    if (present_createTime)
-      list.add(createTime);
-
-    boolean present_uploader = true && (isSetUploader());
-    list.add(present_uploader);
-    if (present_uploader)
-      list.add(uploader);
-
-    boolean present_fileSize = true;
-    list.add(present_fileSize);
-    if (present_fileSize)
-      list.add(fileSize);
-
-    boolean present_software = true && (isSetSoftware());
-    list.add(present_software);
-    if (present_software)
-      list.add(software);
-
-    boolean present_tags = true && (isSetTags());
-    list.add(present_tags);
-    if (present_tags)
-      list.add(tags);
-
-    boolean present_osId = true;
-    list.add(present_osId);
-    if (present_osId)
-      list.add(osId);
-
-    boolean present_virtId = true && (isSetVirtId());
-    list.add(present_virtId);
-    if (present_virtId)
-      list.add(virtId);
-
-    boolean present_isTemplate = true;
-    list.add(present_isTemplate);
-    if (present_isTemplate)
-      list.add(isTemplate);
-
-    boolean present_owner = true && (isSetOwner());
-    list.add(present_owner);
-    if (present_owner)
-      list.add(owner);
-
-    boolean present_machineDescription = true && (isSetMachineDescription());
-    list.add(present_machineDescription);
-    if (present_machineDescription)
-      list.add(machineDescription);
-
-    return list.hashCode();
+    int hashCode = 1;
+
+    hashCode = hashCode * 8191 + ((isSetImageBaseId()) ? 131071 : 524287);
+    if (isSetImageBaseId())
+      hashCode = hashCode * 8191 + imageBaseId.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetImageVersionId()) ? 131071 : 524287);
+    if (isSetImageVersionId())
+      hashCode = hashCode * 8191 + imageVersionId.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetImageName()) ? 131071 : 524287);
+    if (isSetImageName())
+      hashCode = hashCode * 8191 + imageName.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetDescription()) ? 131071 : 524287);
+    if (isSetDescription())
+      hashCode = hashCode * 8191 + description.hashCode();
+
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(createTime);
+
+    hashCode = hashCode * 8191 + ((isSetUploader()) ? 131071 : 524287);
+    if (isSetUploader())
+      hashCode = hashCode * 8191 + uploader.hashCode();
+
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(fileSize);
+
+    hashCode = hashCode * 8191 + ((isSetSoftware()) ? 131071 : 524287);
+    if (isSetSoftware())
+      hashCode = hashCode * 8191 + software.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetTags()) ? 131071 : 524287);
+    if (isSetTags())
+      hashCode = hashCode * 8191 + tags.hashCode();
+
+    hashCode = hashCode * 8191 + osId;
+
+    hashCode = hashCode * 8191 + ((isSetVirtId()) ? 131071 : 524287);
+    if (isSetVirtId())
+      hashCode = hashCode * 8191 + virtId.hashCode();
+
+    hashCode = hashCode * 8191 + ((isTemplate) ? 131071 : 524287);
+
+    hashCode = hashCode * 8191 + ((isSetOwner()) ? 131071 : 524287);
+    if (isSetOwner())
+      hashCode = hashCode * 8191 + owner.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetMachineDescription()) ? 131071 : 524287);
+    if (isSetMachineDescription())
+      hashCode = hashCode * 8191 + machineDescription.hashCode();
+
+    return hashCode;
   }
 
   @Override
@@ -1126,7 +1092,7 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetImageBaseId()).compareTo(other.isSetImageBaseId());
+    lastComparison = java.lang.Boolean.compare(isSetImageBaseId(), other.isSetImageBaseId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1136,7 +1102,7 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetImageVersionId()).compareTo(other.isSetImageVersionId());
+    lastComparison = java.lang.Boolean.compare(isSetImageVersionId(), other.isSetImageVersionId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1146,7 +1112,7 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetImageName()).compareTo(other.isSetImageName());
+    lastComparison = java.lang.Boolean.compare(isSetImageName(), other.isSetImageName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1156,7 +1122,7 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetDescription()).compareTo(other.isSetDescription());
+    lastComparison = java.lang.Boolean.compare(isSetDescription(), other.isSetDescription());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1166,7 +1132,7 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetCreateTime()).compareTo(other.isSetCreateTime());
+    lastComparison = java.lang.Boolean.compare(isSetCreateTime(), other.isSetCreateTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1176,7 +1142,7 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetUploader()).compareTo(other.isSetUploader());
+    lastComparison = java.lang.Boolean.compare(isSetUploader(), other.isSetUploader());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1186,7 +1152,7 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetFileSize()).compareTo(other.isSetFileSize());
+    lastComparison = java.lang.Boolean.compare(isSetFileSize(), other.isSetFileSize());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1196,7 +1162,7 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetSoftware()).compareTo(other.isSetSoftware());
+    lastComparison = java.lang.Boolean.compare(isSetSoftware(), other.isSetSoftware());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1206,7 +1172,7 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetTags()).compareTo(other.isSetTags());
+    lastComparison = java.lang.Boolean.compare(isSetTags(), other.isSetTags());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1216,7 +1182,7 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetOsId()).compareTo(other.isSetOsId());
+    lastComparison = java.lang.Boolean.compare(isSetOsId(), other.isSetOsId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1226,7 +1192,7 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetVirtId()).compareTo(other.isSetVirtId());
+    lastComparison = java.lang.Boolean.compare(isSetVirtId(), other.isSetVirtId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1236,7 +1202,7 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetIsTemplate()).compareTo(other.isSetIsTemplate());
+    lastComparison = java.lang.Boolean.compare(isSetIsTemplate(), other.isSetIsTemplate());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1246,7 +1212,7 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetOwner()).compareTo(other.isSetOwner());
+    lastComparison = java.lang.Boolean.compare(isSetOwner(), other.isSetOwner());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1256,7 +1222,7 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMachineDescription()).compareTo(other.isSetMachineDescription());
+    lastComparison = java.lang.Boolean.compare(isSetMachineDescription(), other.isSetMachineDescription());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1269,21 +1235,22 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
     return 0;
   }
 
+  @org.apache.thrift.annotation.Nullable
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("ImagePublishData(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("ImagePublishData(");
     boolean first = true;
 
     sb.append("imageBaseId:");
@@ -1404,7 +1371,7 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -1414,13 +1381,13 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
     }
   }
 
-  private static class ImagePublishDataStandardSchemeFactory implements SchemeFactory {
+  private static class ImagePublishDataStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public ImagePublishDataStandardScheme getScheme() {
       return new ImagePublishDataStandardScheme();
     }
   }
 
-  private static class ImagePublishDataStandardScheme extends StandardScheme<ImagePublishData> {
+  private static class ImagePublishDataStandardScheme extends org.apache.thrift.scheme.StandardScheme<ImagePublishData> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, ImagePublishData struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -1493,8 +1460,8 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list74 = iprot.readListBegin();
-                struct.software = new ArrayList<String>(_list74.size);
-                String _elem75;
+                struct.software = new java.util.ArrayList<java.lang.String>(_list74.size);
+                @org.apache.thrift.annotation.Nullable java.lang.String _elem75;
                 for (int _i76 = 0; _i76 < _list74.size; ++_i76)
                 {
                   _elem75 = iprot.readString();
@@ -1511,8 +1478,8 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list77 = iprot.readListBegin();
-                struct.tags = new ArrayList<String>(_list77.size);
-                String _elem78;
+                struct.tags = new java.util.ArrayList<java.lang.String>(_list77.size);
+                @org.apache.thrift.annotation.Nullable java.lang.String _elem78;
                 for (int _i79 = 0; _i79 < _list77.size; ++_i79)
                 {
                   _elem78 = iprot.readString();
@@ -1616,7 +1583,7 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
         oprot.writeFieldBegin(SOFTWARE_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.software.size()));
-          for (String _iter80 : struct.software)
+          for (java.lang.String _iter80 : struct.software)
           {
             oprot.writeString(_iter80);
           }
@@ -1628,7 +1595,7 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
         oprot.writeFieldBegin(TAGS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.tags.size()));
-          for (String _iter81 : struct.tags)
+          for (java.lang.String _iter81 : struct.tags)
           {
             oprot.writeString(_iter81);
           }
@@ -1663,18 +1630,18 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
 
   }
 
-  private static class ImagePublishDataTupleSchemeFactory implements SchemeFactory {
+  private static class ImagePublishDataTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public ImagePublishDataTupleScheme getScheme() {
       return new ImagePublishDataTupleScheme();
     }
   }
 
-  private static class ImagePublishDataTupleScheme extends TupleScheme<ImagePublishData> {
+  private static class ImagePublishDataTupleScheme extends org.apache.thrift.scheme.TupleScheme<ImagePublishData> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, ImagePublishData struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetImageBaseId()) {
         optionals.set(0);
       }
@@ -1742,7 +1709,7 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
       if (struct.isSetSoftware()) {
         {
           oprot.writeI32(struct.software.size());
-          for (String _iter82 : struct.software)
+          for (java.lang.String _iter82 : struct.software)
           {
             oprot.writeString(_iter82);
           }
@@ -1751,7 +1718,7 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
       if (struct.isSetTags()) {
         {
           oprot.writeI32(struct.tags.size());
-          for (String _iter83 : struct.tags)
+          for (java.lang.String _iter83 : struct.tags)
           {
             oprot.writeString(_iter83);
           }
@@ -1776,8 +1743,8 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, ImagePublishData struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(14);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(14);
       if (incoming.get(0)) {
         struct.imageBaseId = iprot.readString();
         struct.setImageBaseIdIsSet(true);
@@ -1809,9 +1776,9 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
       }
       if (incoming.get(7)) {
         {
-          org.apache.thrift.protocol.TList _list84 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.software = new ArrayList<String>(_list84.size);
-          String _elem85;
+          org.apache.thrift.protocol.TList _list84 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+          struct.software = new java.util.ArrayList<java.lang.String>(_list84.size);
+          @org.apache.thrift.annotation.Nullable java.lang.String _elem85;
           for (int _i86 = 0; _i86 < _list84.size; ++_i86)
           {
             _elem85 = iprot.readString();
@@ -1822,9 +1789,9 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
       }
       if (incoming.get(8)) {
         {
-          org.apache.thrift.protocol.TList _list87 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.tags = new ArrayList<String>(_list87.size);
-          String _elem88;
+          org.apache.thrift.protocol.TList _list87 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+          struct.tags = new java.util.ArrayList<java.lang.String>(_list87.size);
+          @org.apache.thrift.annotation.Nullable java.lang.String _elem88;
           for (int _i89 = 0; _i89 < _list87.size; ++_i89)
           {
             _elem88 = iprot.readString();
@@ -1857,5 +1824,8 @@ public class ImagePublishData implements org.apache.thrift.TBase<ImagePublishDat
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/ImageSummaryRead.java b/src/main/java/org/openslx/bwlp/thrift/iface/ImageSummaryRead.java
index 235b90a..35c0ddc 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/ImageSummaryRead.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/ImageSummaryRead.java
@@ -1,40 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.openslx.bwlp.thrift.iface;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2020-10-12")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
 public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRead, ImageSummaryRead._Fields>, java.io.Serializable, Cloneable, Comparable<ImageSummaryRead> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ImageSummaryRead");
 
@@ -61,36 +34,33 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
   private static final org.apache.thrift.protocol.TField FILE_SIZE_SUM_FIELD_DESC = new org.apache.thrift.protocol.TField("fileSizeSum", org.apache.thrift.protocol.TType.I64, (short)21);
   private static final org.apache.thrift.protocol.TField VERSION_COUNT_FIELD_DESC = new org.apache.thrift.protocol.TField("versionCount", org.apache.thrift.protocol.TType.I32, (short)22);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new ImageSummaryReadStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new ImageSummaryReadTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ImageSummaryReadStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ImageSummaryReadTupleSchemeFactory();
 
-  public String imageBaseId; // required
-  public String latestVersionId; // required
-  public String imageName; // required
-  public String description; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String imageBaseId; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String latestVersionId; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String imageName; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String description; // required
   public int osId; // required
-  public String virtId; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String virtId; // required
   public long createTime; // required
   public long updateTime; // required
   public long uploadTime; // required
   public long expireTime; // required
-  public String ownerId; // required
-  public String uploaderId; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String ownerId; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String uploaderId; // required
   /**
    * 
    * @see ShareMode
    */
-  public ShareMode shareMode; // required
+  public @org.apache.thrift.annotation.Nullable ShareMode shareMode; // required
   public long fileSize; // required
   public boolean isRestricted; // required
   public boolean isValid; // required
   public boolean isProcessed; // required
   public boolean isTemplate; // required
-  public ImagePermissions defaultPermissions; // required
-  public ImagePermissions userPermissions; // optional
+  public @org.apache.thrift.annotation.Nullable ImagePermissions defaultPermissions; // required
+  public @org.apache.thrift.annotation.Nullable ImagePermissions userPermissions; // optional
   public long fileSizeSum; // optional
   public int versionCount; // optional
 
@@ -123,10 +93,10 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
     FILE_SIZE_SUM((short)21, "fileSizeSum"),
     VERSION_COUNT((short)22, "versionCount");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -134,6 +104,7 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
     /**
      * Find the _Fields constant that matches fieldId, or null if its not found.
      */
+    @org.apache.thrift.annotation.Nullable
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
         case 1: // IMAGE_BASE_ID
@@ -191,21 +162,22 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    @org.apache.thrift.annotation.Nullable
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -214,7 +186,7 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -234,9 +206,9 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
   private static final int __VERSIONCOUNT_ISSET_ID = 11;
   private short __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.USER_PERMISSIONS,_Fields.FILE_SIZE_SUM,_Fields.VERSION_COUNT};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.IMAGE_BASE_ID, new org.apache.thrift.meta_data.FieldMetaData("imageBaseId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , "UUID")));
     tmpMap.put(_Fields.LATEST_VERSION_ID, new org.apache.thrift.meta_data.FieldMetaData("latestVersionId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -281,7 +253,7 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
     tmpMap.put(_Fields.VERSION_COUNT, new org.apache.thrift.meta_data.FieldMetaData("versionCount", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ImageSummaryRead.class, metaDataMap);
   }
 
@@ -289,18 +261,18 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
   }
 
   public ImageSummaryRead(
-    String imageBaseId,
-    String latestVersionId,
-    String imageName,
-    String description,
+    java.lang.String imageBaseId,
+    java.lang.String latestVersionId,
+    java.lang.String imageName,
+    java.lang.String description,
     int osId,
-    String virtId,
+    java.lang.String virtId,
     long createTime,
     long updateTime,
     long uploadTime,
     long expireTime,
-    String ownerId,
-    String uploaderId,
+    java.lang.String ownerId,
+    java.lang.String uploaderId,
     ShareMode shareMode,
     long fileSize,
     boolean isRestricted,
@@ -432,11 +404,12 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
     this.versionCount = 0;
   }
 
-  public String getImageBaseId() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getImageBaseId() {
     return this.imageBaseId;
   }
 
-  public ImageSummaryRead setImageBaseId(String imageBaseId) {
+  public ImageSummaryRead setImageBaseId(@org.apache.thrift.annotation.Nullable java.lang.String imageBaseId) {
     this.imageBaseId = imageBaseId;
     return this;
   }
@@ -456,11 +429,12 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
     }
   }
 
-  public String getLatestVersionId() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getLatestVersionId() {
     return this.latestVersionId;
   }
 
-  public ImageSummaryRead setLatestVersionId(String latestVersionId) {
+  public ImageSummaryRead setLatestVersionId(@org.apache.thrift.annotation.Nullable java.lang.String latestVersionId) {
     this.latestVersionId = latestVersionId;
     return this;
   }
@@ -480,11 +454,12 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
     }
   }
 
-  public String getImageName() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getImageName() {
     return this.imageName;
   }
 
-  public ImageSummaryRead setImageName(String imageName) {
+  public ImageSummaryRead setImageName(@org.apache.thrift.annotation.Nullable java.lang.String imageName) {
     this.imageName = imageName;
     return this;
   }
@@ -504,11 +479,12 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
     }
   }
 
-  public String getDescription() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getDescription() {
     return this.description;
   }
 
-  public ImageSummaryRead setDescription(String description) {
+  public ImageSummaryRead setDescription(@org.apache.thrift.annotation.Nullable java.lang.String description) {
     this.description = description;
     return this;
   }
@@ -539,23 +515,24 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
   }
 
   public void unsetOsId() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __OSID_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __OSID_ISSET_ID);
   }
 
   /** Returns true if field osId is set (has been assigned a value) and false otherwise */
   public boolean isSetOsId() {
-    return EncodingUtils.testBit(__isset_bitfield, __OSID_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __OSID_ISSET_ID);
   }
 
   public void setOsIdIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __OSID_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __OSID_ISSET_ID, value);
   }
 
-  public String getVirtId() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getVirtId() {
     return this.virtId;
   }
 
-  public ImageSummaryRead setVirtId(String virtId) {
+  public ImageSummaryRead setVirtId(@org.apache.thrift.annotation.Nullable java.lang.String virtId) {
     this.virtId = virtId;
     return this;
   }
@@ -586,16 +563,16 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
   }
 
   public void unsetCreateTime() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __CREATETIME_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __CREATETIME_ISSET_ID);
   }
 
   /** Returns true if field createTime is set (has been assigned a value) and false otherwise */
   public boolean isSetCreateTime() {
-    return EncodingUtils.testBit(__isset_bitfield, __CREATETIME_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __CREATETIME_ISSET_ID);
   }
 
   public void setCreateTimeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __CREATETIME_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __CREATETIME_ISSET_ID, value);
   }
 
   public long getUpdateTime() {
@@ -609,16 +586,16 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
   }
 
   public void unsetUpdateTime() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __UPDATETIME_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __UPDATETIME_ISSET_ID);
   }
 
   /** Returns true if field updateTime is set (has been assigned a value) and false otherwise */
   public boolean isSetUpdateTime() {
-    return EncodingUtils.testBit(__isset_bitfield, __UPDATETIME_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __UPDATETIME_ISSET_ID);
   }
 
   public void setUpdateTimeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __UPDATETIME_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __UPDATETIME_ISSET_ID, value);
   }
 
   public long getUploadTime() {
@@ -632,16 +609,16 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
   }
 
   public void unsetUploadTime() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __UPLOADTIME_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __UPLOADTIME_ISSET_ID);
   }
 
   /** Returns true if field uploadTime is set (has been assigned a value) and false otherwise */
   public boolean isSetUploadTime() {
-    return EncodingUtils.testBit(__isset_bitfield, __UPLOADTIME_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __UPLOADTIME_ISSET_ID);
   }
 
   public void setUploadTimeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __UPLOADTIME_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __UPLOADTIME_ISSET_ID, value);
   }
 
   public long getExpireTime() {
@@ -655,23 +632,24 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
   }
 
   public void unsetExpireTime() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __EXPIRETIME_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __EXPIRETIME_ISSET_ID);
   }
 
   /** Returns true if field expireTime is set (has been assigned a value) and false otherwise */
   public boolean isSetExpireTime() {
-    return EncodingUtils.testBit(__isset_bitfield, __EXPIRETIME_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __EXPIRETIME_ISSET_ID);
   }
 
   public void setExpireTimeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __EXPIRETIME_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __EXPIRETIME_ISSET_ID, value);
   }
 
-  public String getOwnerId() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getOwnerId() {
     return this.ownerId;
   }
 
-  public ImageSummaryRead setOwnerId(String ownerId) {
+  public ImageSummaryRead setOwnerId(@org.apache.thrift.annotation.Nullable java.lang.String ownerId) {
     this.ownerId = ownerId;
     return this;
   }
@@ -691,11 +669,12 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
     }
   }
 
-  public String getUploaderId() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getUploaderId() {
     return this.uploaderId;
   }
 
-  public ImageSummaryRead setUploaderId(String uploaderId) {
+  public ImageSummaryRead setUploaderId(@org.apache.thrift.annotation.Nullable java.lang.String uploaderId) {
     this.uploaderId = uploaderId;
     return this;
   }
@@ -719,6 +698,7 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
    * 
    * @see ShareMode
    */
+  @org.apache.thrift.annotation.Nullable
   public ShareMode getShareMode() {
     return this.shareMode;
   }
@@ -727,7 +707,7 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
    * 
    * @see ShareMode
    */
-  public ImageSummaryRead setShareMode(ShareMode shareMode) {
+  public ImageSummaryRead setShareMode(@org.apache.thrift.annotation.Nullable ShareMode shareMode) {
     this.shareMode = shareMode;
     return this;
   }
@@ -758,16 +738,16 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
   }
 
   public void unsetFileSize() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __FILESIZE_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __FILESIZE_ISSET_ID);
   }
 
   /** Returns true if field fileSize is set (has been assigned a value) and false otherwise */
   public boolean isSetFileSize() {
-    return EncodingUtils.testBit(__isset_bitfield, __FILESIZE_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __FILESIZE_ISSET_ID);
   }
 
   public void setFileSizeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __FILESIZE_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __FILESIZE_ISSET_ID, value);
   }
 
   public boolean isIsRestricted() {
@@ -781,16 +761,16 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
   }
 
   public void unsetIsRestricted() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISRESTRICTED_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ISRESTRICTED_ISSET_ID);
   }
 
   /** Returns true if field isRestricted is set (has been assigned a value) and false otherwise */
   public boolean isSetIsRestricted() {
-    return EncodingUtils.testBit(__isset_bitfield, __ISRESTRICTED_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ISRESTRICTED_ISSET_ID);
   }
 
   public void setIsRestrictedIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISRESTRICTED_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ISRESTRICTED_ISSET_ID, value);
   }
 
   public boolean isIsValid() {
@@ -804,16 +784,16 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
   }
 
   public void unsetIsValid() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISVALID_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ISVALID_ISSET_ID);
   }
 
   /** Returns true if field isValid is set (has been assigned a value) and false otherwise */
   public boolean isSetIsValid() {
-    return EncodingUtils.testBit(__isset_bitfield, __ISVALID_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ISVALID_ISSET_ID);
   }
 
   public void setIsValidIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISVALID_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ISVALID_ISSET_ID, value);
   }
 
   public boolean isIsProcessed() {
@@ -827,16 +807,16 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
   }
 
   public void unsetIsProcessed() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISPROCESSED_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ISPROCESSED_ISSET_ID);
   }
 
   /** Returns true if field isProcessed is set (has been assigned a value) and false otherwise */
   public boolean isSetIsProcessed() {
-    return EncodingUtils.testBit(__isset_bitfield, __ISPROCESSED_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ISPROCESSED_ISSET_ID);
   }
 
   public void setIsProcessedIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISPROCESSED_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ISPROCESSED_ISSET_ID, value);
   }
 
   public boolean isIsTemplate() {
@@ -850,23 +830,24 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
   }
 
   public void unsetIsTemplate() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISTEMPLATE_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ISTEMPLATE_ISSET_ID);
   }
 
   /** Returns true if field isTemplate is set (has been assigned a value) and false otherwise */
   public boolean isSetIsTemplate() {
-    return EncodingUtils.testBit(__isset_bitfield, __ISTEMPLATE_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ISTEMPLATE_ISSET_ID);
   }
 
   public void setIsTemplateIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISTEMPLATE_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ISTEMPLATE_ISSET_ID, value);
   }
 
+  @org.apache.thrift.annotation.Nullable
   public ImagePermissions getDefaultPermissions() {
     return this.defaultPermissions;
   }
 
-  public ImageSummaryRead setDefaultPermissions(ImagePermissions defaultPermissions) {
+  public ImageSummaryRead setDefaultPermissions(@org.apache.thrift.annotation.Nullable ImagePermissions defaultPermissions) {
     this.defaultPermissions = defaultPermissions;
     return this;
   }
@@ -886,11 +867,12 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
     }
   }
 
+  @org.apache.thrift.annotation.Nullable
   public ImagePermissions getUserPermissions() {
     return this.userPermissions;
   }
 
-  public ImageSummaryRead setUserPermissions(ImagePermissions userPermissions) {
+  public ImageSummaryRead setUserPermissions(@org.apache.thrift.annotation.Nullable ImagePermissions userPermissions) {
     this.userPermissions = userPermissions;
     return this;
   }
@@ -921,16 +903,16 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
   }
 
   public void unsetFileSizeSum() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __FILESIZESUM_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __FILESIZESUM_ISSET_ID);
   }
 
   /** Returns true if field fileSizeSum is set (has been assigned a value) and false otherwise */
   public boolean isSetFileSizeSum() {
-    return EncodingUtils.testBit(__isset_bitfield, __FILESIZESUM_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __FILESIZESUM_ISSET_ID);
   }
 
   public void setFileSizeSumIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __FILESIZESUM_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __FILESIZESUM_ISSET_ID, value);
   }
 
   public int getVersionCount() {
@@ -944,25 +926,25 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
   }
 
   public void unsetVersionCount() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __VERSIONCOUNT_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __VERSIONCOUNT_ISSET_ID);
   }
 
   /** Returns true if field versionCount is set (has been assigned a value) and false otherwise */
   public boolean isSetVersionCount() {
-    return EncodingUtils.testBit(__isset_bitfield, __VERSIONCOUNT_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __VERSIONCOUNT_ISSET_ID);
   }
 
   public void setVersionCountIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __VERSIONCOUNT_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __VERSIONCOUNT_ISSET_ID, value);
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case IMAGE_BASE_ID:
       if (value == null) {
         unsetImageBaseId();
       } else {
-        setImageBaseId((String)value);
+        setImageBaseId((java.lang.String)value);
       }
       break;
 
@@ -970,7 +952,7 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
       if (value == null) {
         unsetLatestVersionId();
       } else {
-        setLatestVersionId((String)value);
+        setLatestVersionId((java.lang.String)value);
       }
       break;
 
@@ -978,7 +960,7 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
       if (value == null) {
         unsetImageName();
       } else {
-        setImageName((String)value);
+        setImageName((java.lang.String)value);
       }
       break;
 
@@ -986,7 +968,7 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
       if (value == null) {
         unsetDescription();
       } else {
-        setDescription((String)value);
+        setDescription((java.lang.String)value);
       }
       break;
 
@@ -994,7 +976,7 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
       if (value == null) {
         unsetOsId();
       } else {
-        setOsId((Integer)value);
+        setOsId((java.lang.Integer)value);
       }
       break;
 
@@ -1002,7 +984,7 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
       if (value == null) {
         unsetVirtId();
       } else {
-        setVirtId((String)value);
+        setVirtId((java.lang.String)value);
       }
       break;
 
@@ -1010,7 +992,7 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
       if (value == null) {
         unsetCreateTime();
       } else {
-        setCreateTime((Long)value);
+        setCreateTime((java.lang.Long)value);
       }
       break;
 
@@ -1018,7 +1000,7 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
       if (value == null) {
         unsetUpdateTime();
       } else {
-        setUpdateTime((Long)value);
+        setUpdateTime((java.lang.Long)value);
       }
       break;
 
@@ -1026,7 +1008,7 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
       if (value == null) {
         unsetUploadTime();
       } else {
-        setUploadTime((Long)value);
+        setUploadTime((java.lang.Long)value);
       }
       break;
 
@@ -1034,7 +1016,7 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
       if (value == null) {
         unsetExpireTime();
       } else {
-        setExpireTime((Long)value);
+        setExpireTime((java.lang.Long)value);
       }
       break;
 
@@ -1042,7 +1024,7 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
       if (value == null) {
         unsetOwnerId();
       } else {
-        setOwnerId((String)value);
+        setOwnerId((java.lang.String)value);
       }
       break;
 
@@ -1050,7 +1032,7 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
       if (value == null) {
         unsetUploaderId();
       } else {
-        setUploaderId((String)value);
+        setUploaderId((java.lang.String)value);
       }
       break;
 
@@ -1066,7 +1048,7 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
       if (value == null) {
         unsetFileSize();
       } else {
-        setFileSize((Long)value);
+        setFileSize((java.lang.Long)value);
       }
       break;
 
@@ -1074,7 +1056,7 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
       if (value == null) {
         unsetIsRestricted();
       } else {
-        setIsRestricted((Boolean)value);
+        setIsRestricted((java.lang.Boolean)value);
       }
       break;
 
@@ -1082,7 +1064,7 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
       if (value == null) {
         unsetIsValid();
       } else {
-        setIsValid((Boolean)value);
+        setIsValid((java.lang.Boolean)value);
       }
       break;
 
@@ -1090,7 +1072,7 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
       if (value == null) {
         unsetIsProcessed();
       } else {
-        setIsProcessed((Boolean)value);
+        setIsProcessed((java.lang.Boolean)value);
       }
       break;
 
@@ -1098,7 +1080,7 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
       if (value == null) {
         unsetIsTemplate();
       } else {
-        setIsTemplate((Boolean)value);
+        setIsTemplate((java.lang.Boolean)value);
       }
       break;
 
@@ -1122,7 +1104,7 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
       if (value == null) {
         unsetFileSizeSum();
       } else {
-        setFileSizeSum((Long)value);
+        setFileSizeSum((java.lang.Long)value);
       }
       break;
 
@@ -1130,14 +1112,15 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
       if (value == null) {
         unsetVersionCount();
       } else {
-        setVersionCount((Integer)value);
+        setVersionCount((java.lang.Integer)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case IMAGE_BASE_ID:
       return getImageBaseId();
@@ -1206,13 +1189,13 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
       return getVersionCount();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -1261,13 +1244,11 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
     case VERSION_COUNT:
       return isSetVersionCount();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
+  public boolean equals(java.lang.Object that) {
     if (that instanceof ImageSummaryRead)
       return this.equals((ImageSummaryRead)that);
     return false;
@@ -1276,6 +1257,8 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
   public boolean equals(ImageSummaryRead that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_imageBaseId = true && this.isSetImageBaseId();
     boolean that_present_imageBaseId = true && that.isSetImageBaseId();
@@ -1480,119 +1463,77 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_imageBaseId = true && (isSetImageBaseId());
-    list.add(present_imageBaseId);
-    if (present_imageBaseId)
-      list.add(imageBaseId);
-
-    boolean present_latestVersionId = true && (isSetLatestVersionId());
-    list.add(present_latestVersionId);
-    if (present_latestVersionId)
-      list.add(latestVersionId);
-
-    boolean present_imageName = true && (isSetImageName());
-    list.add(present_imageName);
-    if (present_imageName)
-      list.add(imageName);
-
-    boolean present_description = true && (isSetDescription());
-    list.add(present_description);
-    if (present_description)
-      list.add(description);
-
-    boolean present_osId = true;
-    list.add(present_osId);
-    if (present_osId)
-      list.add(osId);
-
-    boolean present_virtId = true && (isSetVirtId());
-    list.add(present_virtId);
-    if (present_virtId)
-      list.add(virtId);
-
-    boolean present_createTime = true;
-    list.add(present_createTime);
-    if (present_createTime)
-      list.add(createTime);
-
-    boolean present_updateTime = true;
-    list.add(present_updateTime);
-    if (present_updateTime)
-      list.add(updateTime);
-
-    boolean present_uploadTime = true;
-    list.add(present_uploadTime);
-    if (present_uploadTime)
-      list.add(uploadTime);
-
-    boolean present_expireTime = true;
-    list.add(present_expireTime);
-    if (present_expireTime)
-      list.add(expireTime);
-
-    boolean present_ownerId = true && (isSetOwnerId());
-    list.add(present_ownerId);
-    if (present_ownerId)
-      list.add(ownerId);
-
-    boolean present_uploaderId = true && (isSetUploaderId());
-    list.add(present_uploaderId);
-    if (present_uploaderId)
-      list.add(uploaderId);
-
-    boolean present_shareMode = true && (isSetShareMode());
-    list.add(present_shareMode);
-    if (present_shareMode)
-      list.add(shareMode.getValue());
-
-    boolean present_fileSize = true;
-    list.add(present_fileSize);
-    if (present_fileSize)
-      list.add(fileSize);
-
-    boolean present_isRestricted = true;
-    list.add(present_isRestricted);
-    if (present_isRestricted)
-      list.add(isRestricted);
-
-    boolean present_isValid = true;
-    list.add(present_isValid);
-    if (present_isValid)
-      list.add(isValid);
-
-    boolean present_isProcessed = true;
-    list.add(present_isProcessed);
-    if (present_isProcessed)
-      list.add(isProcessed);
-
-    boolean present_isTemplate = true;
-    list.add(present_isTemplate);
-    if (present_isTemplate)
-      list.add(isTemplate);
-
-    boolean present_defaultPermissions = true && (isSetDefaultPermissions());
-    list.add(present_defaultPermissions);
-    if (present_defaultPermissions)
-      list.add(defaultPermissions);
-
-    boolean present_userPermissions = true && (isSetUserPermissions());
-    list.add(present_userPermissions);
-    if (present_userPermissions)
-      list.add(userPermissions);
-
-    boolean present_fileSizeSum = true && (isSetFileSizeSum());
-    list.add(present_fileSizeSum);
-    if (present_fileSizeSum)
-      list.add(fileSizeSum);
-
-    boolean present_versionCount = true && (isSetVersionCount());
-    list.add(present_versionCount);
-    if (present_versionCount)
-      list.add(versionCount);
-
-    return list.hashCode();
+    int hashCode = 1;
+
+    hashCode = hashCode * 8191 + ((isSetImageBaseId()) ? 131071 : 524287);
+    if (isSetImageBaseId())
+      hashCode = hashCode * 8191 + imageBaseId.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetLatestVersionId()) ? 131071 : 524287);
+    if (isSetLatestVersionId())
+      hashCode = hashCode * 8191 + latestVersionId.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetImageName()) ? 131071 : 524287);
+    if (isSetImageName())
+      hashCode = hashCode * 8191 + imageName.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetDescription()) ? 131071 : 524287);
+    if (isSetDescription())
+      hashCode = hashCode * 8191 + description.hashCode();
+
+    hashCode = hashCode * 8191 + osId;
+
+    hashCode = hashCode * 8191 + ((isSetVirtId()) ? 131071 : 524287);
+    if (isSetVirtId())
+      hashCode = hashCode * 8191 + virtId.hashCode();
+
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(createTime);
+
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(updateTime);
+
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(uploadTime);
+
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(expireTime);
+
+    hashCode = hashCode * 8191 + ((isSetOwnerId()) ? 131071 : 524287);
+    if (isSetOwnerId())
+      hashCode = hashCode * 8191 + ownerId.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetUploaderId()) ? 131071 : 524287);
+    if (isSetUploaderId())
+      hashCode = hashCode * 8191 + uploaderId.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetShareMode()) ? 131071 : 524287);
+    if (isSetShareMode())
+      hashCode = hashCode * 8191 + shareMode.getValue();
+
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(fileSize);
+
+    hashCode = hashCode * 8191 + ((isRestricted) ? 131071 : 524287);
+
+    hashCode = hashCode * 8191 + ((isValid) ? 131071 : 524287);
+
+    hashCode = hashCode * 8191 + ((isProcessed) ? 131071 : 524287);
+
+    hashCode = hashCode * 8191 + ((isTemplate) ? 131071 : 524287);
+
+    hashCode = hashCode * 8191 + ((isSetDefaultPermissions()) ? 131071 : 524287);
+    if (isSetDefaultPermissions())
+      hashCode = hashCode * 8191 + defaultPermissions.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetUserPermissions()) ? 131071 : 524287);
+    if (isSetUserPermissions())
+      hashCode = hashCode * 8191 + userPermissions.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetFileSizeSum()) ? 131071 : 524287);
+    if (isSetFileSizeSum())
+      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(fileSizeSum);
+
+    hashCode = hashCode * 8191 + ((isSetVersionCount()) ? 131071 : 524287);
+    if (isSetVersionCount())
+      hashCode = hashCode * 8191 + versionCount;
+
+    return hashCode;
   }
 
   @Override
@@ -1603,7 +1544,7 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetImageBaseId()).compareTo(other.isSetImageBaseId());
+    lastComparison = java.lang.Boolean.compare(isSetImageBaseId(), other.isSetImageBaseId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1613,7 +1554,7 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetLatestVersionId()).compareTo(other.isSetLatestVersionId());
+    lastComparison = java.lang.Boolean.compare(isSetLatestVersionId(), other.isSetLatestVersionId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1623,7 +1564,7 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetImageName()).compareTo(other.isSetImageName());
+    lastComparison = java.lang.Boolean.compare(isSetImageName(), other.isSetImageName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1633,7 +1574,7 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetDescription()).compareTo(other.isSetDescription());
+    lastComparison = java.lang.Boolean.compare(isSetDescription(), other.isSetDescription());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1643,7 +1584,7 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetOsId()).compareTo(other.isSetOsId());
+    lastComparison = java.lang.Boolean.compare(isSetOsId(), other.isSetOsId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1653,7 +1594,7 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetVirtId()).compareTo(other.isSetVirtId());
+    lastComparison = java.lang.Boolean.compare(isSetVirtId(), other.isSetVirtId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1663,7 +1604,7 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetCreateTime()).compareTo(other.isSetCreateTime());
+    lastComparison = java.lang.Boolean.compare(isSetCreateTime(), other.isSetCreateTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1673,7 +1614,7 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetUpdateTime()).compareTo(other.isSetUpdateTime());
+    lastComparison = java.lang.Boolean.compare(isSetUpdateTime(), other.isSetUpdateTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1683,7 +1624,7 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetUploadTime()).compareTo(other.isSetUploadTime());
+    lastComparison = java.lang.Boolean.compare(isSetUploadTime(), other.isSetUploadTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1693,7 +1634,7 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetExpireTime()).compareTo(other.isSetExpireTime());
+    lastComparison = java.lang.Boolean.compare(isSetExpireTime(), other.isSetExpireTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1703,7 +1644,7 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetOwnerId()).compareTo(other.isSetOwnerId());
+    lastComparison = java.lang.Boolean.compare(isSetOwnerId(), other.isSetOwnerId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1713,7 +1654,7 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetUploaderId()).compareTo(other.isSetUploaderId());
+    lastComparison = java.lang.Boolean.compare(isSetUploaderId(), other.isSetUploaderId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1723,7 +1664,7 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetShareMode()).compareTo(other.isSetShareMode());
+    lastComparison = java.lang.Boolean.compare(isSetShareMode(), other.isSetShareMode());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1733,7 +1674,7 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetFileSize()).compareTo(other.isSetFileSize());
+    lastComparison = java.lang.Boolean.compare(isSetFileSize(), other.isSetFileSize());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1743,7 +1684,7 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetIsRestricted()).compareTo(other.isSetIsRestricted());
+    lastComparison = java.lang.Boolean.compare(isSetIsRestricted(), other.isSetIsRestricted());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1753,7 +1694,7 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetIsValid()).compareTo(other.isSetIsValid());
+    lastComparison = java.lang.Boolean.compare(isSetIsValid(), other.isSetIsValid());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1763,7 +1704,7 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetIsProcessed()).compareTo(other.isSetIsProcessed());
+    lastComparison = java.lang.Boolean.compare(isSetIsProcessed(), other.isSetIsProcessed());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1773,7 +1714,7 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetIsTemplate()).compareTo(other.isSetIsTemplate());
+    lastComparison = java.lang.Boolean.compare(isSetIsTemplate(), other.isSetIsTemplate());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1783,7 +1724,7 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetDefaultPermissions()).compareTo(other.isSetDefaultPermissions());
+    lastComparison = java.lang.Boolean.compare(isSetDefaultPermissions(), other.isSetDefaultPermissions());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1793,7 +1734,7 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetUserPermissions()).compareTo(other.isSetUserPermissions());
+    lastComparison = java.lang.Boolean.compare(isSetUserPermissions(), other.isSetUserPermissions());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1803,7 +1744,7 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetFileSizeSum()).compareTo(other.isSetFileSizeSum());
+    lastComparison = java.lang.Boolean.compare(isSetFileSizeSum(), other.isSetFileSizeSum());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1813,7 +1754,7 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetVersionCount()).compareTo(other.isSetVersionCount());
+    lastComparison = java.lang.Boolean.compare(isSetVersionCount(), other.isSetVersionCount());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1826,21 +1767,22 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
     return 0;
   }
 
+  @org.apache.thrift.annotation.Nullable
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("ImageSummaryRead(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("ImageSummaryRead(");
     boolean first = true;
 
     sb.append("imageBaseId:");
@@ -1999,7 +1941,7 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -2009,13 +1951,13 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
     }
   }
 
-  private static class ImageSummaryReadStandardSchemeFactory implements SchemeFactory {
+  private static class ImageSummaryReadStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public ImageSummaryReadStandardScheme getScheme() {
       return new ImageSummaryReadStandardScheme();
     }
   }
 
-  private static class ImageSummaryReadStandardScheme extends StandardScheme<ImageSummaryRead> {
+  private static class ImageSummaryReadStandardScheme extends org.apache.thrift.scheme.StandardScheme<ImageSummaryRead> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, ImageSummaryRead struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -2318,18 +2260,18 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
 
   }
 
-  private static class ImageSummaryReadTupleSchemeFactory implements SchemeFactory {
+  private static class ImageSummaryReadTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public ImageSummaryReadTupleScheme getScheme() {
       return new ImageSummaryReadTupleScheme();
     }
   }
 
-  private static class ImageSummaryReadTupleScheme extends TupleScheme<ImageSummaryRead> {
+  private static class ImageSummaryReadTupleScheme extends org.apache.thrift.scheme.TupleScheme<ImageSummaryRead> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, ImageSummaryRead struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetImageBaseId()) {
         optionals.set(0);
       }
@@ -2467,8 +2409,8 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, ImageSummaryRead struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(22);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(22);
       if (incoming.get(0)) {
         struct.imageBaseId = iprot.readString();
         struct.setImageBaseIdIsSet(true);
@@ -2562,5 +2504,8 @@ public class ImageSummaryRead implements org.apache.thrift.TBase<ImageSummaryRea
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/ImageVersionDetails.java b/src/main/java/org/openslx/bwlp/thrift/iface/ImageVersionDetails.java
index abba44a..27d3256 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/ImageVersionDetails.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/ImageVersionDetails.java
@@ -1,40 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.openslx.bwlp.thrift.iface;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
 public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersionDetails, ImageVersionDetails._Fields>, java.io.Serializable, Cloneable, Comparable<ImageVersionDetails> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ImageVersionDetails");
 
@@ -48,21 +21,18 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
   private static final org.apache.thrift.protocol.TField IS_PROCESSED_FIELD_DESC = new org.apache.thrift.protocol.TField("isProcessed", org.apache.thrift.protocol.TType.BOOL, (short)9);
   private static final org.apache.thrift.protocol.TField SOFTWARE_FIELD_DESC = new org.apache.thrift.protocol.TField("software", org.apache.thrift.protocol.TType.LIST, (short)10);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new ImageVersionDetailsStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new ImageVersionDetailsTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ImageVersionDetailsStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ImageVersionDetailsTupleSchemeFactory();
 
-  public String versionId; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String versionId; // required
   public long createTime; // required
   public long expireTime; // required
   public long fileSize; // required
-  public String uploaderId; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String uploaderId; // required
   public boolean isRestricted; // required
   public boolean isValid; // required
   public boolean isProcessed; // required
-  public List<String> software; // required
+  public @org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> software; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -76,10 +46,10 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
     IS_PROCESSED((short)9, "isProcessed"),
     SOFTWARE((short)10, "software");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -87,6 +57,7 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
     /**
      * Find the _Fields constant that matches fieldId, or null if its not found.
      */
+    @org.apache.thrift.annotation.Nullable
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
         case 1: // VERSION_ID
@@ -118,21 +89,22 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    @org.apache.thrift.annotation.Nullable
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -141,7 +113,7 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -154,9 +126,9 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
   private static final int __ISVALID_ISSET_ID = 4;
   private static final int __ISPROCESSED_ISSET_ID = 5;
   private byte __isset_bitfield = 0;
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.VERSION_ID, new org.apache.thrift.meta_data.FieldMetaData("versionId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , "UUID")));
     tmpMap.put(_Fields.CREATE_TIME, new org.apache.thrift.meta_data.FieldMetaData("createTime", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -176,7 +148,7 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
     tmpMap.put(_Fields.SOFTWARE, new org.apache.thrift.meta_data.FieldMetaData("software", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
             new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ImageVersionDetails.class, metaDataMap);
   }
 
@@ -184,15 +156,15 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
   }
 
   public ImageVersionDetails(
-    String versionId,
+    java.lang.String versionId,
     long createTime,
     long expireTime,
     long fileSize,
-    String uploaderId,
+    java.lang.String uploaderId,
     boolean isRestricted,
     boolean isValid,
     boolean isProcessed,
-    List<String> software)
+    java.util.List<java.lang.String> software)
   {
     this();
     this.versionId = versionId;
@@ -230,7 +202,7 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
     this.isValid = other.isValid;
     this.isProcessed = other.isProcessed;
     if (other.isSetSoftware()) {
-      List<String> __this__software = new ArrayList<String>(other.software);
+      java.util.List<java.lang.String> __this__software = new java.util.ArrayList<java.lang.String>(other.software);
       this.software = __this__software;
     }
   }
@@ -258,11 +230,12 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
     this.software = null;
   }
 
-  public String getVersionId() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getVersionId() {
     return this.versionId;
   }
 
-  public ImageVersionDetails setVersionId(String versionId) {
+  public ImageVersionDetails setVersionId(@org.apache.thrift.annotation.Nullable java.lang.String versionId) {
     this.versionId = versionId;
     return this;
   }
@@ -293,16 +266,16 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
   }
 
   public void unsetCreateTime() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __CREATETIME_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __CREATETIME_ISSET_ID);
   }
 
   /** Returns true if field createTime is set (has been assigned a value) and false otherwise */
   public boolean isSetCreateTime() {
-    return EncodingUtils.testBit(__isset_bitfield, __CREATETIME_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __CREATETIME_ISSET_ID);
   }
 
   public void setCreateTimeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __CREATETIME_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __CREATETIME_ISSET_ID, value);
   }
 
   public long getExpireTime() {
@@ -316,16 +289,16 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
   }
 
   public void unsetExpireTime() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __EXPIRETIME_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __EXPIRETIME_ISSET_ID);
   }
 
   /** Returns true if field expireTime is set (has been assigned a value) and false otherwise */
   public boolean isSetExpireTime() {
-    return EncodingUtils.testBit(__isset_bitfield, __EXPIRETIME_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __EXPIRETIME_ISSET_ID);
   }
 
   public void setExpireTimeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __EXPIRETIME_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __EXPIRETIME_ISSET_ID, value);
   }
 
   public long getFileSize() {
@@ -339,23 +312,24 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
   }
 
   public void unsetFileSize() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __FILESIZE_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __FILESIZE_ISSET_ID);
   }
 
   /** Returns true if field fileSize is set (has been assigned a value) and false otherwise */
   public boolean isSetFileSize() {
-    return EncodingUtils.testBit(__isset_bitfield, __FILESIZE_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __FILESIZE_ISSET_ID);
   }
 
   public void setFileSizeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __FILESIZE_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __FILESIZE_ISSET_ID, value);
   }
 
-  public String getUploaderId() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getUploaderId() {
     return this.uploaderId;
   }
 
-  public ImageVersionDetails setUploaderId(String uploaderId) {
+  public ImageVersionDetails setUploaderId(@org.apache.thrift.annotation.Nullable java.lang.String uploaderId) {
     this.uploaderId = uploaderId;
     return this;
   }
@@ -386,16 +360,16 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
   }
 
   public void unsetIsRestricted() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISRESTRICTED_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ISRESTRICTED_ISSET_ID);
   }
 
   /** Returns true if field isRestricted is set (has been assigned a value) and false otherwise */
   public boolean isSetIsRestricted() {
-    return EncodingUtils.testBit(__isset_bitfield, __ISRESTRICTED_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ISRESTRICTED_ISSET_ID);
   }
 
   public void setIsRestrictedIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISRESTRICTED_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ISRESTRICTED_ISSET_ID, value);
   }
 
   public boolean isIsValid() {
@@ -409,16 +383,16 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
   }
 
   public void unsetIsValid() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISVALID_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ISVALID_ISSET_ID);
   }
 
   /** Returns true if field isValid is set (has been assigned a value) and false otherwise */
   public boolean isSetIsValid() {
-    return EncodingUtils.testBit(__isset_bitfield, __ISVALID_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ISVALID_ISSET_ID);
   }
 
   public void setIsValidIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISVALID_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ISVALID_ISSET_ID, value);
   }
 
   public boolean isIsProcessed() {
@@ -432,38 +406,40 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
   }
 
   public void unsetIsProcessed() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISPROCESSED_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ISPROCESSED_ISSET_ID);
   }
 
   /** Returns true if field isProcessed is set (has been assigned a value) and false otherwise */
   public boolean isSetIsProcessed() {
-    return EncodingUtils.testBit(__isset_bitfield, __ISPROCESSED_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ISPROCESSED_ISSET_ID);
   }
 
   public void setIsProcessedIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISPROCESSED_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ISPROCESSED_ISSET_ID, value);
   }
 
   public int getSoftwareSize() {
     return (this.software == null) ? 0 : this.software.size();
   }
 
-  public java.util.Iterator<String> getSoftwareIterator() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.Iterator<java.lang.String> getSoftwareIterator() {
     return (this.software == null) ? null : this.software.iterator();
   }
 
-  public void addToSoftware(String elem) {
+  public void addToSoftware(java.lang.String elem) {
     if (this.software == null) {
-      this.software = new ArrayList<String>();
+      this.software = new java.util.ArrayList<java.lang.String>();
     }
     this.software.add(elem);
   }
 
-  public List<String> getSoftware() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.List<java.lang.String> getSoftware() {
     return this.software;
   }
 
-  public ImageVersionDetails setSoftware(List<String> software) {
+  public ImageVersionDetails setSoftware(@org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> software) {
     this.software = software;
     return this;
   }
@@ -483,13 +459,13 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case VERSION_ID:
       if (value == null) {
         unsetVersionId();
       } else {
-        setVersionId((String)value);
+        setVersionId((java.lang.String)value);
       }
       break;
 
@@ -497,7 +473,7 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
       if (value == null) {
         unsetCreateTime();
       } else {
-        setCreateTime((Long)value);
+        setCreateTime((java.lang.Long)value);
       }
       break;
 
@@ -505,7 +481,7 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
       if (value == null) {
         unsetExpireTime();
       } else {
-        setExpireTime((Long)value);
+        setExpireTime((java.lang.Long)value);
       }
       break;
 
@@ -513,7 +489,7 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
       if (value == null) {
         unsetFileSize();
       } else {
-        setFileSize((Long)value);
+        setFileSize((java.lang.Long)value);
       }
       break;
 
@@ -521,7 +497,7 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
       if (value == null) {
         unsetUploaderId();
       } else {
-        setUploaderId((String)value);
+        setUploaderId((java.lang.String)value);
       }
       break;
 
@@ -529,7 +505,7 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
       if (value == null) {
         unsetIsRestricted();
       } else {
-        setIsRestricted((Boolean)value);
+        setIsRestricted((java.lang.Boolean)value);
       }
       break;
 
@@ -537,7 +513,7 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
       if (value == null) {
         unsetIsValid();
       } else {
-        setIsValid((Boolean)value);
+        setIsValid((java.lang.Boolean)value);
       }
       break;
 
@@ -545,7 +521,7 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
       if (value == null) {
         unsetIsProcessed();
       } else {
-        setIsProcessed((Boolean)value);
+        setIsProcessed((java.lang.Boolean)value);
       }
       break;
 
@@ -553,14 +529,15 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
       if (value == null) {
         unsetSoftware();
       } else {
-        setSoftware((List<String>)value);
+        setSoftware((java.util.List<java.lang.String>)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case VERSION_ID:
       return getVersionId();
@@ -590,13 +567,13 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
       return getSoftware();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -619,13 +596,11 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
     case SOFTWARE:
       return isSetSoftware();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
+  public boolean equals(java.lang.Object that) {
     if (that instanceof ImageVersionDetails)
       return this.equals((ImageVersionDetails)that);
     return false;
@@ -634,6 +609,8 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
   public boolean equals(ImageVersionDetails that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_versionId = true && this.isSetVersionId();
     boolean that_present_versionId = true && that.isSetVersionId();
@@ -721,54 +698,33 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_versionId = true && (isSetVersionId());
-    list.add(present_versionId);
-    if (present_versionId)
-      list.add(versionId);
+    hashCode = hashCode * 8191 + ((isSetVersionId()) ? 131071 : 524287);
+    if (isSetVersionId())
+      hashCode = hashCode * 8191 + versionId.hashCode();
 
-    boolean present_createTime = true;
-    list.add(present_createTime);
-    if (present_createTime)
-      list.add(createTime);
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(createTime);
 
-    boolean present_expireTime = true;
-    list.add(present_expireTime);
-    if (present_expireTime)
-      list.add(expireTime);
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(expireTime);
 
-    boolean present_fileSize = true;
-    list.add(present_fileSize);
-    if (present_fileSize)
-      list.add(fileSize);
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(fileSize);
 
-    boolean present_uploaderId = true && (isSetUploaderId());
-    list.add(present_uploaderId);
-    if (present_uploaderId)
-      list.add(uploaderId);
+    hashCode = hashCode * 8191 + ((isSetUploaderId()) ? 131071 : 524287);
+    if (isSetUploaderId())
+      hashCode = hashCode * 8191 + uploaderId.hashCode();
 
-    boolean present_isRestricted = true;
-    list.add(present_isRestricted);
-    if (present_isRestricted)
-      list.add(isRestricted);
+    hashCode = hashCode * 8191 + ((isRestricted) ? 131071 : 524287);
 
-    boolean present_isValid = true;
-    list.add(present_isValid);
-    if (present_isValid)
-      list.add(isValid);
+    hashCode = hashCode * 8191 + ((isValid) ? 131071 : 524287);
 
-    boolean present_isProcessed = true;
-    list.add(present_isProcessed);
-    if (present_isProcessed)
-      list.add(isProcessed);
+    hashCode = hashCode * 8191 + ((isProcessed) ? 131071 : 524287);
 
-    boolean present_software = true && (isSetSoftware());
-    list.add(present_software);
-    if (present_software)
-      list.add(software);
+    hashCode = hashCode * 8191 + ((isSetSoftware()) ? 131071 : 524287);
+    if (isSetSoftware())
+      hashCode = hashCode * 8191 + software.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -779,7 +735,7 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetVersionId()).compareTo(other.isSetVersionId());
+    lastComparison = java.lang.Boolean.compare(isSetVersionId(), other.isSetVersionId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -789,7 +745,7 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetCreateTime()).compareTo(other.isSetCreateTime());
+    lastComparison = java.lang.Boolean.compare(isSetCreateTime(), other.isSetCreateTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -799,7 +755,7 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetExpireTime()).compareTo(other.isSetExpireTime());
+    lastComparison = java.lang.Boolean.compare(isSetExpireTime(), other.isSetExpireTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -809,7 +765,7 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetFileSize()).compareTo(other.isSetFileSize());
+    lastComparison = java.lang.Boolean.compare(isSetFileSize(), other.isSetFileSize());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -819,7 +775,7 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetUploaderId()).compareTo(other.isSetUploaderId());
+    lastComparison = java.lang.Boolean.compare(isSetUploaderId(), other.isSetUploaderId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -829,7 +785,7 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetIsRestricted()).compareTo(other.isSetIsRestricted());
+    lastComparison = java.lang.Boolean.compare(isSetIsRestricted(), other.isSetIsRestricted());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -839,7 +795,7 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetIsValid()).compareTo(other.isSetIsValid());
+    lastComparison = java.lang.Boolean.compare(isSetIsValid(), other.isSetIsValid());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -849,7 +805,7 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetIsProcessed()).compareTo(other.isSetIsProcessed());
+    lastComparison = java.lang.Boolean.compare(isSetIsProcessed(), other.isSetIsProcessed());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -859,7 +815,7 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetSoftware()).compareTo(other.isSetSoftware());
+    lastComparison = java.lang.Boolean.compare(isSetSoftware(), other.isSetSoftware());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -872,21 +828,22 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
     return 0;
   }
 
+  @org.apache.thrift.annotation.Nullable
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("ImageVersionDetails(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("ImageVersionDetails(");
     boolean first = true;
 
     sb.append("versionId:");
@@ -953,7 +910,7 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -963,13 +920,13 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
     }
   }
 
-  private static class ImageVersionDetailsStandardSchemeFactory implements SchemeFactory {
+  private static class ImageVersionDetailsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public ImageVersionDetailsStandardScheme getScheme() {
       return new ImageVersionDetailsStandardScheme();
     }
   }
 
-  private static class ImageVersionDetailsStandardScheme extends StandardScheme<ImageVersionDetails> {
+  private static class ImageVersionDetailsStandardScheme extends org.apache.thrift.scheme.StandardScheme<ImageVersionDetails> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, ImageVersionDetails struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -1049,8 +1006,8 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list50 = iprot.readListBegin();
-                struct.software = new ArrayList<String>(_list50.size);
-                String _elem51;
+                struct.software = new java.util.ArrayList<java.lang.String>(_list50.size);
+                @org.apache.thrift.annotation.Nullable java.lang.String _elem51;
                 for (int _i52 = 0; _i52 < _list50.size; ++_i52)
                 {
                   _elem51 = iprot.readString();
@@ -1110,7 +1067,7 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
         oprot.writeFieldBegin(SOFTWARE_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.software.size()));
-          for (String _iter53 : struct.software)
+          for (java.lang.String _iter53 : struct.software)
           {
             oprot.writeString(_iter53);
           }
@@ -1124,18 +1081,18 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
 
   }
 
-  private static class ImageVersionDetailsTupleSchemeFactory implements SchemeFactory {
+  private static class ImageVersionDetailsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public ImageVersionDetailsTupleScheme getScheme() {
       return new ImageVersionDetailsTupleScheme();
     }
   }
 
-  private static class ImageVersionDetailsTupleScheme extends TupleScheme<ImageVersionDetails> {
+  private static class ImageVersionDetailsTupleScheme extends org.apache.thrift.scheme.TupleScheme<ImageVersionDetails> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, ImageVersionDetails struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetVersionId()) {
         optionals.set(0);
       }
@@ -1191,7 +1148,7 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
       if (struct.isSetSoftware()) {
         {
           oprot.writeI32(struct.software.size());
-          for (String _iter54 : struct.software)
+          for (java.lang.String _iter54 : struct.software)
           {
             oprot.writeString(_iter54);
           }
@@ -1201,8 +1158,8 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, ImageVersionDetails struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(9);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(9);
       if (incoming.get(0)) {
         struct.versionId = iprot.readString();
         struct.setVersionIdIsSet(true);
@@ -1237,9 +1194,9 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
       }
       if (incoming.get(8)) {
         {
-          org.apache.thrift.protocol.TList _list55 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.software = new ArrayList<String>(_list55.size);
-          String _elem56;
+          org.apache.thrift.protocol.TList _list55 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+          struct.software = new java.util.ArrayList<java.lang.String>(_list55.size);
+          @org.apache.thrift.annotation.Nullable java.lang.String _elem56;
           for (int _i57 = 0; _i57 < _list55.size; ++_i57)
           {
             _elem56 = iprot.readString();
@@ -1251,5 +1208,8 @@ public class ImageVersionDetails implements org.apache.thrift.TBase<ImageVersion
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/ImageVersionWrite.java b/src/main/java/org/openslx/bwlp/thrift/iface/ImageVersionWrite.java
index 70a41fd..1870045 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/ImageVersionWrite.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/ImageVersionWrite.java
@@ -1,50 +1,20 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.openslx.bwlp.thrift.iface;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
 public class ImageVersionWrite implements org.apache.thrift.TBase<ImageVersionWrite, ImageVersionWrite._Fields>, java.io.Serializable, Cloneable, Comparable<ImageVersionWrite> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ImageVersionWrite");
 
   private static final org.apache.thrift.protocol.TField IS_RESTRICTED_FIELD_DESC = new org.apache.thrift.protocol.TField("isRestricted", org.apache.thrift.protocol.TType.BOOL, (short)2);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new ImageVersionWriteStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new ImageVersionWriteTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ImageVersionWriteStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ImageVersionWriteTupleSchemeFactory();
 
   public boolean isRestricted; // required
 
@@ -52,10 +22,10 @@ public class ImageVersionWrite implements org.apache.thrift.TBase<ImageVersionWr
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     IS_RESTRICTED((short)2, "isRestricted");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -63,6 +33,7 @@ public class ImageVersionWrite implements org.apache.thrift.TBase<ImageVersionWr
     /**
      * Find the _Fields constant that matches fieldId, or null if its not found.
      */
+    @org.apache.thrift.annotation.Nullable
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
         case 2: // IS_RESTRICTED
@@ -78,21 +49,22 @@ public class ImageVersionWrite implements org.apache.thrift.TBase<ImageVersionWr
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    @org.apache.thrift.annotation.Nullable
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -101,7 +73,7 @@ public class ImageVersionWrite implements org.apache.thrift.TBase<ImageVersionWr
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -109,12 +81,12 @@ public class ImageVersionWrite implements org.apache.thrift.TBase<ImageVersionWr
   // isset id assignments
   private static final int __ISRESTRICTED_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.IS_RESTRICTED, new org.apache.thrift.meta_data.FieldMetaData("isRestricted", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ImageVersionWrite.class, metaDataMap);
   }
 
@@ -158,57 +130,56 @@ public class ImageVersionWrite implements org.apache.thrift.TBase<ImageVersionWr
   }
 
   public void unsetIsRestricted() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISRESTRICTED_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ISRESTRICTED_ISSET_ID);
   }
 
   /** Returns true if field isRestricted is set (has been assigned a value) and false otherwise */
   public boolean isSetIsRestricted() {
-    return EncodingUtils.testBit(__isset_bitfield, __ISRESTRICTED_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ISRESTRICTED_ISSET_ID);
   }
 
   public void setIsRestrictedIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISRESTRICTED_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ISRESTRICTED_ISSET_ID, value);
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case IS_RESTRICTED:
       if (value == null) {
         unsetIsRestricted();
       } else {
-        setIsRestricted((Boolean)value);
+        setIsRestricted((java.lang.Boolean)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case IS_RESTRICTED:
       return isIsRestricted();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
     case IS_RESTRICTED:
       return isSetIsRestricted();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
+  public boolean equals(java.lang.Object that) {
     if (that instanceof ImageVersionWrite)
       return this.equals((ImageVersionWrite)that);
     return false;
@@ -217,6 +188,8 @@ public class ImageVersionWrite implements org.apache.thrift.TBase<ImageVersionWr
   public boolean equals(ImageVersionWrite that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_isRestricted = true;
     boolean that_present_isRestricted = true;
@@ -232,14 +205,11 @@ public class ImageVersionWrite implements org.apache.thrift.TBase<ImageVersionWr
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_isRestricted = true;
-    list.add(present_isRestricted);
-    if (present_isRestricted)
-      list.add(isRestricted);
+    hashCode = hashCode * 8191 + ((isRestricted) ? 131071 : 524287);
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -250,7 +220,7 @@ public class ImageVersionWrite implements org.apache.thrift.TBase<ImageVersionWr
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetIsRestricted()).compareTo(other.isSetIsRestricted());
+    lastComparison = java.lang.Boolean.compare(isSetIsRestricted(), other.isSetIsRestricted());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -263,21 +233,22 @@ public class ImageVersionWrite implements org.apache.thrift.TBase<ImageVersionWr
     return 0;
   }
 
+  @org.apache.thrift.annotation.Nullable
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("ImageVersionWrite(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("ImageVersionWrite(");
     boolean first = true;
 
     sb.append("isRestricted:");
@@ -300,7 +271,7 @@ public class ImageVersionWrite implements org.apache.thrift.TBase<ImageVersionWr
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -310,13 +281,13 @@ public class ImageVersionWrite implements org.apache.thrift.TBase<ImageVersionWr
     }
   }
 
-  private static class ImageVersionWriteStandardSchemeFactory implements SchemeFactory {
+  private static class ImageVersionWriteStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public ImageVersionWriteStandardScheme getScheme() {
       return new ImageVersionWriteStandardScheme();
     }
   }
 
-  private static class ImageVersionWriteStandardScheme extends StandardScheme<ImageVersionWrite> {
+  private static class ImageVersionWriteStandardScheme extends org.apache.thrift.scheme.StandardScheme<ImageVersionWrite> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, ImageVersionWrite struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -360,18 +331,18 @@ public class ImageVersionWrite implements org.apache.thrift.TBase<ImageVersionWr
 
   }
 
-  private static class ImageVersionWriteTupleSchemeFactory implements SchemeFactory {
+  private static class ImageVersionWriteTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public ImageVersionWriteTupleScheme getScheme() {
       return new ImageVersionWriteTupleScheme();
     }
   }
 
-  private static class ImageVersionWriteTupleScheme extends TupleScheme<ImageVersionWrite> {
+  private static class ImageVersionWriteTupleScheme extends org.apache.thrift.scheme.TupleScheme<ImageVersionWrite> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, ImageVersionWrite struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetIsRestricted()) {
         optionals.set(0);
       }
@@ -383,8 +354,8 @@ public class ImageVersionWrite implements org.apache.thrift.TBase<ImageVersionWr
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, ImageVersionWrite struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(1);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(1);
       if (incoming.get(0)) {
         struct.isRestricted = iprot.readBool();
         struct.setIsRestrictedIsSet(true);
@@ -392,5 +363,8 @@ public class ImageVersionWrite implements org.apache.thrift.TBase<ImageVersionWr
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/InvocationError.java b/src/main/java/org/openslx/bwlp/thrift/iface/InvocationError.java
index 5f2b9a9..93d1477 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/InvocationError.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/InvocationError.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,10 +7,7 @@
 package org.openslx.bwlp.thrift.iface;
 
 
-import java.util.Map;
-import java.util.HashMap;
-import org.apache.thrift.TEnum;
-
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
 public enum InvocationError implements org.apache.thrift.TEnum {
   MISSING_DATA(0),
   INVALID_DATA(1),
@@ -37,6 +34,7 @@ public enum InvocationError implements org.apache.thrift.TEnum {
    * Find a the enum type by its integer value, as defined in the Thrift IDL.
    * @return null if the value is not found.
    */
+  @org.apache.thrift.annotation.Nullable
   public static InvocationError findByValue(int value) { 
     switch (value) {
       case 0:
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/LdapFilter.java b/src/main/java/org/openslx/bwlp/thrift/iface/LdapFilter.java
index ba80e7b..3666868 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/LdapFilter.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/LdapFilter.java
@@ -1,40 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.openslx.bwlp.thrift.iface;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2018-11-23")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
 public class LdapFilter implements org.apache.thrift.TBase<LdapFilter, LdapFilter._Fields>, java.io.Serializable, Cloneable, Comparable<LdapFilter> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LdapFilter");
 
@@ -43,16 +16,13 @@ public class LdapFilter implements org.apache.thrift.TBase<LdapFilter, LdapFilte
   private static final org.apache.thrift.protocol.TField FILTER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("filterId", org.apache.thrift.protocol.TType.I32, (short)3);
   private static final org.apache.thrift.protocol.TField TITLE_FIELD_DESC = new org.apache.thrift.protocol.TField("title", org.apache.thrift.protocol.TType.STRING, (short)4);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new LdapFilterStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new LdapFilterTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new LdapFilterStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new LdapFilterTupleSchemeFactory();
 
-  public String attribute; // required
-  public String value; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String attribute; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String value; // required
   public int filterId; // optional
-  public String title; // optional
+  public @org.apache.thrift.annotation.Nullable java.lang.String title; // optional
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -61,10 +31,10 @@ public class LdapFilter implements org.apache.thrift.TBase<LdapFilter, LdapFilte
     FILTER_ID((short)3, "filterId"),
     TITLE((short)4, "title");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -72,6 +42,7 @@ public class LdapFilter implements org.apache.thrift.TBase<LdapFilter, LdapFilte
     /**
      * Find the _Fields constant that matches fieldId, or null if its not found.
      */
+    @org.apache.thrift.annotation.Nullable
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
         case 1: // ATTRIBUTE
@@ -93,21 +64,22 @@ public class LdapFilter implements org.apache.thrift.TBase<LdapFilter, LdapFilte
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    @org.apache.thrift.annotation.Nullable
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -116,7 +88,7 @@ public class LdapFilter implements org.apache.thrift.TBase<LdapFilter, LdapFilte
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -125,9 +97,9 @@ public class LdapFilter implements org.apache.thrift.TBase<LdapFilter, LdapFilte
   private static final int __FILTERID_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.FILTER_ID,_Fields.TITLE};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.ATTRIBUTE, new org.apache.thrift.meta_data.FieldMetaData("attribute", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.VALUE, new org.apache.thrift.meta_data.FieldMetaData("value", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -136,7 +108,7 @@ public class LdapFilter implements org.apache.thrift.TBase<LdapFilter, LdapFilte
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
     tmpMap.put(_Fields.TITLE, new org.apache.thrift.meta_data.FieldMetaData("title", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LdapFilter.class, metaDataMap);
   }
 
@@ -144,8 +116,8 @@ public class LdapFilter implements org.apache.thrift.TBase<LdapFilter, LdapFilte
   }
 
   public LdapFilter(
-    String attribute,
-    String value)
+    java.lang.String attribute,
+    java.lang.String value)
   {
     this();
     this.attribute = attribute;
@@ -182,11 +154,12 @@ public class LdapFilter implements org.apache.thrift.TBase<LdapFilter, LdapFilte
     this.title = null;
   }
 
-  public String getAttribute() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getAttribute() {
     return this.attribute;
   }
 
-  public LdapFilter setAttribute(String attribute) {
+  public LdapFilter setAttribute(@org.apache.thrift.annotation.Nullable java.lang.String attribute) {
     this.attribute = attribute;
     return this;
   }
@@ -206,11 +179,12 @@ public class LdapFilter implements org.apache.thrift.TBase<LdapFilter, LdapFilte
     }
   }
 
-  public String getValue() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getValue() {
     return this.value;
   }
 
-  public LdapFilter setValue(String value) {
+  public LdapFilter setValue(@org.apache.thrift.annotation.Nullable java.lang.String value) {
     this.value = value;
     return this;
   }
@@ -241,23 +215,24 @@ public class LdapFilter implements org.apache.thrift.TBase<LdapFilter, LdapFilte
   }
 
   public void unsetFilterId() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __FILTERID_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __FILTERID_ISSET_ID);
   }
 
   /** Returns true if field filterId is set (has been assigned a value) and false otherwise */
   public boolean isSetFilterId() {
-    return EncodingUtils.testBit(__isset_bitfield, __FILTERID_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __FILTERID_ISSET_ID);
   }
 
   public void setFilterIdIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __FILTERID_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __FILTERID_ISSET_ID, value);
   }
 
-  public String getTitle() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getTitle() {
     return this.title;
   }
 
-  public LdapFilter setTitle(String title) {
+  public LdapFilter setTitle(@org.apache.thrift.annotation.Nullable java.lang.String title) {
     this.title = title;
     return this;
   }
@@ -277,13 +252,13 @@ public class LdapFilter implements org.apache.thrift.TBase<LdapFilter, LdapFilte
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case ATTRIBUTE:
       if (value == null) {
         unsetAttribute();
       } else {
-        setAttribute((String)value);
+        setAttribute((java.lang.String)value);
       }
       break;
 
@@ -291,7 +266,7 @@ public class LdapFilter implements org.apache.thrift.TBase<LdapFilter, LdapFilte
       if (value == null) {
         unsetValue();
       } else {
-        setValue((String)value);
+        setValue((java.lang.String)value);
       }
       break;
 
@@ -299,7 +274,7 @@ public class LdapFilter implements org.apache.thrift.TBase<LdapFilter, LdapFilte
       if (value == null) {
         unsetFilterId();
       } else {
-        setFilterId((Integer)value);
+        setFilterId((java.lang.Integer)value);
       }
       break;
 
@@ -307,14 +282,15 @@ public class LdapFilter implements org.apache.thrift.TBase<LdapFilter, LdapFilte
       if (value == null) {
         unsetTitle();
       } else {
-        setTitle((String)value);
+        setTitle((java.lang.String)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case ATTRIBUTE:
       return getAttribute();
@@ -329,13 +305,13 @@ public class LdapFilter implements org.apache.thrift.TBase<LdapFilter, LdapFilte
       return getTitle();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -348,13 +324,11 @@ public class LdapFilter implements org.apache.thrift.TBase<LdapFilter, LdapFilte
     case TITLE:
       return isSetTitle();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
+  public boolean equals(java.lang.Object that) {
     if (that instanceof LdapFilter)
       return this.equals((LdapFilter)that);
     return false;
@@ -363,6 +337,8 @@ public class LdapFilter implements org.apache.thrift.TBase<LdapFilter, LdapFilte
   public boolean equals(LdapFilter that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_attribute = true && this.isSetAttribute();
     boolean that_present_attribute = true && that.isSetAttribute();
@@ -405,29 +381,25 @@ public class LdapFilter implements org.apache.thrift.TBase<LdapFilter, LdapFilte
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_attribute = true && (isSetAttribute());
-    list.add(present_attribute);
-    if (present_attribute)
-      list.add(attribute);
+    hashCode = hashCode * 8191 + ((isSetAttribute()) ? 131071 : 524287);
+    if (isSetAttribute())
+      hashCode = hashCode * 8191 + attribute.hashCode();
 
-    boolean present_value = true && (isSetValue());
-    list.add(present_value);
-    if (present_value)
-      list.add(value);
+    hashCode = hashCode * 8191 + ((isSetValue()) ? 131071 : 524287);
+    if (isSetValue())
+      hashCode = hashCode * 8191 + value.hashCode();
 
-    boolean present_filterId = true && (isSetFilterId());
-    list.add(present_filterId);
-    if (present_filterId)
-      list.add(filterId);
+    hashCode = hashCode * 8191 + ((isSetFilterId()) ? 131071 : 524287);
+    if (isSetFilterId())
+      hashCode = hashCode * 8191 + filterId;
 
-    boolean present_title = true && (isSetTitle());
-    list.add(present_title);
-    if (present_title)
-      list.add(title);
+    hashCode = hashCode * 8191 + ((isSetTitle()) ? 131071 : 524287);
+    if (isSetTitle())
+      hashCode = hashCode * 8191 + title.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -438,7 +410,7 @@ public class LdapFilter implements org.apache.thrift.TBase<LdapFilter, LdapFilte
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetAttribute()).compareTo(other.isSetAttribute());
+    lastComparison = java.lang.Boolean.compare(isSetAttribute(), other.isSetAttribute());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -448,7 +420,7 @@ public class LdapFilter implements org.apache.thrift.TBase<LdapFilter, LdapFilte
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetValue()).compareTo(other.isSetValue());
+    lastComparison = java.lang.Boolean.compare(isSetValue(), other.isSetValue());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -458,7 +430,7 @@ public class LdapFilter implements org.apache.thrift.TBase<LdapFilter, LdapFilte
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetFilterId()).compareTo(other.isSetFilterId());
+    lastComparison = java.lang.Boolean.compare(isSetFilterId(), other.isSetFilterId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -468,7 +440,7 @@ public class LdapFilter implements org.apache.thrift.TBase<LdapFilter, LdapFilte
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetTitle()).compareTo(other.isSetTitle());
+    lastComparison = java.lang.Boolean.compare(isSetTitle(), other.isSetTitle());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -481,21 +453,22 @@ public class LdapFilter implements org.apache.thrift.TBase<LdapFilter, LdapFilte
     return 0;
   }
 
+  @org.apache.thrift.annotation.Nullable
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("LdapFilter(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("LdapFilter(");
     boolean first = true;
 
     sb.append("attribute:");
@@ -546,7 +519,7 @@ public class LdapFilter implements org.apache.thrift.TBase<LdapFilter, LdapFilte
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -556,13 +529,13 @@ public class LdapFilter implements org.apache.thrift.TBase<LdapFilter, LdapFilte
     }
   }
 
-  private static class LdapFilterStandardSchemeFactory implements SchemeFactory {
+  private static class LdapFilterStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public LdapFilterStandardScheme getScheme() {
       return new LdapFilterStandardScheme();
     }
   }
 
-  private static class LdapFilterStandardScheme extends StandardScheme<LdapFilter> {
+  private static class LdapFilterStandardScheme extends org.apache.thrift.scheme.StandardScheme<LdapFilter> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, LdapFilter struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -649,18 +622,18 @@ public class LdapFilter implements org.apache.thrift.TBase<LdapFilter, LdapFilte
 
   }
 
-  private static class LdapFilterTupleSchemeFactory implements SchemeFactory {
+  private static class LdapFilterTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public LdapFilterTupleScheme getScheme() {
       return new LdapFilterTupleScheme();
     }
   }
 
-  private static class LdapFilterTupleScheme extends TupleScheme<LdapFilter> {
+  private static class LdapFilterTupleScheme extends org.apache.thrift.scheme.TupleScheme<LdapFilter> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, LdapFilter struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetAttribute()) {
         optionals.set(0);
       }
@@ -690,8 +663,8 @@ public class LdapFilter implements org.apache.thrift.TBase<LdapFilter, LdapFilte
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, LdapFilter struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(4);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(4);
       if (incoming.get(0)) {
         struct.attribute = iprot.readString();
         struct.setAttributeIsSet(true);
@@ -711,5 +684,8 @@ public class LdapFilter implements org.apache.thrift.TBase<LdapFilter, LdapFilte
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/LecturePermissions.java b/src/main/java/org/openslx/bwlp/thrift/iface/LecturePermissions.java
index a3b8d8a..2149f30 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/LecturePermissions.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/LecturePermissions.java
@@ -1,51 +1,21 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.openslx.bwlp.thrift.iface;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
 public class LecturePermissions implements org.apache.thrift.TBase<LecturePermissions, LecturePermissions._Fields>, java.io.Serializable, Cloneable, Comparable<LecturePermissions> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LecturePermissions");
 
   private static final org.apache.thrift.protocol.TField EDIT_FIELD_DESC = new org.apache.thrift.protocol.TField("edit", org.apache.thrift.protocol.TType.BOOL, (short)1);
   private static final org.apache.thrift.protocol.TField ADMIN_FIELD_DESC = new org.apache.thrift.protocol.TField("admin", org.apache.thrift.protocol.TType.BOOL, (short)2);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new LecturePermissionsStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new LecturePermissionsTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new LecturePermissionsStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new LecturePermissionsTupleSchemeFactory();
 
   public boolean edit; // required
   public boolean admin; // required
@@ -55,10 +25,10 @@ public class LecturePermissions implements org.apache.thrift.TBase<LecturePermis
     EDIT((short)1, "edit"),
     ADMIN((short)2, "admin");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -66,6 +36,7 @@ public class LecturePermissions implements org.apache.thrift.TBase<LecturePermis
     /**
      * Find the _Fields constant that matches fieldId, or null if its not found.
      */
+    @org.apache.thrift.annotation.Nullable
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
         case 1: // EDIT
@@ -83,21 +54,22 @@ public class LecturePermissions implements org.apache.thrift.TBase<LecturePermis
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    @org.apache.thrift.annotation.Nullable
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -106,7 +78,7 @@ public class LecturePermissions implements org.apache.thrift.TBase<LecturePermis
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -115,14 +87,14 @@ public class LecturePermissions implements org.apache.thrift.TBase<LecturePermis
   private static final int __EDIT_ISSET_ID = 0;
   private static final int __ADMIN_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.EDIT, new org.apache.thrift.meta_data.FieldMetaData("edit", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
     tmpMap.put(_Fields.ADMIN, new org.apache.thrift.meta_data.FieldMetaData("admin", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LecturePermissions.class, metaDataMap);
   }
 
@@ -172,16 +144,16 @@ public class LecturePermissions implements org.apache.thrift.TBase<LecturePermis
   }
 
   public void unsetEdit() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __EDIT_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __EDIT_ISSET_ID);
   }
 
   /** Returns true if field edit is set (has been assigned a value) and false otherwise */
   public boolean isSetEdit() {
-    return EncodingUtils.testBit(__isset_bitfield, __EDIT_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __EDIT_ISSET_ID);
   }
 
   public void setEditIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __EDIT_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __EDIT_ISSET_ID, value);
   }
 
   public boolean isAdmin() {
@@ -195,25 +167,25 @@ public class LecturePermissions implements org.apache.thrift.TBase<LecturePermis
   }
 
   public void unsetAdmin() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ADMIN_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ADMIN_ISSET_ID);
   }
 
   /** Returns true if field admin is set (has been assigned a value) and false otherwise */
   public boolean isSetAdmin() {
-    return EncodingUtils.testBit(__isset_bitfield, __ADMIN_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ADMIN_ISSET_ID);
   }
 
   public void setAdminIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ADMIN_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ADMIN_ISSET_ID, value);
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case EDIT:
       if (value == null) {
         unsetEdit();
       } else {
-        setEdit((Boolean)value);
+        setEdit((java.lang.Boolean)value);
       }
       break;
 
@@ -221,14 +193,15 @@ public class LecturePermissions implements org.apache.thrift.TBase<LecturePermis
       if (value == null) {
         unsetAdmin();
       } else {
-        setAdmin((Boolean)value);
+        setAdmin((java.lang.Boolean)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case EDIT:
       return isEdit();
@@ -237,13 +210,13 @@ public class LecturePermissions implements org.apache.thrift.TBase<LecturePermis
       return isAdmin();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -252,13 +225,11 @@ public class LecturePermissions implements org.apache.thrift.TBase<LecturePermis
     case ADMIN:
       return isSetAdmin();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
+  public boolean equals(java.lang.Object that) {
     if (that instanceof LecturePermissions)
       return this.equals((LecturePermissions)that);
     return false;
@@ -267,6 +238,8 @@ public class LecturePermissions implements org.apache.thrift.TBase<LecturePermis
   public boolean equals(LecturePermissions that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_edit = true;
     boolean that_present_edit = true;
@@ -291,19 +264,13 @@ public class LecturePermissions implements org.apache.thrift.TBase<LecturePermis
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_edit = true;
-    list.add(present_edit);
-    if (present_edit)
-      list.add(edit);
+    hashCode = hashCode * 8191 + ((edit) ? 131071 : 524287);
 
-    boolean present_admin = true;
-    list.add(present_admin);
-    if (present_admin)
-      list.add(admin);
+    hashCode = hashCode * 8191 + ((admin) ? 131071 : 524287);
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -314,7 +281,7 @@ public class LecturePermissions implements org.apache.thrift.TBase<LecturePermis
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetEdit()).compareTo(other.isSetEdit());
+    lastComparison = java.lang.Boolean.compare(isSetEdit(), other.isSetEdit());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -324,7 +291,7 @@ public class LecturePermissions implements org.apache.thrift.TBase<LecturePermis
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetAdmin()).compareTo(other.isSetAdmin());
+    lastComparison = java.lang.Boolean.compare(isSetAdmin(), other.isSetAdmin());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -337,21 +304,22 @@ public class LecturePermissions implements org.apache.thrift.TBase<LecturePermis
     return 0;
   }
 
+  @org.apache.thrift.annotation.Nullable
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("LecturePermissions(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("LecturePermissions(");
     boolean first = true;
 
     sb.append("edit:");
@@ -378,7 +346,7 @@ public class LecturePermissions implements org.apache.thrift.TBase<LecturePermis
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -388,13 +356,13 @@ public class LecturePermissions implements org.apache.thrift.TBase<LecturePermis
     }
   }
 
-  private static class LecturePermissionsStandardSchemeFactory implements SchemeFactory {
+  private static class LecturePermissionsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public LecturePermissionsStandardScheme getScheme() {
       return new LecturePermissionsStandardScheme();
     }
   }
 
-  private static class LecturePermissionsStandardScheme extends StandardScheme<LecturePermissions> {
+  private static class LecturePermissionsStandardScheme extends org.apache.thrift.scheme.StandardScheme<LecturePermissions> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, LecturePermissions struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -449,18 +417,18 @@ public class LecturePermissions implements org.apache.thrift.TBase<LecturePermis
 
   }
 
-  private static class LecturePermissionsTupleSchemeFactory implements SchemeFactory {
+  private static class LecturePermissionsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public LecturePermissionsTupleScheme getScheme() {
       return new LecturePermissionsTupleScheme();
     }
   }
 
-  private static class LecturePermissionsTupleScheme extends TupleScheme<LecturePermissions> {
+  private static class LecturePermissionsTupleScheme extends org.apache.thrift.scheme.TupleScheme<LecturePermissions> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, LecturePermissions struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetEdit()) {
         optionals.set(0);
       }
@@ -478,8 +446,8 @@ public class LecturePermissions implements org.apache.thrift.TBase<LecturePermis
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, LecturePermissions struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(2);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(2);
       if (incoming.get(0)) {
         struct.edit = iprot.readBool();
         struct.setEditIsSet(true);
@@ -491,5 +459,8 @@ public class LecturePermissions implements org.apache.thrift.TBase<LecturePermis
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/LectureRead.java b/src/main/java/org/openslx/bwlp/thrift/iface/LectureRead.java
index be1aa0c..b23cde8 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/LectureRead.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/LectureRead.java
@@ -1,40 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.openslx.bwlp.thrift.iface;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2019-02-25")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
 public class LectureRead implements org.apache.thrift.TBase<LectureRead, LectureRead._Fields>, java.io.Serializable, Cloneable, Comparable<LectureRead> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LectureRead");
 
@@ -72,17 +45,14 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
   private static final org.apache.thrift.protocol.TField PRESET_LDAP_FILTERS_FIELD_DESC = new org.apache.thrift.protocol.TField("presetLdapFilters", org.apache.thrift.protocol.TType.LIST, (short)33);
   private static final org.apache.thrift.protocol.TField PRESET_NETWORK_EXCEPTION_IDS_FIELD_DESC = new org.apache.thrift.protocol.TField("presetNetworkExceptionIds", org.apache.thrift.protocol.TType.LIST, (short)34);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new LectureReadStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new LectureReadTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new LectureReadStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new LectureReadTupleSchemeFactory();
 
-  public String lectureId; // required
-  public String lectureName; // required
-  public String description; // required
-  public String imageVersionId; // required
-  public String imageBaseId; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String lectureId; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String lectureName; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String description; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String imageVersionId; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String imageBaseId; // required
   public boolean autoUpdate; // required
   public boolean isEnabled; // required
   public long startTime; // required
@@ -91,26 +61,26 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
   public int useCount; // required
   public long createTime; // required
   public long updateTime; // required
-  public String ownerId; // required
-  public String updaterId; // required
-  public String runscript; // required
-  public List<String> nics; // required
-  public List<String> allowedUsers; // required
-  public List<NetRule> networkExceptions; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String ownerId; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String updaterId; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String runscript; // required
+  public @org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> nics; // required
+  public @org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> allowedUsers; // required
+  public @org.apache.thrift.annotation.Nullable java.util.List<NetRule> networkExceptions; // required
   public boolean isExam; // required
   public boolean hasInternetAccess; // required
-  public LecturePermissions defaultPermissions; // required
-  public LecturePermissions userPermissions; // optional
-  public List<Integer> locationIds; // required
+  public @org.apache.thrift.annotation.Nullable LecturePermissions defaultPermissions; // required
+  public @org.apache.thrift.annotation.Nullable LecturePermissions userPermissions; // optional
+  public @org.apache.thrift.annotation.Nullable java.util.List<java.lang.Integer> locationIds; // required
   public boolean limitToLocations; // required
   public boolean limitToAllowedUsers; // required
   public boolean hasUsbAccess; // required
-  public List<NetShare> networkShares; // optional
-  public List<LdapFilter> ldapFilters; // optional
-  public List<Integer> presetScriptIds; // optional
-  public List<Integer> presetNetworkShares; // optional
-  public List<Integer> presetLdapFilters; // optional
-  public List<Integer> presetNetworkExceptionIds; // optional
+  public @org.apache.thrift.annotation.Nullable java.util.List<NetShare> networkShares; // optional
+  public @org.apache.thrift.annotation.Nullable java.util.List<LdapFilter> ldapFilters; // optional
+  public @org.apache.thrift.annotation.Nullable java.util.List<java.lang.Integer> presetScriptIds; // optional
+  public @org.apache.thrift.annotation.Nullable java.util.List<java.lang.Integer> presetNetworkShares; // optional
+  public @org.apache.thrift.annotation.Nullable java.util.List<java.lang.Integer> presetLdapFilters; // optional
+  public @org.apache.thrift.annotation.Nullable java.util.List<java.lang.Integer> presetNetworkExceptionIds; // optional
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -148,10 +118,10 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
     PRESET_LDAP_FILTERS((short)33, "presetLdapFilters"),
     PRESET_NETWORK_EXCEPTION_IDS((short)34, "presetNetworkExceptionIds");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -159,6 +129,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
     /**
      * Find the _Fields constant that matches fieldId, or null if its not found.
      */
+    @org.apache.thrift.annotation.Nullable
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
         case 1: // LECTURE_ID
@@ -238,21 +209,22 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    @org.apache.thrift.annotation.Nullable
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -261,7 +233,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -282,9 +254,9 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
   private static final int __HASUSBACCESS_ISSET_ID = 12;
   private short __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.USER_PERMISSIONS,_Fields.NETWORK_SHARES,_Fields.LDAP_FILTERS,_Fields.PRESET_SCRIPT_IDS,_Fields.PRESET_NETWORK_SHARES,_Fields.PRESET_LDAP_FILTERS,_Fields.PRESET_NETWORK_EXCEPTION_IDS};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.LECTURE_ID, new org.apache.thrift.meta_data.FieldMetaData("lectureId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , "UUID")));
     tmpMap.put(_Fields.LECTURE_NAME, new org.apache.thrift.meta_data.FieldMetaData("lectureName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -361,7 +333,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
     tmpMap.put(_Fields.PRESET_NETWORK_EXCEPTION_IDS, new org.apache.thrift.meta_data.FieldMetaData("presetNetworkExceptionIds", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
             new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LectureRead.class, metaDataMap);
   }
 
@@ -369,11 +341,11 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
   }
 
   public LectureRead(
-    String lectureId,
-    String lectureName,
-    String description,
-    String imageVersionId,
-    String imageBaseId,
+    java.lang.String lectureId,
+    java.lang.String lectureName,
+    java.lang.String description,
+    java.lang.String imageVersionId,
+    java.lang.String imageBaseId,
     boolean autoUpdate,
     boolean isEnabled,
     long startTime,
@@ -382,16 +354,16 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
     int useCount,
     long createTime,
     long updateTime,
-    String ownerId,
-    String updaterId,
-    String runscript,
-    List<String> nics,
-    List<String> allowedUsers,
-    List<NetRule> networkExceptions,
+    java.lang.String ownerId,
+    java.lang.String updaterId,
+    java.lang.String runscript,
+    java.util.List<java.lang.String> nics,
+    java.util.List<java.lang.String> allowedUsers,
+    java.util.List<NetRule> networkExceptions,
     boolean isExam,
     boolean hasInternetAccess,
     LecturePermissions defaultPermissions,
-    List<Integer> locationIds,
+    java.util.List<java.lang.Integer> locationIds,
     boolean limitToLocations,
     boolean limitToAllowedUsers,
     boolean hasUsbAccess)
@@ -476,15 +448,15 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       this.runscript = other.runscript;
     }
     if (other.isSetNics()) {
-      List<String> __this__nics = new ArrayList<String>(other.nics);
+      java.util.List<java.lang.String> __this__nics = new java.util.ArrayList<java.lang.String>(other.nics);
       this.nics = __this__nics;
     }
     if (other.isSetAllowedUsers()) {
-      List<String> __this__allowedUsers = new ArrayList<String>(other.allowedUsers);
+      java.util.List<java.lang.String> __this__allowedUsers = new java.util.ArrayList<java.lang.String>(other.allowedUsers);
       this.allowedUsers = __this__allowedUsers;
     }
     if (other.isSetNetworkExceptions()) {
-      List<NetRule> __this__networkExceptions = new ArrayList<NetRule>(other.networkExceptions.size());
+      java.util.List<NetRule> __this__networkExceptions = new java.util.ArrayList<NetRule>(other.networkExceptions.size());
       for (NetRule other_element : other.networkExceptions) {
         __this__networkExceptions.add(new NetRule(other_element));
       }
@@ -499,40 +471,40 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       this.userPermissions = new LecturePermissions(other.userPermissions);
     }
     if (other.isSetLocationIds()) {
-      List<Integer> __this__locationIds = new ArrayList<Integer>(other.locationIds);
+      java.util.List<java.lang.Integer> __this__locationIds = new java.util.ArrayList<java.lang.Integer>(other.locationIds);
       this.locationIds = __this__locationIds;
     }
     this.limitToLocations = other.limitToLocations;
     this.limitToAllowedUsers = other.limitToAllowedUsers;
     this.hasUsbAccess = other.hasUsbAccess;
     if (other.isSetNetworkShares()) {
-      List<NetShare> __this__networkShares = new ArrayList<NetShare>(other.networkShares.size());
+      java.util.List<NetShare> __this__networkShares = new java.util.ArrayList<NetShare>(other.networkShares.size());
       for (NetShare other_element : other.networkShares) {
         __this__networkShares.add(new NetShare(other_element));
       }
       this.networkShares = __this__networkShares;
     }
     if (other.isSetLdapFilters()) {
-      List<LdapFilter> __this__ldapFilters = new ArrayList<LdapFilter>(other.ldapFilters.size());
+      java.util.List<LdapFilter> __this__ldapFilters = new java.util.ArrayList<LdapFilter>(other.ldapFilters.size());
       for (LdapFilter other_element : other.ldapFilters) {
         __this__ldapFilters.add(new LdapFilter(other_element));
       }
       this.ldapFilters = __this__ldapFilters;
     }
     if (other.isSetPresetScriptIds()) {
-      List<Integer> __this__presetScriptIds = new ArrayList<Integer>(other.presetScriptIds);
+      java.util.List<java.lang.Integer> __this__presetScriptIds = new java.util.ArrayList<java.lang.Integer>(other.presetScriptIds);
       this.presetScriptIds = __this__presetScriptIds;
     }
     if (other.isSetPresetNetworkShares()) {
-      List<Integer> __this__presetNetworkShares = new ArrayList<Integer>(other.presetNetworkShares);
+      java.util.List<java.lang.Integer> __this__presetNetworkShares = new java.util.ArrayList<java.lang.Integer>(other.presetNetworkShares);
       this.presetNetworkShares = __this__presetNetworkShares;
     }
     if (other.isSetPresetLdapFilters()) {
-      List<Integer> __this__presetLdapFilters = new ArrayList<Integer>(other.presetLdapFilters);
+      java.util.List<java.lang.Integer> __this__presetLdapFilters = new java.util.ArrayList<java.lang.Integer>(other.presetLdapFilters);
       this.presetLdapFilters = __this__presetLdapFilters;
     }
     if (other.isSetPresetNetworkExceptionIds()) {
-      List<Integer> __this__presetNetworkExceptionIds = new ArrayList<Integer>(other.presetNetworkExceptionIds);
+      java.util.List<java.lang.Integer> __this__presetNetworkExceptionIds = new java.util.ArrayList<java.lang.Integer>(other.presetNetworkExceptionIds);
       this.presetNetworkExceptionIds = __this__presetNetworkExceptionIds;
     }
   }
@@ -591,11 +563,12 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
     this.presetNetworkExceptionIds = null;
   }
 
-  public String getLectureId() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getLectureId() {
     return this.lectureId;
   }
 
-  public LectureRead setLectureId(String lectureId) {
+  public LectureRead setLectureId(@org.apache.thrift.annotation.Nullable java.lang.String lectureId) {
     this.lectureId = lectureId;
     return this;
   }
@@ -615,11 +588,12 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
     }
   }
 
-  public String getLectureName() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getLectureName() {
     return this.lectureName;
   }
 
-  public LectureRead setLectureName(String lectureName) {
+  public LectureRead setLectureName(@org.apache.thrift.annotation.Nullable java.lang.String lectureName) {
     this.lectureName = lectureName;
     return this;
   }
@@ -639,11 +613,12 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
     }
   }
 
-  public String getDescription() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getDescription() {
     return this.description;
   }
 
-  public LectureRead setDescription(String description) {
+  public LectureRead setDescription(@org.apache.thrift.annotation.Nullable java.lang.String description) {
     this.description = description;
     return this;
   }
@@ -663,11 +638,12 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
     }
   }
 
-  public String getImageVersionId() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getImageVersionId() {
     return this.imageVersionId;
   }
 
-  public LectureRead setImageVersionId(String imageVersionId) {
+  public LectureRead setImageVersionId(@org.apache.thrift.annotation.Nullable java.lang.String imageVersionId) {
     this.imageVersionId = imageVersionId;
     return this;
   }
@@ -687,11 +663,12 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
     }
   }
 
-  public String getImageBaseId() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getImageBaseId() {
     return this.imageBaseId;
   }
 
-  public LectureRead setImageBaseId(String imageBaseId) {
+  public LectureRead setImageBaseId(@org.apache.thrift.annotation.Nullable java.lang.String imageBaseId) {
     this.imageBaseId = imageBaseId;
     return this;
   }
@@ -722,16 +699,16 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
   }
 
   public void unsetAutoUpdate() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __AUTOUPDATE_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __AUTOUPDATE_ISSET_ID);
   }
 
   /** Returns true if field autoUpdate is set (has been assigned a value) and false otherwise */
   public boolean isSetAutoUpdate() {
-    return EncodingUtils.testBit(__isset_bitfield, __AUTOUPDATE_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __AUTOUPDATE_ISSET_ID);
   }
 
   public void setAutoUpdateIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __AUTOUPDATE_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __AUTOUPDATE_ISSET_ID, value);
   }
 
   public boolean isIsEnabled() {
@@ -745,16 +722,16 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
   }
 
   public void unsetIsEnabled() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISENABLED_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ISENABLED_ISSET_ID);
   }
 
   /** Returns true if field isEnabled is set (has been assigned a value) and false otherwise */
   public boolean isSetIsEnabled() {
-    return EncodingUtils.testBit(__isset_bitfield, __ISENABLED_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ISENABLED_ISSET_ID);
   }
 
   public void setIsEnabledIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISENABLED_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ISENABLED_ISSET_ID, value);
   }
 
   public long getStartTime() {
@@ -768,16 +745,16 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
   }
 
   public void unsetStartTime() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __STARTTIME_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __STARTTIME_ISSET_ID);
   }
 
   /** Returns true if field startTime is set (has been assigned a value) and false otherwise */
   public boolean isSetStartTime() {
-    return EncodingUtils.testBit(__isset_bitfield, __STARTTIME_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __STARTTIME_ISSET_ID);
   }
 
   public void setStartTimeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __STARTTIME_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __STARTTIME_ISSET_ID, value);
   }
 
   public long getEndTime() {
@@ -791,16 +768,16 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
   }
 
   public void unsetEndTime() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ENDTIME_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ENDTIME_ISSET_ID);
   }
 
   /** Returns true if field endTime is set (has been assigned a value) and false otherwise */
   public boolean isSetEndTime() {
-    return EncodingUtils.testBit(__isset_bitfield, __ENDTIME_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ENDTIME_ISSET_ID);
   }
 
   public void setEndTimeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ENDTIME_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ENDTIME_ISSET_ID, value);
   }
 
   public long getLastUsed() {
@@ -814,16 +791,16 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
   }
 
   public void unsetLastUsed() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __LASTUSED_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __LASTUSED_ISSET_ID);
   }
 
   /** Returns true if field lastUsed is set (has been assigned a value) and false otherwise */
   public boolean isSetLastUsed() {
-    return EncodingUtils.testBit(__isset_bitfield, __LASTUSED_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __LASTUSED_ISSET_ID);
   }
 
   public void setLastUsedIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __LASTUSED_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __LASTUSED_ISSET_ID, value);
   }
 
   public int getUseCount() {
@@ -837,16 +814,16 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
   }
 
   public void unsetUseCount() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __USECOUNT_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __USECOUNT_ISSET_ID);
   }
 
   /** Returns true if field useCount is set (has been assigned a value) and false otherwise */
   public boolean isSetUseCount() {
-    return EncodingUtils.testBit(__isset_bitfield, __USECOUNT_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __USECOUNT_ISSET_ID);
   }
 
   public void setUseCountIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __USECOUNT_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __USECOUNT_ISSET_ID, value);
   }
 
   public long getCreateTime() {
@@ -860,16 +837,16 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
   }
 
   public void unsetCreateTime() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __CREATETIME_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __CREATETIME_ISSET_ID);
   }
 
   /** Returns true if field createTime is set (has been assigned a value) and false otherwise */
   public boolean isSetCreateTime() {
-    return EncodingUtils.testBit(__isset_bitfield, __CREATETIME_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __CREATETIME_ISSET_ID);
   }
 
   public void setCreateTimeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __CREATETIME_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __CREATETIME_ISSET_ID, value);
   }
 
   public long getUpdateTime() {
@@ -883,23 +860,24 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
   }
 
   public void unsetUpdateTime() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __UPDATETIME_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __UPDATETIME_ISSET_ID);
   }
 
   /** Returns true if field updateTime is set (has been assigned a value) and false otherwise */
   public boolean isSetUpdateTime() {
-    return EncodingUtils.testBit(__isset_bitfield, __UPDATETIME_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __UPDATETIME_ISSET_ID);
   }
 
   public void setUpdateTimeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __UPDATETIME_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __UPDATETIME_ISSET_ID, value);
   }
 
-  public String getOwnerId() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getOwnerId() {
     return this.ownerId;
   }
 
-  public LectureRead setOwnerId(String ownerId) {
+  public LectureRead setOwnerId(@org.apache.thrift.annotation.Nullable java.lang.String ownerId) {
     this.ownerId = ownerId;
     return this;
   }
@@ -919,11 +897,12 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
     }
   }
 
-  public String getUpdaterId() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getUpdaterId() {
     return this.updaterId;
   }
 
-  public LectureRead setUpdaterId(String updaterId) {
+  public LectureRead setUpdaterId(@org.apache.thrift.annotation.Nullable java.lang.String updaterId) {
     this.updaterId = updaterId;
     return this;
   }
@@ -943,11 +922,12 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
     }
   }
 
-  public String getRunscript() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getRunscript() {
     return this.runscript;
   }
 
-  public LectureRead setRunscript(String runscript) {
+  public LectureRead setRunscript(@org.apache.thrift.annotation.Nullable java.lang.String runscript) {
     this.runscript = runscript;
     return this;
   }
@@ -971,22 +951,24 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
     return (this.nics == null) ? 0 : this.nics.size();
   }
 
-  public java.util.Iterator<String> getNicsIterator() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.Iterator<java.lang.String> getNicsIterator() {
     return (this.nics == null) ? null : this.nics.iterator();
   }
 
-  public void addToNics(String elem) {
+  public void addToNics(java.lang.String elem) {
     if (this.nics == null) {
-      this.nics = new ArrayList<String>();
+      this.nics = new java.util.ArrayList<java.lang.String>();
     }
     this.nics.add(elem);
   }
 
-  public List<String> getNics() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.List<java.lang.String> getNics() {
     return this.nics;
   }
 
-  public LectureRead setNics(List<String> nics) {
+  public LectureRead setNics(@org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> nics) {
     this.nics = nics;
     return this;
   }
@@ -1010,22 +992,24 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
     return (this.allowedUsers == null) ? 0 : this.allowedUsers.size();
   }
 
-  public java.util.Iterator<String> getAllowedUsersIterator() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.Iterator<java.lang.String> getAllowedUsersIterator() {
     return (this.allowedUsers == null) ? null : this.allowedUsers.iterator();
   }
 
-  public void addToAllowedUsers(String elem) {
+  public void addToAllowedUsers(java.lang.String elem) {
     if (this.allowedUsers == null) {
-      this.allowedUsers = new ArrayList<String>();
+      this.allowedUsers = new java.util.ArrayList<java.lang.String>();
     }
     this.allowedUsers.add(elem);
   }
 
-  public List<String> getAllowedUsers() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.List<java.lang.String> getAllowedUsers() {
     return this.allowedUsers;
   }
 
-  public LectureRead setAllowedUsers(List<String> allowedUsers) {
+  public LectureRead setAllowedUsers(@org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> allowedUsers) {
     this.allowedUsers = allowedUsers;
     return this;
   }
@@ -1049,22 +1033,24 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
     return (this.networkExceptions == null) ? 0 : this.networkExceptions.size();
   }
 
+  @org.apache.thrift.annotation.Nullable
   public java.util.Iterator<NetRule> getNetworkExceptionsIterator() {
     return (this.networkExceptions == null) ? null : this.networkExceptions.iterator();
   }
 
   public void addToNetworkExceptions(NetRule elem) {
     if (this.networkExceptions == null) {
-      this.networkExceptions = new ArrayList<NetRule>();
+      this.networkExceptions = new java.util.ArrayList<NetRule>();
     }
     this.networkExceptions.add(elem);
   }
 
-  public List<NetRule> getNetworkExceptions() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.List<NetRule> getNetworkExceptions() {
     return this.networkExceptions;
   }
 
-  public LectureRead setNetworkExceptions(List<NetRule> networkExceptions) {
+  public LectureRead setNetworkExceptions(@org.apache.thrift.annotation.Nullable java.util.List<NetRule> networkExceptions) {
     this.networkExceptions = networkExceptions;
     return this;
   }
@@ -1095,16 +1081,16 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
   }
 
   public void unsetIsExam() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISEXAM_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ISEXAM_ISSET_ID);
   }
 
   /** Returns true if field isExam is set (has been assigned a value) and false otherwise */
   public boolean isSetIsExam() {
-    return EncodingUtils.testBit(__isset_bitfield, __ISEXAM_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ISEXAM_ISSET_ID);
   }
 
   public void setIsExamIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISEXAM_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ISEXAM_ISSET_ID, value);
   }
 
   public boolean isHasInternetAccess() {
@@ -1118,23 +1104,24 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
   }
 
   public void unsetHasInternetAccess() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __HASINTERNETACCESS_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __HASINTERNETACCESS_ISSET_ID);
   }
 
   /** Returns true if field hasInternetAccess is set (has been assigned a value) and false otherwise */
   public boolean isSetHasInternetAccess() {
-    return EncodingUtils.testBit(__isset_bitfield, __HASINTERNETACCESS_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __HASINTERNETACCESS_ISSET_ID);
   }
 
   public void setHasInternetAccessIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __HASINTERNETACCESS_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __HASINTERNETACCESS_ISSET_ID, value);
   }
 
+  @org.apache.thrift.annotation.Nullable
   public LecturePermissions getDefaultPermissions() {
     return this.defaultPermissions;
   }
 
-  public LectureRead setDefaultPermissions(LecturePermissions defaultPermissions) {
+  public LectureRead setDefaultPermissions(@org.apache.thrift.annotation.Nullable LecturePermissions defaultPermissions) {
     this.defaultPermissions = defaultPermissions;
     return this;
   }
@@ -1154,11 +1141,12 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
     }
   }
 
+  @org.apache.thrift.annotation.Nullable
   public LecturePermissions getUserPermissions() {
     return this.userPermissions;
   }
 
-  public LectureRead setUserPermissions(LecturePermissions userPermissions) {
+  public LectureRead setUserPermissions(@org.apache.thrift.annotation.Nullable LecturePermissions userPermissions) {
     this.userPermissions = userPermissions;
     return this;
   }
@@ -1182,22 +1170,24 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
     return (this.locationIds == null) ? 0 : this.locationIds.size();
   }
 
-  public java.util.Iterator<Integer> getLocationIdsIterator() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.Iterator<java.lang.Integer> getLocationIdsIterator() {
     return (this.locationIds == null) ? null : this.locationIds.iterator();
   }
 
   public void addToLocationIds(int elem) {
     if (this.locationIds == null) {
-      this.locationIds = new ArrayList<Integer>();
+      this.locationIds = new java.util.ArrayList<java.lang.Integer>();
     }
     this.locationIds.add(elem);
   }
 
-  public List<Integer> getLocationIds() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.List<java.lang.Integer> getLocationIds() {
     return this.locationIds;
   }
 
-  public LectureRead setLocationIds(List<Integer> locationIds) {
+  public LectureRead setLocationIds(@org.apache.thrift.annotation.Nullable java.util.List<java.lang.Integer> locationIds) {
     this.locationIds = locationIds;
     return this;
   }
@@ -1228,16 +1218,16 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
   }
 
   public void unsetLimitToLocations() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __LIMITTOLOCATIONS_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __LIMITTOLOCATIONS_ISSET_ID);
   }
 
   /** Returns true if field limitToLocations is set (has been assigned a value) and false otherwise */
   public boolean isSetLimitToLocations() {
-    return EncodingUtils.testBit(__isset_bitfield, __LIMITTOLOCATIONS_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __LIMITTOLOCATIONS_ISSET_ID);
   }
 
   public void setLimitToLocationsIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __LIMITTOLOCATIONS_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __LIMITTOLOCATIONS_ISSET_ID, value);
   }
 
   public boolean isLimitToAllowedUsers() {
@@ -1251,16 +1241,16 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
   }
 
   public void unsetLimitToAllowedUsers() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __LIMITTOALLOWEDUSERS_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __LIMITTOALLOWEDUSERS_ISSET_ID);
   }
 
   /** Returns true if field limitToAllowedUsers is set (has been assigned a value) and false otherwise */
   public boolean isSetLimitToAllowedUsers() {
-    return EncodingUtils.testBit(__isset_bitfield, __LIMITTOALLOWEDUSERS_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __LIMITTOALLOWEDUSERS_ISSET_ID);
   }
 
   public void setLimitToAllowedUsersIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __LIMITTOALLOWEDUSERS_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __LIMITTOALLOWEDUSERS_ISSET_ID, value);
   }
 
   public boolean isHasUsbAccess() {
@@ -1274,38 +1264,40 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
   }
 
   public void unsetHasUsbAccess() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __HASUSBACCESS_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __HASUSBACCESS_ISSET_ID);
   }
 
   /** Returns true if field hasUsbAccess is set (has been assigned a value) and false otherwise */
   public boolean isSetHasUsbAccess() {
-    return EncodingUtils.testBit(__isset_bitfield, __HASUSBACCESS_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __HASUSBACCESS_ISSET_ID);
   }
 
   public void setHasUsbAccessIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __HASUSBACCESS_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __HASUSBACCESS_ISSET_ID, value);
   }
 
   public int getNetworkSharesSize() {
     return (this.networkShares == null) ? 0 : this.networkShares.size();
   }
 
+  @org.apache.thrift.annotation.Nullable
   public java.util.Iterator<NetShare> getNetworkSharesIterator() {
     return (this.networkShares == null) ? null : this.networkShares.iterator();
   }
 
   public void addToNetworkShares(NetShare elem) {
     if (this.networkShares == null) {
-      this.networkShares = new ArrayList<NetShare>();
+      this.networkShares = new java.util.ArrayList<NetShare>();
     }
     this.networkShares.add(elem);
   }
 
-  public List<NetShare> getNetworkShares() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.List<NetShare> getNetworkShares() {
     return this.networkShares;
   }
 
-  public LectureRead setNetworkShares(List<NetShare> networkShares) {
+  public LectureRead setNetworkShares(@org.apache.thrift.annotation.Nullable java.util.List<NetShare> networkShares) {
     this.networkShares = networkShares;
     return this;
   }
@@ -1329,22 +1321,24 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
     return (this.ldapFilters == null) ? 0 : this.ldapFilters.size();
   }
 
+  @org.apache.thrift.annotation.Nullable
   public java.util.Iterator<LdapFilter> getLdapFiltersIterator() {
     return (this.ldapFilters == null) ? null : this.ldapFilters.iterator();
   }
 
   public void addToLdapFilters(LdapFilter elem) {
     if (this.ldapFilters == null) {
-      this.ldapFilters = new ArrayList<LdapFilter>();
+      this.ldapFilters = new java.util.ArrayList<LdapFilter>();
     }
     this.ldapFilters.add(elem);
   }
 
-  public List<LdapFilter> getLdapFilters() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.List<LdapFilter> getLdapFilters() {
     return this.ldapFilters;
   }
 
-  public LectureRead setLdapFilters(List<LdapFilter> ldapFilters) {
+  public LectureRead setLdapFilters(@org.apache.thrift.annotation.Nullable java.util.List<LdapFilter> ldapFilters) {
     this.ldapFilters = ldapFilters;
     return this;
   }
@@ -1368,22 +1362,24 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
     return (this.presetScriptIds == null) ? 0 : this.presetScriptIds.size();
   }
 
-  public java.util.Iterator<Integer> getPresetScriptIdsIterator() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.Iterator<java.lang.Integer> getPresetScriptIdsIterator() {
     return (this.presetScriptIds == null) ? null : this.presetScriptIds.iterator();
   }
 
   public void addToPresetScriptIds(int elem) {
     if (this.presetScriptIds == null) {
-      this.presetScriptIds = new ArrayList<Integer>();
+      this.presetScriptIds = new java.util.ArrayList<java.lang.Integer>();
     }
     this.presetScriptIds.add(elem);
   }
 
-  public List<Integer> getPresetScriptIds() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.List<java.lang.Integer> getPresetScriptIds() {
     return this.presetScriptIds;
   }
 
-  public LectureRead setPresetScriptIds(List<Integer> presetScriptIds) {
+  public LectureRead setPresetScriptIds(@org.apache.thrift.annotation.Nullable java.util.List<java.lang.Integer> presetScriptIds) {
     this.presetScriptIds = presetScriptIds;
     return this;
   }
@@ -1407,22 +1403,24 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
     return (this.presetNetworkShares == null) ? 0 : this.presetNetworkShares.size();
   }
 
-  public java.util.Iterator<Integer> getPresetNetworkSharesIterator() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.Iterator<java.lang.Integer> getPresetNetworkSharesIterator() {
     return (this.presetNetworkShares == null) ? null : this.presetNetworkShares.iterator();
   }
 
   public void addToPresetNetworkShares(int elem) {
     if (this.presetNetworkShares == null) {
-      this.presetNetworkShares = new ArrayList<Integer>();
+      this.presetNetworkShares = new java.util.ArrayList<java.lang.Integer>();
     }
     this.presetNetworkShares.add(elem);
   }
 
-  public List<Integer> getPresetNetworkShares() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.List<java.lang.Integer> getPresetNetworkShares() {
     return this.presetNetworkShares;
   }
 
-  public LectureRead setPresetNetworkShares(List<Integer> presetNetworkShares) {
+  public LectureRead setPresetNetworkShares(@org.apache.thrift.annotation.Nullable java.util.List<java.lang.Integer> presetNetworkShares) {
     this.presetNetworkShares = presetNetworkShares;
     return this;
   }
@@ -1446,22 +1444,24 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
     return (this.presetLdapFilters == null) ? 0 : this.presetLdapFilters.size();
   }
 
-  public java.util.Iterator<Integer> getPresetLdapFiltersIterator() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.Iterator<java.lang.Integer> getPresetLdapFiltersIterator() {
     return (this.presetLdapFilters == null) ? null : this.presetLdapFilters.iterator();
   }
 
   public void addToPresetLdapFilters(int elem) {
     if (this.presetLdapFilters == null) {
-      this.presetLdapFilters = new ArrayList<Integer>();
+      this.presetLdapFilters = new java.util.ArrayList<java.lang.Integer>();
     }
     this.presetLdapFilters.add(elem);
   }
 
-  public List<Integer> getPresetLdapFilters() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.List<java.lang.Integer> getPresetLdapFilters() {
     return this.presetLdapFilters;
   }
 
-  public LectureRead setPresetLdapFilters(List<Integer> presetLdapFilters) {
+  public LectureRead setPresetLdapFilters(@org.apache.thrift.annotation.Nullable java.util.List<java.lang.Integer> presetLdapFilters) {
     this.presetLdapFilters = presetLdapFilters;
     return this;
   }
@@ -1485,22 +1485,24 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
     return (this.presetNetworkExceptionIds == null) ? 0 : this.presetNetworkExceptionIds.size();
   }
 
-  public java.util.Iterator<Integer> getPresetNetworkExceptionIdsIterator() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.Iterator<java.lang.Integer> getPresetNetworkExceptionIdsIterator() {
     return (this.presetNetworkExceptionIds == null) ? null : this.presetNetworkExceptionIds.iterator();
   }
 
   public void addToPresetNetworkExceptionIds(int elem) {
     if (this.presetNetworkExceptionIds == null) {
-      this.presetNetworkExceptionIds = new ArrayList<Integer>();
+      this.presetNetworkExceptionIds = new java.util.ArrayList<java.lang.Integer>();
     }
     this.presetNetworkExceptionIds.add(elem);
   }
 
-  public List<Integer> getPresetNetworkExceptionIds() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.List<java.lang.Integer> getPresetNetworkExceptionIds() {
     return this.presetNetworkExceptionIds;
   }
 
-  public LectureRead setPresetNetworkExceptionIds(List<Integer> presetNetworkExceptionIds) {
+  public LectureRead setPresetNetworkExceptionIds(@org.apache.thrift.annotation.Nullable java.util.List<java.lang.Integer> presetNetworkExceptionIds) {
     this.presetNetworkExceptionIds = presetNetworkExceptionIds;
     return this;
   }
@@ -1520,13 +1522,13 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case LECTURE_ID:
       if (value == null) {
         unsetLectureId();
       } else {
-        setLectureId((String)value);
+        setLectureId((java.lang.String)value);
       }
       break;
 
@@ -1534,7 +1536,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       if (value == null) {
         unsetLectureName();
       } else {
-        setLectureName((String)value);
+        setLectureName((java.lang.String)value);
       }
       break;
 
@@ -1542,7 +1544,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       if (value == null) {
         unsetDescription();
       } else {
-        setDescription((String)value);
+        setDescription((java.lang.String)value);
       }
       break;
 
@@ -1550,7 +1552,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       if (value == null) {
         unsetImageVersionId();
       } else {
-        setImageVersionId((String)value);
+        setImageVersionId((java.lang.String)value);
       }
       break;
 
@@ -1558,7 +1560,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       if (value == null) {
         unsetImageBaseId();
       } else {
-        setImageBaseId((String)value);
+        setImageBaseId((java.lang.String)value);
       }
       break;
 
@@ -1566,7 +1568,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       if (value == null) {
         unsetAutoUpdate();
       } else {
-        setAutoUpdate((Boolean)value);
+        setAutoUpdate((java.lang.Boolean)value);
       }
       break;
 
@@ -1574,7 +1576,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       if (value == null) {
         unsetIsEnabled();
       } else {
-        setIsEnabled((Boolean)value);
+        setIsEnabled((java.lang.Boolean)value);
       }
       break;
 
@@ -1582,7 +1584,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       if (value == null) {
         unsetStartTime();
       } else {
-        setStartTime((Long)value);
+        setStartTime((java.lang.Long)value);
       }
       break;
 
@@ -1590,7 +1592,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       if (value == null) {
         unsetEndTime();
       } else {
-        setEndTime((Long)value);
+        setEndTime((java.lang.Long)value);
       }
       break;
 
@@ -1598,7 +1600,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       if (value == null) {
         unsetLastUsed();
       } else {
-        setLastUsed((Long)value);
+        setLastUsed((java.lang.Long)value);
       }
       break;
 
@@ -1606,7 +1608,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       if (value == null) {
         unsetUseCount();
       } else {
-        setUseCount((Integer)value);
+        setUseCount((java.lang.Integer)value);
       }
       break;
 
@@ -1614,7 +1616,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       if (value == null) {
         unsetCreateTime();
       } else {
-        setCreateTime((Long)value);
+        setCreateTime((java.lang.Long)value);
       }
       break;
 
@@ -1622,7 +1624,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       if (value == null) {
         unsetUpdateTime();
       } else {
-        setUpdateTime((Long)value);
+        setUpdateTime((java.lang.Long)value);
       }
       break;
 
@@ -1630,7 +1632,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       if (value == null) {
         unsetOwnerId();
       } else {
-        setOwnerId((String)value);
+        setOwnerId((java.lang.String)value);
       }
       break;
 
@@ -1638,7 +1640,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       if (value == null) {
         unsetUpdaterId();
       } else {
-        setUpdaterId((String)value);
+        setUpdaterId((java.lang.String)value);
       }
       break;
 
@@ -1646,7 +1648,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       if (value == null) {
         unsetRunscript();
       } else {
-        setRunscript((String)value);
+        setRunscript((java.lang.String)value);
       }
       break;
 
@@ -1654,7 +1656,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       if (value == null) {
         unsetNics();
       } else {
-        setNics((List<String>)value);
+        setNics((java.util.List<java.lang.String>)value);
       }
       break;
 
@@ -1662,7 +1664,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       if (value == null) {
         unsetAllowedUsers();
       } else {
-        setAllowedUsers((List<String>)value);
+        setAllowedUsers((java.util.List<java.lang.String>)value);
       }
       break;
 
@@ -1670,7 +1672,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       if (value == null) {
         unsetNetworkExceptions();
       } else {
-        setNetworkExceptions((List<NetRule>)value);
+        setNetworkExceptions((java.util.List<NetRule>)value);
       }
       break;
 
@@ -1678,7 +1680,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       if (value == null) {
         unsetIsExam();
       } else {
-        setIsExam((Boolean)value);
+        setIsExam((java.lang.Boolean)value);
       }
       break;
 
@@ -1686,7 +1688,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       if (value == null) {
         unsetHasInternetAccess();
       } else {
-        setHasInternetAccess((Boolean)value);
+        setHasInternetAccess((java.lang.Boolean)value);
       }
       break;
 
@@ -1710,7 +1712,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       if (value == null) {
         unsetLocationIds();
       } else {
-        setLocationIds((List<Integer>)value);
+        setLocationIds((java.util.List<java.lang.Integer>)value);
       }
       break;
 
@@ -1718,7 +1720,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       if (value == null) {
         unsetLimitToLocations();
       } else {
-        setLimitToLocations((Boolean)value);
+        setLimitToLocations((java.lang.Boolean)value);
       }
       break;
 
@@ -1726,7 +1728,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       if (value == null) {
         unsetLimitToAllowedUsers();
       } else {
-        setLimitToAllowedUsers((Boolean)value);
+        setLimitToAllowedUsers((java.lang.Boolean)value);
       }
       break;
 
@@ -1734,7 +1736,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       if (value == null) {
         unsetHasUsbAccess();
       } else {
-        setHasUsbAccess((Boolean)value);
+        setHasUsbAccess((java.lang.Boolean)value);
       }
       break;
 
@@ -1742,7 +1744,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       if (value == null) {
         unsetNetworkShares();
       } else {
-        setNetworkShares((List<NetShare>)value);
+        setNetworkShares((java.util.List<NetShare>)value);
       }
       break;
 
@@ -1750,7 +1752,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       if (value == null) {
         unsetLdapFilters();
       } else {
-        setLdapFilters((List<LdapFilter>)value);
+        setLdapFilters((java.util.List<LdapFilter>)value);
       }
       break;
 
@@ -1758,7 +1760,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       if (value == null) {
         unsetPresetScriptIds();
       } else {
-        setPresetScriptIds((List<Integer>)value);
+        setPresetScriptIds((java.util.List<java.lang.Integer>)value);
       }
       break;
 
@@ -1766,7 +1768,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       if (value == null) {
         unsetPresetNetworkShares();
       } else {
-        setPresetNetworkShares((List<Integer>)value);
+        setPresetNetworkShares((java.util.List<java.lang.Integer>)value);
       }
       break;
 
@@ -1774,7 +1776,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       if (value == null) {
         unsetPresetLdapFilters();
       } else {
-        setPresetLdapFilters((List<Integer>)value);
+        setPresetLdapFilters((java.util.List<java.lang.Integer>)value);
       }
       break;
 
@@ -1782,14 +1784,15 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       if (value == null) {
         unsetPresetNetworkExceptionIds();
       } else {
-        setPresetNetworkExceptionIds((List<Integer>)value);
+        setPresetNetworkExceptionIds((java.util.List<java.lang.Integer>)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case LECTURE_ID:
       return getLectureId();
@@ -1891,13 +1894,13 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       return getPresetNetworkExceptionIds();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -1968,13 +1971,11 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
     case PRESET_NETWORK_EXCEPTION_IDS:
       return isSetPresetNetworkExceptionIds();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
+  public boolean equals(java.lang.Object that) {
     if (that instanceof LectureRead)
       return this.equals((LectureRead)that);
     return false;
@@ -1983,6 +1984,8 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
   public boolean equals(LectureRead that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_lectureId = true && this.isSetLectureId();
     boolean that_present_lectureId = true && that.isSetLectureId();
@@ -2286,174 +2289,115 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_lectureId = true && (isSetLectureId());
-    list.add(present_lectureId);
-    if (present_lectureId)
-      list.add(lectureId);
-
-    boolean present_lectureName = true && (isSetLectureName());
-    list.add(present_lectureName);
-    if (present_lectureName)
-      list.add(lectureName);
-
-    boolean present_description = true && (isSetDescription());
-    list.add(present_description);
-    if (present_description)
-      list.add(description);
-
-    boolean present_imageVersionId = true && (isSetImageVersionId());
-    list.add(present_imageVersionId);
-    if (present_imageVersionId)
-      list.add(imageVersionId);
-
-    boolean present_imageBaseId = true && (isSetImageBaseId());
-    list.add(present_imageBaseId);
-    if (present_imageBaseId)
-      list.add(imageBaseId);
-
-    boolean present_autoUpdate = true;
-    list.add(present_autoUpdate);
-    if (present_autoUpdate)
-      list.add(autoUpdate);
-
-    boolean present_isEnabled = true;
-    list.add(present_isEnabled);
-    if (present_isEnabled)
-      list.add(isEnabled);
-
-    boolean present_startTime = true;
-    list.add(present_startTime);
-    if (present_startTime)
-      list.add(startTime);
-
-    boolean present_endTime = true;
-    list.add(present_endTime);
-    if (present_endTime)
-      list.add(endTime);
-
-    boolean present_lastUsed = true;
-    list.add(present_lastUsed);
-    if (present_lastUsed)
-      list.add(lastUsed);
-
-    boolean present_useCount = true;
-    list.add(present_useCount);
-    if (present_useCount)
-      list.add(useCount);
-
-    boolean present_createTime = true;
-    list.add(present_createTime);
-    if (present_createTime)
-      list.add(createTime);
-
-    boolean present_updateTime = true;
-    list.add(present_updateTime);
-    if (present_updateTime)
-      list.add(updateTime);
-
-    boolean present_ownerId = true && (isSetOwnerId());
-    list.add(present_ownerId);
-    if (present_ownerId)
-      list.add(ownerId);
-
-    boolean present_updaterId = true && (isSetUpdaterId());
-    list.add(present_updaterId);
-    if (present_updaterId)
-      list.add(updaterId);
-
-    boolean present_runscript = true && (isSetRunscript());
-    list.add(present_runscript);
-    if (present_runscript)
-      list.add(runscript);
-
-    boolean present_nics = true && (isSetNics());
-    list.add(present_nics);
-    if (present_nics)
-      list.add(nics);
-
-    boolean present_allowedUsers = true && (isSetAllowedUsers());
-    list.add(present_allowedUsers);
-    if (present_allowedUsers)
-      list.add(allowedUsers);
-
-    boolean present_networkExceptions = true && (isSetNetworkExceptions());
-    list.add(present_networkExceptions);
-    if (present_networkExceptions)
-      list.add(networkExceptions);
-
-    boolean present_isExam = true;
-    list.add(present_isExam);
-    if (present_isExam)
-      list.add(isExam);
-
-    boolean present_hasInternetAccess = true;
-    list.add(present_hasInternetAccess);
-    if (present_hasInternetAccess)
-      list.add(hasInternetAccess);
-
-    boolean present_defaultPermissions = true && (isSetDefaultPermissions());
-    list.add(present_defaultPermissions);
-    if (present_defaultPermissions)
-      list.add(defaultPermissions);
-
-    boolean present_userPermissions = true && (isSetUserPermissions());
-    list.add(present_userPermissions);
-    if (present_userPermissions)
-      list.add(userPermissions);
-
-    boolean present_locationIds = true && (isSetLocationIds());
-    list.add(present_locationIds);
-    if (present_locationIds)
-      list.add(locationIds);
-
-    boolean present_limitToLocations = true;
-    list.add(present_limitToLocations);
-    if (present_limitToLocations)
-      list.add(limitToLocations);
-
-    boolean present_limitToAllowedUsers = true;
-    list.add(present_limitToAllowedUsers);
-    if (present_limitToAllowedUsers)
-      list.add(limitToAllowedUsers);
-
-    boolean present_hasUsbAccess = true;
-    list.add(present_hasUsbAccess);
-    if (present_hasUsbAccess)
-      list.add(hasUsbAccess);
-
-    boolean present_networkShares = true && (isSetNetworkShares());
-    list.add(present_networkShares);
-    if (present_networkShares)
-      list.add(networkShares);
-
-    boolean present_ldapFilters = true && (isSetLdapFilters());
-    list.add(present_ldapFilters);
-    if (present_ldapFilters)
-      list.add(ldapFilters);
-
-    boolean present_presetScriptIds = true && (isSetPresetScriptIds());
-    list.add(present_presetScriptIds);
-    if (present_presetScriptIds)
-      list.add(presetScriptIds);
-
-    boolean present_presetNetworkShares = true && (isSetPresetNetworkShares());
-    list.add(present_presetNetworkShares);
-    if (present_presetNetworkShares)
-      list.add(presetNetworkShares);
-
-    boolean present_presetLdapFilters = true && (isSetPresetLdapFilters());
-    list.add(present_presetLdapFilters);
-    if (present_presetLdapFilters)
-      list.add(presetLdapFilters);
-
-    boolean present_presetNetworkExceptionIds = true && (isSetPresetNetworkExceptionIds());
-    list.add(present_presetNetworkExceptionIds);
-    if (present_presetNetworkExceptionIds)
-      list.add(presetNetworkExceptionIds);
-
-    return list.hashCode();
+    int hashCode = 1;
+
+    hashCode = hashCode * 8191 + ((isSetLectureId()) ? 131071 : 524287);
+    if (isSetLectureId())
+      hashCode = hashCode * 8191 + lectureId.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetLectureName()) ? 131071 : 524287);
+    if (isSetLectureName())
+      hashCode = hashCode * 8191 + lectureName.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetDescription()) ? 131071 : 524287);
+    if (isSetDescription())
+      hashCode = hashCode * 8191 + description.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetImageVersionId()) ? 131071 : 524287);
+    if (isSetImageVersionId())
+      hashCode = hashCode * 8191 + imageVersionId.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetImageBaseId()) ? 131071 : 524287);
+    if (isSetImageBaseId())
+      hashCode = hashCode * 8191 + imageBaseId.hashCode();
+
+    hashCode = hashCode * 8191 + ((autoUpdate) ? 131071 : 524287);
+
+    hashCode = hashCode * 8191 + ((isEnabled) ? 131071 : 524287);
+
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(startTime);
+
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(endTime);
+
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(lastUsed);
+
+    hashCode = hashCode * 8191 + useCount;
+
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(createTime);
+
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(updateTime);
+
+    hashCode = hashCode * 8191 + ((isSetOwnerId()) ? 131071 : 524287);
+    if (isSetOwnerId())
+      hashCode = hashCode * 8191 + ownerId.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetUpdaterId()) ? 131071 : 524287);
+    if (isSetUpdaterId())
+      hashCode = hashCode * 8191 + updaterId.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetRunscript()) ? 131071 : 524287);
+    if (isSetRunscript())
+      hashCode = hashCode * 8191 + runscript.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetNics()) ? 131071 : 524287);
+    if (isSetNics())
+      hashCode = hashCode * 8191 + nics.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetAllowedUsers()) ? 131071 : 524287);
+    if (isSetAllowedUsers())
+      hashCode = hashCode * 8191 + allowedUsers.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetNetworkExceptions()) ? 131071 : 524287);
+    if (isSetNetworkExceptions())
+      hashCode = hashCode * 8191 + networkExceptions.hashCode();
+
+    hashCode = hashCode * 8191 + ((isExam) ? 131071 : 524287);
+
+    hashCode = hashCode * 8191 + ((hasInternetAccess) ? 131071 : 524287);
+
+    hashCode = hashCode * 8191 + ((isSetDefaultPermissions()) ? 131071 : 524287);
+    if (isSetDefaultPermissions())
+      hashCode = hashCode * 8191 + defaultPermissions.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetUserPermissions()) ? 131071 : 524287);
+    if (isSetUserPermissions())
+      hashCode = hashCode * 8191 + userPermissions.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetLocationIds()) ? 131071 : 524287);
+    if (isSetLocationIds())
+      hashCode = hashCode * 8191 + locationIds.hashCode();
+
+    hashCode = hashCode * 8191 + ((limitToLocations) ? 131071 : 524287);
+
+    hashCode = hashCode * 8191 + ((limitToAllowedUsers) ? 131071 : 524287);
+
+    hashCode = hashCode * 8191 + ((hasUsbAccess) ? 131071 : 524287);
+
+    hashCode = hashCode * 8191 + ((isSetNetworkShares()) ? 131071 : 524287);
+    if (isSetNetworkShares())
+      hashCode = hashCode * 8191 + networkShares.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetLdapFilters()) ? 131071 : 524287);
+    if (isSetLdapFilters())
+      hashCode = hashCode * 8191 + ldapFilters.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetPresetScriptIds()) ? 131071 : 524287);
+    if (isSetPresetScriptIds())
+      hashCode = hashCode * 8191 + presetScriptIds.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetPresetNetworkShares()) ? 131071 : 524287);
+    if (isSetPresetNetworkShares())
+      hashCode = hashCode * 8191 + presetNetworkShares.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetPresetLdapFilters()) ? 131071 : 524287);
+    if (isSetPresetLdapFilters())
+      hashCode = hashCode * 8191 + presetLdapFilters.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetPresetNetworkExceptionIds()) ? 131071 : 524287);
+    if (isSetPresetNetworkExceptionIds())
+      hashCode = hashCode * 8191 + presetNetworkExceptionIds.hashCode();
+
+    return hashCode;
   }
 
   @Override
@@ -2464,7 +2408,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetLectureId()).compareTo(other.isSetLectureId());
+    lastComparison = java.lang.Boolean.compare(isSetLectureId(), other.isSetLectureId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -2474,7 +2418,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetLectureName()).compareTo(other.isSetLectureName());
+    lastComparison = java.lang.Boolean.compare(isSetLectureName(), other.isSetLectureName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -2484,7 +2428,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetDescription()).compareTo(other.isSetDescription());
+    lastComparison = java.lang.Boolean.compare(isSetDescription(), other.isSetDescription());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -2494,7 +2438,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetImageVersionId()).compareTo(other.isSetImageVersionId());
+    lastComparison = java.lang.Boolean.compare(isSetImageVersionId(), other.isSetImageVersionId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -2504,7 +2448,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetImageBaseId()).compareTo(other.isSetImageBaseId());
+    lastComparison = java.lang.Boolean.compare(isSetImageBaseId(), other.isSetImageBaseId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -2514,7 +2458,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetAutoUpdate()).compareTo(other.isSetAutoUpdate());
+    lastComparison = java.lang.Boolean.compare(isSetAutoUpdate(), other.isSetAutoUpdate());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -2524,7 +2468,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetIsEnabled()).compareTo(other.isSetIsEnabled());
+    lastComparison = java.lang.Boolean.compare(isSetIsEnabled(), other.isSetIsEnabled());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -2534,7 +2478,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetStartTime()).compareTo(other.isSetStartTime());
+    lastComparison = java.lang.Boolean.compare(isSetStartTime(), other.isSetStartTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -2544,7 +2488,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetEndTime()).compareTo(other.isSetEndTime());
+    lastComparison = java.lang.Boolean.compare(isSetEndTime(), other.isSetEndTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -2554,7 +2498,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetLastUsed()).compareTo(other.isSetLastUsed());
+    lastComparison = java.lang.Boolean.compare(isSetLastUsed(), other.isSetLastUsed());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -2564,7 +2508,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetUseCount()).compareTo(other.isSetUseCount());
+    lastComparison = java.lang.Boolean.compare(isSetUseCount(), other.isSetUseCount());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -2574,7 +2518,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetCreateTime()).compareTo(other.isSetCreateTime());
+    lastComparison = java.lang.Boolean.compare(isSetCreateTime(), other.isSetCreateTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -2584,7 +2528,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetUpdateTime()).compareTo(other.isSetUpdateTime());
+    lastComparison = java.lang.Boolean.compare(isSetUpdateTime(), other.isSetUpdateTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -2594,7 +2538,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetOwnerId()).compareTo(other.isSetOwnerId());
+    lastComparison = java.lang.Boolean.compare(isSetOwnerId(), other.isSetOwnerId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -2604,7 +2548,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetUpdaterId()).compareTo(other.isSetUpdaterId());
+    lastComparison = java.lang.Boolean.compare(isSetUpdaterId(), other.isSetUpdaterId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -2614,7 +2558,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetRunscript()).compareTo(other.isSetRunscript());
+    lastComparison = java.lang.Boolean.compare(isSetRunscript(), other.isSetRunscript());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -2624,7 +2568,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetNics()).compareTo(other.isSetNics());
+    lastComparison = java.lang.Boolean.compare(isSetNics(), other.isSetNics());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -2634,7 +2578,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetAllowedUsers()).compareTo(other.isSetAllowedUsers());
+    lastComparison = java.lang.Boolean.compare(isSetAllowedUsers(), other.isSetAllowedUsers());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -2644,7 +2588,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetNetworkExceptions()).compareTo(other.isSetNetworkExceptions());
+    lastComparison = java.lang.Boolean.compare(isSetNetworkExceptions(), other.isSetNetworkExceptions());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -2654,7 +2598,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetIsExam()).compareTo(other.isSetIsExam());
+    lastComparison = java.lang.Boolean.compare(isSetIsExam(), other.isSetIsExam());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -2664,7 +2608,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetHasInternetAccess()).compareTo(other.isSetHasInternetAccess());
+    lastComparison = java.lang.Boolean.compare(isSetHasInternetAccess(), other.isSetHasInternetAccess());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -2674,7 +2618,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetDefaultPermissions()).compareTo(other.isSetDefaultPermissions());
+    lastComparison = java.lang.Boolean.compare(isSetDefaultPermissions(), other.isSetDefaultPermissions());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -2684,7 +2628,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetUserPermissions()).compareTo(other.isSetUserPermissions());
+    lastComparison = java.lang.Boolean.compare(isSetUserPermissions(), other.isSetUserPermissions());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -2694,7 +2638,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetLocationIds()).compareTo(other.isSetLocationIds());
+    lastComparison = java.lang.Boolean.compare(isSetLocationIds(), other.isSetLocationIds());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -2704,7 +2648,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetLimitToLocations()).compareTo(other.isSetLimitToLocations());
+    lastComparison = java.lang.Boolean.compare(isSetLimitToLocations(), other.isSetLimitToLocations());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -2714,7 +2658,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetLimitToAllowedUsers()).compareTo(other.isSetLimitToAllowedUsers());
+    lastComparison = java.lang.Boolean.compare(isSetLimitToAllowedUsers(), other.isSetLimitToAllowedUsers());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -2724,7 +2668,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetHasUsbAccess()).compareTo(other.isSetHasUsbAccess());
+    lastComparison = java.lang.Boolean.compare(isSetHasUsbAccess(), other.isSetHasUsbAccess());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -2734,7 +2678,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetNetworkShares()).compareTo(other.isSetNetworkShares());
+    lastComparison = java.lang.Boolean.compare(isSetNetworkShares(), other.isSetNetworkShares());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -2744,7 +2688,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetLdapFilters()).compareTo(other.isSetLdapFilters());
+    lastComparison = java.lang.Boolean.compare(isSetLdapFilters(), other.isSetLdapFilters());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -2754,7 +2698,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetPresetScriptIds()).compareTo(other.isSetPresetScriptIds());
+    lastComparison = java.lang.Boolean.compare(isSetPresetScriptIds(), other.isSetPresetScriptIds());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -2764,7 +2708,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetPresetNetworkShares()).compareTo(other.isSetPresetNetworkShares());
+    lastComparison = java.lang.Boolean.compare(isSetPresetNetworkShares(), other.isSetPresetNetworkShares());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -2774,7 +2718,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetPresetLdapFilters()).compareTo(other.isSetPresetLdapFilters());
+    lastComparison = java.lang.Boolean.compare(isSetPresetLdapFilters(), other.isSetPresetLdapFilters());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -2784,7 +2728,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetPresetNetworkExceptionIds()).compareTo(other.isSetPresetNetworkExceptionIds());
+    lastComparison = java.lang.Boolean.compare(isSetPresetNetworkExceptionIds(), other.isSetPresetNetworkExceptionIds());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -2797,21 +2741,22 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
     return 0;
   }
 
+  @org.apache.thrift.annotation.Nullable
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("LectureRead(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("LectureRead(");
     boolean first = true;
 
     sb.append("lectureId:");
@@ -3062,7 +3007,7 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -3072,13 +3017,13 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
     }
   }
 
-  private static class LectureReadStandardSchemeFactory implements SchemeFactory {
+  private static class LectureReadStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public LectureReadStandardScheme getScheme() {
       return new LectureReadStandardScheme();
     }
   }
 
-  private static class LectureReadStandardScheme extends StandardScheme<LectureRead> {
+  private static class LectureReadStandardScheme extends org.apache.thrift.scheme.StandardScheme<LectureRead> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, LectureRead struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -3221,13 +3166,13 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
           case 14: // NICS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list202 = iprot.readListBegin();
-                struct.nics = new ArrayList<String>(_list202.size);
-                String _elem203;
-                for (int _i204 = 0; _i204 < _list202.size; ++_i204)
+                org.apache.thrift.protocol.TList _list210 = iprot.readListBegin();
+                struct.nics = new java.util.ArrayList<java.lang.String>(_list210.size);
+                @org.apache.thrift.annotation.Nullable java.lang.String _elem211;
+                for (int _i212 = 0; _i212 < _list210.size; ++_i212)
                 {
-                  _elem203 = iprot.readString();
-                  struct.nics.add(_elem203);
+                  _elem211 = iprot.readString();
+                  struct.nics.add(_elem211);
                 }
                 iprot.readListEnd();
               }
@@ -3239,13 +3184,13 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
           case 15: // ALLOWED_USERS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list205 = iprot.readListBegin();
-                struct.allowedUsers = new ArrayList<String>(_list205.size);
-                String _elem206;
-                for (int _i207 = 0; _i207 < _list205.size; ++_i207)
+                org.apache.thrift.protocol.TList _list213 = iprot.readListBegin();
+                struct.allowedUsers = new java.util.ArrayList<java.lang.String>(_list213.size);
+                @org.apache.thrift.annotation.Nullable java.lang.String _elem214;
+                for (int _i215 = 0; _i215 < _list213.size; ++_i215)
                 {
-                  _elem206 = iprot.readString();
-                  struct.allowedUsers.add(_elem206);
+                  _elem214 = iprot.readString();
+                  struct.allowedUsers.add(_elem214);
                 }
                 iprot.readListEnd();
               }
@@ -3257,14 +3202,14 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
           case 16: // NETWORK_EXCEPTIONS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list208 = iprot.readListBegin();
-                struct.networkExceptions = new ArrayList<NetRule>(_list208.size);
-                NetRule _elem209;
-                for (int _i210 = 0; _i210 < _list208.size; ++_i210)
+                org.apache.thrift.protocol.TList _list216 = iprot.readListBegin();
+                struct.networkExceptions = new java.util.ArrayList<NetRule>(_list216.size);
+                @org.apache.thrift.annotation.Nullable NetRule _elem217;
+                for (int _i218 = 0; _i218 < _list216.size; ++_i218)
                 {
-                  _elem209 = new NetRule();
-                  _elem209.read(iprot);
-                  struct.networkExceptions.add(_elem209);
+                  _elem217 = new NetRule();
+                  _elem217.read(iprot);
+                  struct.networkExceptions.add(_elem217);
                 }
                 iprot.readListEnd();
               }
@@ -3310,13 +3255,13 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
           case 25: // LOCATION_IDS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list211 = iprot.readListBegin();
-                struct.locationIds = new ArrayList<Integer>(_list211.size);
-                int _elem212;
-                for (int _i213 = 0; _i213 < _list211.size; ++_i213)
+                org.apache.thrift.protocol.TList _list219 = iprot.readListBegin();
+                struct.locationIds = new java.util.ArrayList<java.lang.Integer>(_list219.size);
+                int _elem220;
+                for (int _i221 = 0; _i221 < _list219.size; ++_i221)
                 {
-                  _elem212 = iprot.readI32();
-                  struct.locationIds.add(_elem212);
+                  _elem220 = iprot.readI32();
+                  struct.locationIds.add(_elem220);
                 }
                 iprot.readListEnd();
               }
@@ -3352,14 +3297,14 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
           case 29: // NETWORK_SHARES
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list214 = iprot.readListBegin();
-                struct.networkShares = new ArrayList<NetShare>(_list214.size);
-                NetShare _elem215;
-                for (int _i216 = 0; _i216 < _list214.size; ++_i216)
+                org.apache.thrift.protocol.TList _list222 = iprot.readListBegin();
+                struct.networkShares = new java.util.ArrayList<NetShare>(_list222.size);
+                @org.apache.thrift.annotation.Nullable NetShare _elem223;
+                for (int _i224 = 0; _i224 < _list222.size; ++_i224)
                 {
-                  _elem215 = new NetShare();
-                  _elem215.read(iprot);
-                  struct.networkShares.add(_elem215);
+                  _elem223 = new NetShare();
+                  _elem223.read(iprot);
+                  struct.networkShares.add(_elem223);
                 }
                 iprot.readListEnd();
               }
@@ -3371,14 +3316,14 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
           case 30: // LDAP_FILTERS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list217 = iprot.readListBegin();
-                struct.ldapFilters = new ArrayList<LdapFilter>(_list217.size);
-                LdapFilter _elem218;
-                for (int _i219 = 0; _i219 < _list217.size; ++_i219)
+                org.apache.thrift.protocol.TList _list225 = iprot.readListBegin();
+                struct.ldapFilters = new java.util.ArrayList<LdapFilter>(_list225.size);
+                @org.apache.thrift.annotation.Nullable LdapFilter _elem226;
+                for (int _i227 = 0; _i227 < _list225.size; ++_i227)
                 {
-                  _elem218 = new LdapFilter();
-                  _elem218.read(iprot);
-                  struct.ldapFilters.add(_elem218);
+                  _elem226 = new LdapFilter();
+                  _elem226.read(iprot);
+                  struct.ldapFilters.add(_elem226);
                 }
                 iprot.readListEnd();
               }
@@ -3390,13 +3335,13 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
           case 31: // PRESET_SCRIPT_IDS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list220 = iprot.readListBegin();
-                struct.presetScriptIds = new ArrayList<Integer>(_list220.size);
-                int _elem221;
-                for (int _i222 = 0; _i222 < _list220.size; ++_i222)
+                org.apache.thrift.protocol.TList _list228 = iprot.readListBegin();
+                struct.presetScriptIds = new java.util.ArrayList<java.lang.Integer>(_list228.size);
+                int _elem229;
+                for (int _i230 = 0; _i230 < _list228.size; ++_i230)
                 {
-                  _elem221 = iprot.readI32();
-                  struct.presetScriptIds.add(_elem221);
+                  _elem229 = iprot.readI32();
+                  struct.presetScriptIds.add(_elem229);
                 }
                 iprot.readListEnd();
               }
@@ -3408,13 +3353,13 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
           case 32: // PRESET_NETWORK_SHARES
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list223 = iprot.readListBegin();
-                struct.presetNetworkShares = new ArrayList<Integer>(_list223.size);
-                int _elem224;
-                for (int _i225 = 0; _i225 < _list223.size; ++_i225)
+                org.apache.thrift.protocol.TList _list231 = iprot.readListBegin();
+                struct.presetNetworkShares = new java.util.ArrayList<java.lang.Integer>(_list231.size);
+                int _elem232;
+                for (int _i233 = 0; _i233 < _list231.size; ++_i233)
                 {
-                  _elem224 = iprot.readI32();
-                  struct.presetNetworkShares.add(_elem224);
+                  _elem232 = iprot.readI32();
+                  struct.presetNetworkShares.add(_elem232);
                 }
                 iprot.readListEnd();
               }
@@ -3426,13 +3371,13 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
           case 33: // PRESET_LDAP_FILTERS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list226 = iprot.readListBegin();
-                struct.presetLdapFilters = new ArrayList<Integer>(_list226.size);
-                int _elem227;
-                for (int _i228 = 0; _i228 < _list226.size; ++_i228)
+                org.apache.thrift.protocol.TList _list234 = iprot.readListBegin();
+                struct.presetLdapFilters = new java.util.ArrayList<java.lang.Integer>(_list234.size);
+                int _elem235;
+                for (int _i236 = 0; _i236 < _list234.size; ++_i236)
                 {
-                  _elem227 = iprot.readI32();
-                  struct.presetLdapFilters.add(_elem227);
+                  _elem235 = iprot.readI32();
+                  struct.presetLdapFilters.add(_elem235);
                 }
                 iprot.readListEnd();
               }
@@ -3444,13 +3389,13 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
           case 34: // PRESET_NETWORK_EXCEPTION_IDS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list229 = iprot.readListBegin();
-                struct.presetNetworkExceptionIds = new ArrayList<Integer>(_list229.size);
-                int _elem230;
-                for (int _i231 = 0; _i231 < _list229.size; ++_i231)
+                org.apache.thrift.protocol.TList _list237 = iprot.readListBegin();
+                struct.presetNetworkExceptionIds = new java.util.ArrayList<java.lang.Integer>(_list237.size);
+                int _elem238;
+                for (int _i239 = 0; _i239 < _list237.size; ++_i239)
                 {
-                  _elem230 = iprot.readI32();
-                  struct.presetNetworkExceptionIds.add(_elem230);
+                  _elem238 = iprot.readI32();
+                  struct.presetNetworkExceptionIds.add(_elem238);
                 }
                 iprot.readListEnd();
               }
@@ -3526,9 +3471,9 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         oprot.writeFieldBegin(NICS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.nics.size()));
-          for (String _iter232 : struct.nics)
+          for (java.lang.String _iter240 : struct.nics)
           {
-            oprot.writeString(_iter232);
+            oprot.writeString(_iter240);
           }
           oprot.writeListEnd();
         }
@@ -3538,9 +3483,9 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         oprot.writeFieldBegin(ALLOWED_USERS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.allowedUsers.size()));
-          for (String _iter233 : struct.allowedUsers)
+          for (java.lang.String _iter241 : struct.allowedUsers)
           {
-            oprot.writeString(_iter233);
+            oprot.writeString(_iter241);
           }
           oprot.writeListEnd();
         }
@@ -3550,9 +3495,9 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         oprot.writeFieldBegin(NETWORK_EXCEPTIONS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.networkExceptions.size()));
-          for (NetRule _iter234 : struct.networkExceptions)
+          for (NetRule _iter242 : struct.networkExceptions)
           {
-            _iter234.write(oprot);
+            _iter242.write(oprot);
           }
           oprot.writeListEnd();
         }
@@ -3596,9 +3541,9 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
         oprot.writeFieldBegin(LOCATION_IDS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, struct.locationIds.size()));
-          for (int _iter235 : struct.locationIds)
+          for (int _iter243 : struct.locationIds)
           {
-            oprot.writeI32(_iter235);
+            oprot.writeI32(_iter243);
           }
           oprot.writeListEnd();
         }
@@ -3618,9 +3563,9 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
           oprot.writeFieldBegin(NETWORK_SHARES_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.networkShares.size()));
-            for (NetShare _iter236 : struct.networkShares)
+            for (NetShare _iter244 : struct.networkShares)
             {
-              _iter236.write(oprot);
+              _iter244.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -3632,9 +3577,9 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
           oprot.writeFieldBegin(LDAP_FILTERS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.ldapFilters.size()));
-            for (LdapFilter _iter237 : struct.ldapFilters)
+            for (LdapFilter _iter245 : struct.ldapFilters)
             {
-              _iter237.write(oprot);
+              _iter245.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -3646,9 +3591,9 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
           oprot.writeFieldBegin(PRESET_SCRIPT_IDS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, struct.presetScriptIds.size()));
-            for (int _iter238 : struct.presetScriptIds)
+            for (int _iter246 : struct.presetScriptIds)
             {
-              oprot.writeI32(_iter238);
+              oprot.writeI32(_iter246);
             }
             oprot.writeListEnd();
           }
@@ -3660,9 +3605,9 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
           oprot.writeFieldBegin(PRESET_NETWORK_SHARES_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, struct.presetNetworkShares.size()));
-            for (int _iter239 : struct.presetNetworkShares)
+            for (int _iter247 : struct.presetNetworkShares)
             {
-              oprot.writeI32(_iter239);
+              oprot.writeI32(_iter247);
             }
             oprot.writeListEnd();
           }
@@ -3674,9 +3619,9 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
           oprot.writeFieldBegin(PRESET_LDAP_FILTERS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, struct.presetLdapFilters.size()));
-            for (int _iter240 : struct.presetLdapFilters)
+            for (int _iter248 : struct.presetLdapFilters)
             {
-              oprot.writeI32(_iter240);
+              oprot.writeI32(_iter248);
             }
             oprot.writeListEnd();
           }
@@ -3688,9 +3633,9 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
           oprot.writeFieldBegin(PRESET_NETWORK_EXCEPTION_IDS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, struct.presetNetworkExceptionIds.size()));
-            for (int _iter241 : struct.presetNetworkExceptionIds)
+            for (int _iter249 : struct.presetNetworkExceptionIds)
             {
-              oprot.writeI32(_iter241);
+              oprot.writeI32(_iter249);
             }
             oprot.writeListEnd();
           }
@@ -3703,18 +3648,18 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
 
   }
 
-  private static class LectureReadTupleSchemeFactory implements SchemeFactory {
+  private static class LectureReadTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public LectureReadTupleScheme getScheme() {
       return new LectureReadTupleScheme();
     }
   }
 
-  private static class LectureReadTupleScheme extends TupleScheme<LectureRead> {
+  private static class LectureReadTupleScheme extends org.apache.thrift.scheme.TupleScheme<LectureRead> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, LectureRead struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetLectureId()) {
         optionals.set(0);
       }
@@ -3866,27 +3811,27 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       if (struct.isSetNics()) {
         {
           oprot.writeI32(struct.nics.size());
-          for (String _iter242 : struct.nics)
+          for (java.lang.String _iter250 : struct.nics)
           {
-            oprot.writeString(_iter242);
+            oprot.writeString(_iter250);
           }
         }
       }
       if (struct.isSetAllowedUsers()) {
         {
           oprot.writeI32(struct.allowedUsers.size());
-          for (String _iter243 : struct.allowedUsers)
+          for (java.lang.String _iter251 : struct.allowedUsers)
           {
-            oprot.writeString(_iter243);
+            oprot.writeString(_iter251);
           }
         }
       }
       if (struct.isSetNetworkExceptions()) {
         {
           oprot.writeI32(struct.networkExceptions.size());
-          for (NetRule _iter244 : struct.networkExceptions)
+          for (NetRule _iter252 : struct.networkExceptions)
           {
-            _iter244.write(oprot);
+            _iter252.write(oprot);
           }
         }
       }
@@ -3905,9 +3850,9 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       if (struct.isSetLocationIds()) {
         {
           oprot.writeI32(struct.locationIds.size());
-          for (int _iter245 : struct.locationIds)
+          for (int _iter253 : struct.locationIds)
           {
-            oprot.writeI32(_iter245);
+            oprot.writeI32(_iter253);
           }
         }
       }
@@ -3923,54 +3868,54 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       if (struct.isSetNetworkShares()) {
         {
           oprot.writeI32(struct.networkShares.size());
-          for (NetShare _iter246 : struct.networkShares)
+          for (NetShare _iter254 : struct.networkShares)
           {
-            _iter246.write(oprot);
+            _iter254.write(oprot);
           }
         }
       }
       if (struct.isSetLdapFilters()) {
         {
           oprot.writeI32(struct.ldapFilters.size());
-          for (LdapFilter _iter247 : struct.ldapFilters)
+          for (LdapFilter _iter255 : struct.ldapFilters)
           {
-            _iter247.write(oprot);
+            _iter255.write(oprot);
           }
         }
       }
       if (struct.isSetPresetScriptIds()) {
         {
           oprot.writeI32(struct.presetScriptIds.size());
-          for (int _iter248 : struct.presetScriptIds)
+          for (int _iter256 : struct.presetScriptIds)
           {
-            oprot.writeI32(_iter248);
+            oprot.writeI32(_iter256);
           }
         }
       }
       if (struct.isSetPresetNetworkShares()) {
         {
           oprot.writeI32(struct.presetNetworkShares.size());
-          for (int _iter249 : struct.presetNetworkShares)
+          for (int _iter257 : struct.presetNetworkShares)
           {
-            oprot.writeI32(_iter249);
+            oprot.writeI32(_iter257);
           }
         }
       }
       if (struct.isSetPresetLdapFilters()) {
         {
           oprot.writeI32(struct.presetLdapFilters.size());
-          for (int _iter250 : struct.presetLdapFilters)
+          for (int _iter258 : struct.presetLdapFilters)
           {
-            oprot.writeI32(_iter250);
+            oprot.writeI32(_iter258);
           }
         }
       }
       if (struct.isSetPresetNetworkExceptionIds()) {
         {
           oprot.writeI32(struct.presetNetworkExceptionIds.size());
-          for (int _iter251 : struct.presetNetworkExceptionIds)
+          for (int _iter259 : struct.presetNetworkExceptionIds)
           {
-            oprot.writeI32(_iter251);
+            oprot.writeI32(_iter259);
           }
         }
       }
@@ -3978,8 +3923,8 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, LectureRead struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(33);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(33);
       if (incoming.get(0)) {
         struct.lectureId = iprot.readString();
         struct.setLectureIdIsSet(true);
@@ -4046,40 +3991,40 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       }
       if (incoming.get(16)) {
         {
-          org.apache.thrift.protocol.TList _list252 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.nics = new ArrayList<String>(_list252.size);
-          String _elem253;
-          for (int _i254 = 0; _i254 < _list252.size; ++_i254)
+          org.apache.thrift.protocol.TList _list260 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+          struct.nics = new java.util.ArrayList<java.lang.String>(_list260.size);
+          @org.apache.thrift.annotation.Nullable java.lang.String _elem261;
+          for (int _i262 = 0; _i262 < _list260.size; ++_i262)
           {
-            _elem253 = iprot.readString();
-            struct.nics.add(_elem253);
+            _elem261 = iprot.readString();
+            struct.nics.add(_elem261);
           }
         }
         struct.setNicsIsSet(true);
       }
       if (incoming.get(17)) {
         {
-          org.apache.thrift.protocol.TList _list255 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.allowedUsers = new ArrayList<String>(_list255.size);
-          String _elem256;
-          for (int _i257 = 0; _i257 < _list255.size; ++_i257)
+          org.apache.thrift.protocol.TList _list263 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+          struct.allowedUsers = new java.util.ArrayList<java.lang.String>(_list263.size);
+          @org.apache.thrift.annotation.Nullable java.lang.String _elem264;
+          for (int _i265 = 0; _i265 < _list263.size; ++_i265)
           {
-            _elem256 = iprot.readString();
-            struct.allowedUsers.add(_elem256);
+            _elem264 = iprot.readString();
+            struct.allowedUsers.add(_elem264);
           }
         }
         struct.setAllowedUsersIsSet(true);
       }
       if (incoming.get(18)) {
         {
-          org.apache.thrift.protocol.TList _list258 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.networkExceptions = new ArrayList<NetRule>(_list258.size);
-          NetRule _elem259;
-          for (int _i260 = 0; _i260 < _list258.size; ++_i260)
+          org.apache.thrift.protocol.TList _list266 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.networkExceptions = new java.util.ArrayList<NetRule>(_list266.size);
+          @org.apache.thrift.annotation.Nullable NetRule _elem267;
+          for (int _i268 = 0; _i268 < _list266.size; ++_i268)
           {
-            _elem259 = new NetRule();
-            _elem259.read(iprot);
-            struct.networkExceptions.add(_elem259);
+            _elem267 = new NetRule();
+            _elem267.read(iprot);
+            struct.networkExceptions.add(_elem267);
           }
         }
         struct.setNetworkExceptionsIsSet(true);
@@ -4104,13 +4049,13 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       }
       if (incoming.get(23)) {
         {
-          org.apache.thrift.protocol.TList _list261 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32());
-          struct.locationIds = new ArrayList<Integer>(_list261.size);
-          int _elem262;
-          for (int _i263 = 0; _i263 < _list261.size; ++_i263)
+          org.apache.thrift.protocol.TList _list269 = iprot.readListBegin(org.apache.thrift.protocol.TType.I32);
+          struct.locationIds = new java.util.ArrayList<java.lang.Integer>(_list269.size);
+          int _elem270;
+          for (int _i271 = 0; _i271 < _list269.size; ++_i271)
           {
-            _elem262 = iprot.readI32();
-            struct.locationIds.add(_elem262);
+            _elem270 = iprot.readI32();
+            struct.locationIds.add(_elem270);
           }
         }
         struct.setLocationIdsIsSet(true);
@@ -4129,80 +4074,80 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
       }
       if (incoming.get(27)) {
         {
-          org.apache.thrift.protocol.TList _list264 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.networkShares = new ArrayList<NetShare>(_list264.size);
-          NetShare _elem265;
-          for (int _i266 = 0; _i266 < _list264.size; ++_i266)
+          org.apache.thrift.protocol.TList _list272 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.networkShares = new java.util.ArrayList<NetShare>(_list272.size);
+          @org.apache.thrift.annotation.Nullable NetShare _elem273;
+          for (int _i274 = 0; _i274 < _list272.size; ++_i274)
           {
-            _elem265 = new NetShare();
-            _elem265.read(iprot);
-            struct.networkShares.add(_elem265);
+            _elem273 = new NetShare();
+            _elem273.read(iprot);
+            struct.networkShares.add(_elem273);
           }
         }
         struct.setNetworkSharesIsSet(true);
       }
       if (incoming.get(28)) {
         {
-          org.apache.thrift.protocol.TList _list267 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.ldapFilters = new ArrayList<LdapFilter>(_list267.size);
-          LdapFilter _elem268;
-          for (int _i269 = 0; _i269 < _list267.size; ++_i269)
+          org.apache.thrift.protocol.TList _list275 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.ldapFilters = new java.util.ArrayList<LdapFilter>(_list275.size);
+          @org.apache.thrift.annotation.Nullable LdapFilter _elem276;
+          for (int _i277 = 0; _i277 < _list275.size; ++_i277)
           {
-            _elem268 = new LdapFilter();
-            _elem268.read(iprot);
-            struct.ldapFilters.add(_elem268);
+            _elem276 = new LdapFilter();
+            _elem276.read(iprot);
+            struct.ldapFilters.add(_elem276);
           }
         }
         struct.setLdapFiltersIsSet(true);
       }
       if (incoming.get(29)) {
         {
-          org.apache.thrift.protocol.TList _list270 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32());
-          struct.presetScriptIds = new ArrayList<Integer>(_list270.size);
-          int _elem271;
-          for (int _i272 = 0; _i272 < _list270.size; ++_i272)
+          org.apache.thrift.protocol.TList _list278 = iprot.readListBegin(org.apache.thrift.protocol.TType.I32);
+          struct.presetScriptIds = new java.util.ArrayList<java.lang.Integer>(_list278.size);
+          int _elem279;
+          for (int _i280 = 0; _i280 < _list278.size; ++_i280)
           {
-            _elem271 = iprot.readI32();
-            struct.presetScriptIds.add(_elem271);
+            _elem279 = iprot.readI32();
+            struct.presetScriptIds.add(_elem279);
           }
         }
         struct.setPresetScriptIdsIsSet(true);
       }
       if (incoming.get(30)) {
         {
-          org.apache.thrift.protocol.TList _list273 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32());
-          struct.presetNetworkShares = new ArrayList<Integer>(_list273.size);
-          int _elem274;
-          for (int _i275 = 0; _i275 < _list273.size; ++_i275)
+          org.apache.thrift.protocol.TList _list281 = iprot.readListBegin(org.apache.thrift.protocol.TType.I32);
+          struct.presetNetworkShares = new java.util.ArrayList<java.lang.Integer>(_list281.size);
+          int _elem282;
+          for (int _i283 = 0; _i283 < _list281.size; ++_i283)
           {
-            _elem274 = iprot.readI32();
-            struct.presetNetworkShares.add(_elem274);
+            _elem282 = iprot.readI32();
+            struct.presetNetworkShares.add(_elem282);
           }
         }
         struct.setPresetNetworkSharesIsSet(true);
       }
       if (incoming.get(31)) {
         {
-          org.apache.thrift.protocol.TList _list276 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32());
-          struct.presetLdapFilters = new ArrayList<Integer>(_list276.size);
-          int _elem277;
-          for (int _i278 = 0; _i278 < _list276.size; ++_i278)
+          org.apache.thrift.protocol.TList _list284 = iprot.readListBegin(org.apache.thrift.protocol.TType.I32);
+          struct.presetLdapFilters = new java.util.ArrayList<java.lang.Integer>(_list284.size);
+          int _elem285;
+          for (int _i286 = 0; _i286 < _list284.size; ++_i286)
           {
-            _elem277 = iprot.readI32();
-            struct.presetLdapFilters.add(_elem277);
+            _elem285 = iprot.readI32();
+            struct.presetLdapFilters.add(_elem285);
           }
         }
         struct.setPresetLdapFiltersIsSet(true);
       }
       if (incoming.get(32)) {
         {
-          org.apache.thrift.protocol.TList _list279 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32());
-          struct.presetNetworkExceptionIds = new ArrayList<Integer>(_list279.size);
-          int _elem280;
-          for (int _i281 = 0; _i281 < _list279.size; ++_i281)
+          org.apache.thrift.protocol.TList _list287 = iprot.readListBegin(org.apache.thrift.protocol.TType.I32);
+          struct.presetNetworkExceptionIds = new java.util.ArrayList<java.lang.Integer>(_list287.size);
+          int _elem288;
+          for (int _i289 = 0; _i289 < _list287.size; ++_i289)
           {
-            _elem280 = iprot.readI32();
-            struct.presetNetworkExceptionIds.add(_elem280);
+            _elem288 = iprot.readI32();
+            struct.presetNetworkExceptionIds.add(_elem288);
           }
         }
         struct.setPresetNetworkExceptionIdsIsSet(true);
@@ -4210,5 +4155,8 @@ public class LectureRead implements org.apache.thrift.TBase<LectureRead, Lecture
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/LectureSummary.java b/src/main/java/org/openslx/bwlp/thrift/iface/LectureSummary.java
index 25e518b..18e2016 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/LectureSummary.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/LectureSummary.java
@@ -1,40 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.openslx.bwlp.thrift.iface;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2020-10-12")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
 public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, LectureSummary._Fields>, java.io.Serializable, Cloneable, Comparable<LectureSummary> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LectureSummary");
 
@@ -57,28 +30,25 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
   private static final org.apache.thrift.protocol.TField IS_IMAGE_VERSION_USABLE_FIELD_DESC = new org.apache.thrift.protocol.TField("isImageVersionUsable", org.apache.thrift.protocol.TType.BOOL, (short)16);
   private static final org.apache.thrift.protocol.TField HAS_USB_ACCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("hasUsbAccess", org.apache.thrift.protocol.TType.BOOL, (short)17);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new LectureSummaryStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new LectureSummaryTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new LectureSummaryStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new LectureSummaryTupleSchemeFactory();
 
-  public String lectureId; // required
-  public String lectureName; // required
-  public String description; // required
-  public String imageVersionId; // required
-  public String imageBaseId; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String lectureId; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String lectureName; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String description; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String imageVersionId; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String imageBaseId; // required
   public boolean isEnabled; // required
   public long startTime; // required
   public long endTime; // required
   public long lastUsed; // required
   public int useCount; // required
-  public String ownerId; // required
-  public String updaterId; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String ownerId; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String updaterId; // required
   public boolean isExam; // required
   public boolean hasInternetAccess; // required
-  public LecturePermissions defaultPermissions; // required
-  public LecturePermissions userPermissions; // optional
+  public @org.apache.thrift.annotation.Nullable LecturePermissions defaultPermissions; // required
+  public @org.apache.thrift.annotation.Nullable LecturePermissions userPermissions; // optional
   public boolean isImageVersionUsable; // required
   public boolean hasUsbAccess; // required
 
@@ -103,10 +73,10 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
     IS_IMAGE_VERSION_USABLE((short)16, "isImageVersionUsable"),
     HAS_USB_ACCESS((short)17, "hasUsbAccess");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -114,6 +84,7 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
     /**
      * Find the _Fields constant that matches fieldId, or null if its not found.
      */
+    @org.apache.thrift.annotation.Nullable
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
         case 1: // LECTURE_ID
@@ -163,21 +134,22 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    @org.apache.thrift.annotation.Nullable
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -186,7 +158,7 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -203,9 +175,9 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
   private static final int __HASUSBACCESS_ISSET_ID = 8;
   private short __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.USER_PERMISSIONS};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.LECTURE_ID, new org.apache.thrift.meta_data.FieldMetaData("lectureId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , "UUID")));
     tmpMap.put(_Fields.LECTURE_NAME, new org.apache.thrift.meta_data.FieldMetaData("lectureName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -242,7 +214,7 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
     tmpMap.put(_Fields.HAS_USB_ACCESS, new org.apache.thrift.meta_data.FieldMetaData("hasUsbAccess", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LectureSummary.class, metaDataMap);
   }
 
@@ -250,18 +222,18 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
   }
 
   public LectureSummary(
-    String lectureId,
-    String lectureName,
-    String description,
-    String imageVersionId,
-    String imageBaseId,
+    java.lang.String lectureId,
+    java.lang.String lectureName,
+    java.lang.String description,
+    java.lang.String imageVersionId,
+    java.lang.String imageBaseId,
     boolean isEnabled,
     long startTime,
     long endTime,
     long lastUsed,
     int useCount,
-    String ownerId,
-    String updaterId,
+    java.lang.String ownerId,
+    java.lang.String updaterId,
     boolean isExam,
     boolean hasInternetAccess,
     LecturePermissions defaultPermissions,
@@ -375,11 +347,12 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
     this.hasUsbAccess = false;
   }
 
-  public String getLectureId() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getLectureId() {
     return this.lectureId;
   }
 
-  public LectureSummary setLectureId(String lectureId) {
+  public LectureSummary setLectureId(@org.apache.thrift.annotation.Nullable java.lang.String lectureId) {
     this.lectureId = lectureId;
     return this;
   }
@@ -399,11 +372,12 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
     }
   }
 
-  public String getLectureName() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getLectureName() {
     return this.lectureName;
   }
 
-  public LectureSummary setLectureName(String lectureName) {
+  public LectureSummary setLectureName(@org.apache.thrift.annotation.Nullable java.lang.String lectureName) {
     this.lectureName = lectureName;
     return this;
   }
@@ -423,11 +397,12 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
     }
   }
 
-  public String getDescription() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getDescription() {
     return this.description;
   }
 
-  public LectureSummary setDescription(String description) {
+  public LectureSummary setDescription(@org.apache.thrift.annotation.Nullable java.lang.String description) {
     this.description = description;
     return this;
   }
@@ -447,11 +422,12 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
     }
   }
 
-  public String getImageVersionId() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getImageVersionId() {
     return this.imageVersionId;
   }
 
-  public LectureSummary setImageVersionId(String imageVersionId) {
+  public LectureSummary setImageVersionId(@org.apache.thrift.annotation.Nullable java.lang.String imageVersionId) {
     this.imageVersionId = imageVersionId;
     return this;
   }
@@ -471,11 +447,12 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
     }
   }
 
-  public String getImageBaseId() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getImageBaseId() {
     return this.imageBaseId;
   }
 
-  public LectureSummary setImageBaseId(String imageBaseId) {
+  public LectureSummary setImageBaseId(@org.apache.thrift.annotation.Nullable java.lang.String imageBaseId) {
     this.imageBaseId = imageBaseId;
     return this;
   }
@@ -506,16 +483,16 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
   }
 
   public void unsetIsEnabled() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISENABLED_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ISENABLED_ISSET_ID);
   }
 
   /** Returns true if field isEnabled is set (has been assigned a value) and false otherwise */
   public boolean isSetIsEnabled() {
-    return EncodingUtils.testBit(__isset_bitfield, __ISENABLED_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ISENABLED_ISSET_ID);
   }
 
   public void setIsEnabledIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISENABLED_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ISENABLED_ISSET_ID, value);
   }
 
   public long getStartTime() {
@@ -529,16 +506,16 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
   }
 
   public void unsetStartTime() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __STARTTIME_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __STARTTIME_ISSET_ID);
   }
 
   /** Returns true if field startTime is set (has been assigned a value) and false otherwise */
   public boolean isSetStartTime() {
-    return EncodingUtils.testBit(__isset_bitfield, __STARTTIME_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __STARTTIME_ISSET_ID);
   }
 
   public void setStartTimeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __STARTTIME_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __STARTTIME_ISSET_ID, value);
   }
 
   public long getEndTime() {
@@ -552,16 +529,16 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
   }
 
   public void unsetEndTime() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ENDTIME_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ENDTIME_ISSET_ID);
   }
 
   /** Returns true if field endTime is set (has been assigned a value) and false otherwise */
   public boolean isSetEndTime() {
-    return EncodingUtils.testBit(__isset_bitfield, __ENDTIME_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ENDTIME_ISSET_ID);
   }
 
   public void setEndTimeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ENDTIME_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ENDTIME_ISSET_ID, value);
   }
 
   public long getLastUsed() {
@@ -575,16 +552,16 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
   }
 
   public void unsetLastUsed() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __LASTUSED_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __LASTUSED_ISSET_ID);
   }
 
   /** Returns true if field lastUsed is set (has been assigned a value) and false otherwise */
   public boolean isSetLastUsed() {
-    return EncodingUtils.testBit(__isset_bitfield, __LASTUSED_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __LASTUSED_ISSET_ID);
   }
 
   public void setLastUsedIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __LASTUSED_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __LASTUSED_ISSET_ID, value);
   }
 
   public int getUseCount() {
@@ -598,23 +575,24 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
   }
 
   public void unsetUseCount() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __USECOUNT_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __USECOUNT_ISSET_ID);
   }
 
   /** Returns true if field useCount is set (has been assigned a value) and false otherwise */
   public boolean isSetUseCount() {
-    return EncodingUtils.testBit(__isset_bitfield, __USECOUNT_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __USECOUNT_ISSET_ID);
   }
 
   public void setUseCountIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __USECOUNT_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __USECOUNT_ISSET_ID, value);
   }
 
-  public String getOwnerId() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getOwnerId() {
     return this.ownerId;
   }
 
-  public LectureSummary setOwnerId(String ownerId) {
+  public LectureSummary setOwnerId(@org.apache.thrift.annotation.Nullable java.lang.String ownerId) {
     this.ownerId = ownerId;
     return this;
   }
@@ -634,11 +612,12 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
     }
   }
 
-  public String getUpdaterId() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getUpdaterId() {
     return this.updaterId;
   }
 
-  public LectureSummary setUpdaterId(String updaterId) {
+  public LectureSummary setUpdaterId(@org.apache.thrift.annotation.Nullable java.lang.String updaterId) {
     this.updaterId = updaterId;
     return this;
   }
@@ -669,16 +648,16 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
   }
 
   public void unsetIsExam() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISEXAM_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ISEXAM_ISSET_ID);
   }
 
   /** Returns true if field isExam is set (has been assigned a value) and false otherwise */
   public boolean isSetIsExam() {
-    return EncodingUtils.testBit(__isset_bitfield, __ISEXAM_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ISEXAM_ISSET_ID);
   }
 
   public void setIsExamIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISEXAM_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ISEXAM_ISSET_ID, value);
   }
 
   public boolean isHasInternetAccess() {
@@ -692,23 +671,24 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
   }
 
   public void unsetHasInternetAccess() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __HASINTERNETACCESS_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __HASINTERNETACCESS_ISSET_ID);
   }
 
   /** Returns true if field hasInternetAccess is set (has been assigned a value) and false otherwise */
   public boolean isSetHasInternetAccess() {
-    return EncodingUtils.testBit(__isset_bitfield, __HASINTERNETACCESS_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __HASINTERNETACCESS_ISSET_ID);
   }
 
   public void setHasInternetAccessIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __HASINTERNETACCESS_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __HASINTERNETACCESS_ISSET_ID, value);
   }
 
+  @org.apache.thrift.annotation.Nullable
   public LecturePermissions getDefaultPermissions() {
     return this.defaultPermissions;
   }
 
-  public LectureSummary setDefaultPermissions(LecturePermissions defaultPermissions) {
+  public LectureSummary setDefaultPermissions(@org.apache.thrift.annotation.Nullable LecturePermissions defaultPermissions) {
     this.defaultPermissions = defaultPermissions;
     return this;
   }
@@ -728,11 +708,12 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
     }
   }
 
+  @org.apache.thrift.annotation.Nullable
   public LecturePermissions getUserPermissions() {
     return this.userPermissions;
   }
 
-  public LectureSummary setUserPermissions(LecturePermissions userPermissions) {
+  public LectureSummary setUserPermissions(@org.apache.thrift.annotation.Nullable LecturePermissions userPermissions) {
     this.userPermissions = userPermissions;
     return this;
   }
@@ -763,16 +744,16 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
   }
 
   public void unsetIsImageVersionUsable() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISIMAGEVERSIONUSABLE_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ISIMAGEVERSIONUSABLE_ISSET_ID);
   }
 
   /** Returns true if field isImageVersionUsable is set (has been assigned a value) and false otherwise */
   public boolean isSetIsImageVersionUsable() {
-    return EncodingUtils.testBit(__isset_bitfield, __ISIMAGEVERSIONUSABLE_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ISIMAGEVERSIONUSABLE_ISSET_ID);
   }
 
   public void setIsImageVersionUsableIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISIMAGEVERSIONUSABLE_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ISIMAGEVERSIONUSABLE_ISSET_ID, value);
   }
 
   public boolean isHasUsbAccess() {
@@ -786,25 +767,25 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
   }
 
   public void unsetHasUsbAccess() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __HASUSBACCESS_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __HASUSBACCESS_ISSET_ID);
   }
 
   /** Returns true if field hasUsbAccess is set (has been assigned a value) and false otherwise */
   public boolean isSetHasUsbAccess() {
-    return EncodingUtils.testBit(__isset_bitfield, __HASUSBACCESS_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __HASUSBACCESS_ISSET_ID);
   }
 
   public void setHasUsbAccessIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __HASUSBACCESS_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __HASUSBACCESS_ISSET_ID, value);
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case LECTURE_ID:
       if (value == null) {
         unsetLectureId();
       } else {
-        setLectureId((String)value);
+        setLectureId((java.lang.String)value);
       }
       break;
 
@@ -812,7 +793,7 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
       if (value == null) {
         unsetLectureName();
       } else {
-        setLectureName((String)value);
+        setLectureName((java.lang.String)value);
       }
       break;
 
@@ -820,7 +801,7 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
       if (value == null) {
         unsetDescription();
       } else {
-        setDescription((String)value);
+        setDescription((java.lang.String)value);
       }
       break;
 
@@ -828,7 +809,7 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
       if (value == null) {
         unsetImageVersionId();
       } else {
-        setImageVersionId((String)value);
+        setImageVersionId((java.lang.String)value);
       }
       break;
 
@@ -836,7 +817,7 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
       if (value == null) {
         unsetImageBaseId();
       } else {
-        setImageBaseId((String)value);
+        setImageBaseId((java.lang.String)value);
       }
       break;
 
@@ -844,7 +825,7 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
       if (value == null) {
         unsetIsEnabled();
       } else {
-        setIsEnabled((Boolean)value);
+        setIsEnabled((java.lang.Boolean)value);
       }
       break;
 
@@ -852,7 +833,7 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
       if (value == null) {
         unsetStartTime();
       } else {
-        setStartTime((Long)value);
+        setStartTime((java.lang.Long)value);
       }
       break;
 
@@ -860,7 +841,7 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
       if (value == null) {
         unsetEndTime();
       } else {
-        setEndTime((Long)value);
+        setEndTime((java.lang.Long)value);
       }
       break;
 
@@ -868,7 +849,7 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
       if (value == null) {
         unsetLastUsed();
       } else {
-        setLastUsed((Long)value);
+        setLastUsed((java.lang.Long)value);
       }
       break;
 
@@ -876,7 +857,7 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
       if (value == null) {
         unsetUseCount();
       } else {
-        setUseCount((Integer)value);
+        setUseCount((java.lang.Integer)value);
       }
       break;
 
@@ -884,7 +865,7 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
       if (value == null) {
         unsetOwnerId();
       } else {
-        setOwnerId((String)value);
+        setOwnerId((java.lang.String)value);
       }
       break;
 
@@ -892,7 +873,7 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
       if (value == null) {
         unsetUpdaterId();
       } else {
-        setUpdaterId((String)value);
+        setUpdaterId((java.lang.String)value);
       }
       break;
 
@@ -900,7 +881,7 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
       if (value == null) {
         unsetIsExam();
       } else {
-        setIsExam((Boolean)value);
+        setIsExam((java.lang.Boolean)value);
       }
       break;
 
@@ -908,7 +889,7 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
       if (value == null) {
         unsetHasInternetAccess();
       } else {
-        setHasInternetAccess((Boolean)value);
+        setHasInternetAccess((java.lang.Boolean)value);
       }
       break;
 
@@ -932,7 +913,7 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
       if (value == null) {
         unsetIsImageVersionUsable();
       } else {
-        setIsImageVersionUsable((Boolean)value);
+        setIsImageVersionUsable((java.lang.Boolean)value);
       }
       break;
 
@@ -940,14 +921,15 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
       if (value == null) {
         unsetHasUsbAccess();
       } else {
-        setHasUsbAccess((Boolean)value);
+        setHasUsbAccess((java.lang.Boolean)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case LECTURE_ID:
       return getLectureId();
@@ -1004,13 +986,13 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
       return isHasUsbAccess();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -1051,13 +1033,11 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
     case HAS_USB_ACCESS:
       return isSetHasUsbAccess();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
+  public boolean equals(java.lang.Object that) {
     if (that instanceof LectureSummary)
       return this.equals((LectureSummary)that);
     return false;
@@ -1066,6 +1046,8 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
   public boolean equals(LectureSummary that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_lectureId = true && this.isSetLectureId();
     boolean that_present_lectureId = true && that.isSetLectureId();
@@ -1234,99 +1216,63 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_lectureId = true && (isSetLectureId());
-    list.add(present_lectureId);
-    if (present_lectureId)
-      list.add(lectureId);
-
-    boolean present_lectureName = true && (isSetLectureName());
-    list.add(present_lectureName);
-    if (present_lectureName)
-      list.add(lectureName);
-
-    boolean present_description = true && (isSetDescription());
-    list.add(present_description);
-    if (present_description)
-      list.add(description);
-
-    boolean present_imageVersionId = true && (isSetImageVersionId());
-    list.add(present_imageVersionId);
-    if (present_imageVersionId)
-      list.add(imageVersionId);
-
-    boolean present_imageBaseId = true && (isSetImageBaseId());
-    list.add(present_imageBaseId);
-    if (present_imageBaseId)
-      list.add(imageBaseId);
-
-    boolean present_isEnabled = true;
-    list.add(present_isEnabled);
-    if (present_isEnabled)
-      list.add(isEnabled);
-
-    boolean present_startTime = true;
-    list.add(present_startTime);
-    if (present_startTime)
-      list.add(startTime);
-
-    boolean present_endTime = true;
-    list.add(present_endTime);
-    if (present_endTime)
-      list.add(endTime);
-
-    boolean present_lastUsed = true;
-    list.add(present_lastUsed);
-    if (present_lastUsed)
-      list.add(lastUsed);
-
-    boolean present_useCount = true;
-    list.add(present_useCount);
-    if (present_useCount)
-      list.add(useCount);
-
-    boolean present_ownerId = true && (isSetOwnerId());
-    list.add(present_ownerId);
-    if (present_ownerId)
-      list.add(ownerId);
-
-    boolean present_updaterId = true && (isSetUpdaterId());
-    list.add(present_updaterId);
-    if (present_updaterId)
-      list.add(updaterId);
-
-    boolean present_isExam = true;
-    list.add(present_isExam);
-    if (present_isExam)
-      list.add(isExam);
-
-    boolean present_hasInternetAccess = true;
-    list.add(present_hasInternetAccess);
-    if (present_hasInternetAccess)
-      list.add(hasInternetAccess);
-
-    boolean present_defaultPermissions = true && (isSetDefaultPermissions());
-    list.add(present_defaultPermissions);
-    if (present_defaultPermissions)
-      list.add(defaultPermissions);
-
-    boolean present_userPermissions = true && (isSetUserPermissions());
-    list.add(present_userPermissions);
-    if (present_userPermissions)
-      list.add(userPermissions);
-
-    boolean present_isImageVersionUsable = true;
-    list.add(present_isImageVersionUsable);
-    if (present_isImageVersionUsable)
-      list.add(isImageVersionUsable);
-
-    boolean present_hasUsbAccess = true;
-    list.add(present_hasUsbAccess);
-    if (present_hasUsbAccess)
-      list.add(hasUsbAccess);
-
-    return list.hashCode();
+    int hashCode = 1;
+
+    hashCode = hashCode * 8191 + ((isSetLectureId()) ? 131071 : 524287);
+    if (isSetLectureId())
+      hashCode = hashCode * 8191 + lectureId.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetLectureName()) ? 131071 : 524287);
+    if (isSetLectureName())
+      hashCode = hashCode * 8191 + lectureName.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetDescription()) ? 131071 : 524287);
+    if (isSetDescription())
+      hashCode = hashCode * 8191 + description.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetImageVersionId()) ? 131071 : 524287);
+    if (isSetImageVersionId())
+      hashCode = hashCode * 8191 + imageVersionId.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetImageBaseId()) ? 131071 : 524287);
+    if (isSetImageBaseId())
+      hashCode = hashCode * 8191 + imageBaseId.hashCode();
+
+    hashCode = hashCode * 8191 + ((isEnabled) ? 131071 : 524287);
+
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(startTime);
+
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(endTime);
+
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(lastUsed);
+
+    hashCode = hashCode * 8191 + useCount;
+
+    hashCode = hashCode * 8191 + ((isSetOwnerId()) ? 131071 : 524287);
+    if (isSetOwnerId())
+      hashCode = hashCode * 8191 + ownerId.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetUpdaterId()) ? 131071 : 524287);
+    if (isSetUpdaterId())
+      hashCode = hashCode * 8191 + updaterId.hashCode();
+
+    hashCode = hashCode * 8191 + ((isExam) ? 131071 : 524287);
+
+    hashCode = hashCode * 8191 + ((hasInternetAccess) ? 131071 : 524287);
+
+    hashCode = hashCode * 8191 + ((isSetDefaultPermissions()) ? 131071 : 524287);
+    if (isSetDefaultPermissions())
+      hashCode = hashCode * 8191 + defaultPermissions.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetUserPermissions()) ? 131071 : 524287);
+    if (isSetUserPermissions())
+      hashCode = hashCode * 8191 + userPermissions.hashCode();
+
+    hashCode = hashCode * 8191 + ((isImageVersionUsable) ? 131071 : 524287);
+
+    hashCode = hashCode * 8191 + ((hasUsbAccess) ? 131071 : 524287);
+
+    return hashCode;
   }
 
   @Override
@@ -1337,7 +1283,7 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetLectureId()).compareTo(other.isSetLectureId());
+    lastComparison = java.lang.Boolean.compare(isSetLectureId(), other.isSetLectureId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1347,7 +1293,7 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetLectureName()).compareTo(other.isSetLectureName());
+    lastComparison = java.lang.Boolean.compare(isSetLectureName(), other.isSetLectureName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1357,7 +1303,7 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetDescription()).compareTo(other.isSetDescription());
+    lastComparison = java.lang.Boolean.compare(isSetDescription(), other.isSetDescription());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1367,7 +1313,7 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetImageVersionId()).compareTo(other.isSetImageVersionId());
+    lastComparison = java.lang.Boolean.compare(isSetImageVersionId(), other.isSetImageVersionId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1377,7 +1323,7 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetImageBaseId()).compareTo(other.isSetImageBaseId());
+    lastComparison = java.lang.Boolean.compare(isSetImageBaseId(), other.isSetImageBaseId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1387,7 +1333,7 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetIsEnabled()).compareTo(other.isSetIsEnabled());
+    lastComparison = java.lang.Boolean.compare(isSetIsEnabled(), other.isSetIsEnabled());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1397,7 +1343,7 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetStartTime()).compareTo(other.isSetStartTime());
+    lastComparison = java.lang.Boolean.compare(isSetStartTime(), other.isSetStartTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1407,7 +1353,7 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetEndTime()).compareTo(other.isSetEndTime());
+    lastComparison = java.lang.Boolean.compare(isSetEndTime(), other.isSetEndTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1417,7 +1363,7 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetLastUsed()).compareTo(other.isSetLastUsed());
+    lastComparison = java.lang.Boolean.compare(isSetLastUsed(), other.isSetLastUsed());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1427,7 +1373,7 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetUseCount()).compareTo(other.isSetUseCount());
+    lastComparison = java.lang.Boolean.compare(isSetUseCount(), other.isSetUseCount());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1437,7 +1383,7 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetOwnerId()).compareTo(other.isSetOwnerId());
+    lastComparison = java.lang.Boolean.compare(isSetOwnerId(), other.isSetOwnerId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1447,7 +1393,7 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetUpdaterId()).compareTo(other.isSetUpdaterId());
+    lastComparison = java.lang.Boolean.compare(isSetUpdaterId(), other.isSetUpdaterId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1457,7 +1403,7 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetIsExam()).compareTo(other.isSetIsExam());
+    lastComparison = java.lang.Boolean.compare(isSetIsExam(), other.isSetIsExam());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1467,7 +1413,7 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetHasInternetAccess()).compareTo(other.isSetHasInternetAccess());
+    lastComparison = java.lang.Boolean.compare(isSetHasInternetAccess(), other.isSetHasInternetAccess());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1477,7 +1423,7 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetDefaultPermissions()).compareTo(other.isSetDefaultPermissions());
+    lastComparison = java.lang.Boolean.compare(isSetDefaultPermissions(), other.isSetDefaultPermissions());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1487,7 +1433,7 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetUserPermissions()).compareTo(other.isSetUserPermissions());
+    lastComparison = java.lang.Boolean.compare(isSetUserPermissions(), other.isSetUserPermissions());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1497,7 +1443,7 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetIsImageVersionUsable()).compareTo(other.isSetIsImageVersionUsable());
+    lastComparison = java.lang.Boolean.compare(isSetIsImageVersionUsable(), other.isSetIsImageVersionUsable());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1507,7 +1453,7 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetHasUsbAccess()).compareTo(other.isSetHasUsbAccess());
+    lastComparison = java.lang.Boolean.compare(isSetHasUsbAccess(), other.isSetHasUsbAccess());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1520,21 +1466,22 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
     return 0;
   }
 
+  @org.apache.thrift.annotation.Nullable
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("LectureSummary(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("LectureSummary(");
     boolean first = true;
 
     sb.append("lectureId:");
@@ -1669,7 +1616,7 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -1679,13 +1626,13 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
     }
   }
 
-  private static class LectureSummaryStandardSchemeFactory implements SchemeFactory {
+  private static class LectureSummaryStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public LectureSummaryStandardScheme getScheme() {
       return new LectureSummaryStandardScheme();
     }
   }
 
-  private static class LectureSummaryStandardScheme extends StandardScheme<LectureSummary> {
+  private static class LectureSummaryStandardScheme extends org.apache.thrift.scheme.StandardScheme<LectureSummary> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, LectureSummary struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -1938,18 +1885,18 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
 
   }
 
-  private static class LectureSummaryTupleSchemeFactory implements SchemeFactory {
+  private static class LectureSummaryTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public LectureSummaryTupleScheme getScheme() {
       return new LectureSummaryTupleScheme();
     }
   }
 
-  private static class LectureSummaryTupleScheme extends TupleScheme<LectureSummary> {
+  private static class LectureSummaryTupleScheme extends org.apache.thrift.scheme.TupleScheme<LectureSummary> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, LectureSummary struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetLectureId()) {
         optionals.set(0);
       }
@@ -2063,8 +2010,8 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, LectureSummary struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(18);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(18);
       if (incoming.get(0)) {
         struct.lectureId = iprot.readString();
         struct.setLectureIdIsSet(true);
@@ -2142,5 +2089,8 @@ public class LectureSummary implements org.apache.thrift.TBase<LectureSummary, L
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/LectureWrite.java b/src/main/java/org/openslx/bwlp/thrift/iface/LectureWrite.java
index 921ea64..aee2ee8 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/LectureWrite.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/LectureWrite.java
@@ -1,40 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.openslx.bwlp.thrift.iface;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2019-02-25")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
 public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, LectureWrite._Fields>, java.io.Serializable, Cloneable, Comparable<LectureWrite> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("LectureWrite");
 
@@ -62,35 +35,32 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
   private static final org.apache.thrift.protocol.TField PRESET_SCRIPT_IDS_FIELD_DESC = new org.apache.thrift.protocol.TField("presetScriptIds", org.apache.thrift.protocol.TType.LIST, (short)23);
   private static final org.apache.thrift.protocol.TField PRESET_NETWORK_EXCEPTION_IDS_FIELD_DESC = new org.apache.thrift.protocol.TField("presetNetworkExceptionIds", org.apache.thrift.protocol.TType.LIST, (short)24);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new LectureWriteStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new LectureWriteTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new LectureWriteStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new LectureWriteTupleSchemeFactory();
 
-  public String lectureName; // required
-  public String description; // required
-  public String imageVersionId; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String lectureName; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String description; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String imageVersionId; // required
   public boolean autoUpdate; // required
   public boolean isEnabled; // required
   public long startTime; // required
   public long endTime; // required
-  public String runscript; // required
-  public List<String> nics; // required
-  public List<NetRule> networkExceptions; // optional
+  public @org.apache.thrift.annotation.Nullable java.lang.String runscript; // required
+  public @org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> nics; // required
+  public @org.apache.thrift.annotation.Nullable java.util.List<NetRule> networkExceptions; // optional
   public boolean isExam; // required
   public boolean hasInternetAccess; // required
-  public LecturePermissions defaultPermissions; // required
-  public List<String> addAllowedUsers; // optional
-  public List<String> remAllowedUsers; // optional
-  public List<Integer> locationIds; // required
+  public @org.apache.thrift.annotation.Nullable LecturePermissions defaultPermissions; // required
+  public @org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> addAllowedUsers; // optional
+  public @org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> remAllowedUsers; // optional
+  public @org.apache.thrift.annotation.Nullable java.util.List<java.lang.Integer> locationIds; // required
   public boolean limitToLocations; // required
   public boolean limitToAllowedUsers; // required
   public boolean hasUsbAccess; // required
-  public List<NetShare> networkShares; // optional
-  public List<LdapFilter> ldapFilters; // optional
-  public List<Integer> presetScriptIds; // optional
-  public List<Integer> presetNetworkExceptionIds; // optional
+  public @org.apache.thrift.annotation.Nullable java.util.List<NetShare> networkShares; // optional
+  public @org.apache.thrift.annotation.Nullable java.util.List<LdapFilter> ldapFilters; // optional
+  public @org.apache.thrift.annotation.Nullable java.util.List<java.lang.Integer> presetScriptIds; // optional
+  public @org.apache.thrift.annotation.Nullable java.util.List<java.lang.Integer> presetNetworkExceptionIds; // optional
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -118,10 +88,10 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
     PRESET_SCRIPT_IDS((short)23, "presetScriptIds"),
     PRESET_NETWORK_EXCEPTION_IDS((short)24, "presetNetworkExceptionIds");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -129,6 +99,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
     /**
      * Find the _Fields constant that matches fieldId, or null if its not found.
      */
+    @org.apache.thrift.annotation.Nullable
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
         case 1: // LECTURE_NAME
@@ -188,21 +159,22 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    @org.apache.thrift.annotation.Nullable
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -211,7 +183,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -228,9 +200,9 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
   private static final int __HASUSBACCESS_ISSET_ID = 8;
   private short __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.NETWORK_EXCEPTIONS,_Fields.ADD_ALLOWED_USERS,_Fields.REM_ALLOWED_USERS,_Fields.NETWORK_SHARES,_Fields.LDAP_FILTERS,_Fields.PRESET_SCRIPT_IDS,_Fields.PRESET_NETWORK_EXCEPTION_IDS};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.LECTURE_NAME, new org.apache.thrift.meta_data.FieldMetaData("lectureName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.DESCRIPTION, new org.apache.thrift.meta_data.FieldMetaData("description", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -286,7 +258,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
     tmpMap.put(_Fields.PRESET_NETWORK_EXCEPTION_IDS, new org.apache.thrift.meta_data.FieldMetaData("presetNetworkExceptionIds", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
             new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(LectureWrite.class, metaDataMap);
   }
 
@@ -294,19 +266,19 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
   }
 
   public LectureWrite(
-    String lectureName,
-    String description,
-    String imageVersionId,
+    java.lang.String lectureName,
+    java.lang.String description,
+    java.lang.String imageVersionId,
     boolean autoUpdate,
     boolean isEnabled,
     long startTime,
     long endTime,
-    String runscript,
-    List<String> nics,
+    java.lang.String runscript,
+    java.util.List<java.lang.String> nics,
     boolean isExam,
     boolean hasInternetAccess,
     LecturePermissions defaultPermissions,
-    List<Integer> locationIds,
+    java.util.List<java.lang.Integer> locationIds,
     boolean limitToLocations,
     boolean limitToAllowedUsers,
     boolean hasUsbAccess)
@@ -361,11 +333,11 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
       this.runscript = other.runscript;
     }
     if (other.isSetNics()) {
-      List<String> __this__nics = new ArrayList<String>(other.nics);
+      java.util.List<java.lang.String> __this__nics = new java.util.ArrayList<java.lang.String>(other.nics);
       this.nics = __this__nics;
     }
     if (other.isSetNetworkExceptions()) {
-      List<NetRule> __this__networkExceptions = new ArrayList<NetRule>(other.networkExceptions.size());
+      java.util.List<NetRule> __this__networkExceptions = new java.util.ArrayList<NetRule>(other.networkExceptions.size());
       for (NetRule other_element : other.networkExceptions) {
         __this__networkExceptions.add(new NetRule(other_element));
       }
@@ -377,40 +349,40 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
       this.defaultPermissions = new LecturePermissions(other.defaultPermissions);
     }
     if (other.isSetAddAllowedUsers()) {
-      List<String> __this__addAllowedUsers = new ArrayList<String>(other.addAllowedUsers);
+      java.util.List<java.lang.String> __this__addAllowedUsers = new java.util.ArrayList<java.lang.String>(other.addAllowedUsers);
       this.addAllowedUsers = __this__addAllowedUsers;
     }
     if (other.isSetRemAllowedUsers()) {
-      List<String> __this__remAllowedUsers = new ArrayList<String>(other.remAllowedUsers);
+      java.util.List<java.lang.String> __this__remAllowedUsers = new java.util.ArrayList<java.lang.String>(other.remAllowedUsers);
       this.remAllowedUsers = __this__remAllowedUsers;
     }
     if (other.isSetLocationIds()) {
-      List<Integer> __this__locationIds = new ArrayList<Integer>(other.locationIds);
+      java.util.List<java.lang.Integer> __this__locationIds = new java.util.ArrayList<java.lang.Integer>(other.locationIds);
       this.locationIds = __this__locationIds;
     }
     this.limitToLocations = other.limitToLocations;
     this.limitToAllowedUsers = other.limitToAllowedUsers;
     this.hasUsbAccess = other.hasUsbAccess;
     if (other.isSetNetworkShares()) {
-      List<NetShare> __this__networkShares = new ArrayList<NetShare>(other.networkShares.size());
+      java.util.List<NetShare> __this__networkShares = new java.util.ArrayList<NetShare>(other.networkShares.size());
       for (NetShare other_element : other.networkShares) {
         __this__networkShares.add(new NetShare(other_element));
       }
       this.networkShares = __this__networkShares;
     }
     if (other.isSetLdapFilters()) {
-      List<LdapFilter> __this__ldapFilters = new ArrayList<LdapFilter>(other.ldapFilters.size());
+      java.util.List<LdapFilter> __this__ldapFilters = new java.util.ArrayList<LdapFilter>(other.ldapFilters.size());
       for (LdapFilter other_element : other.ldapFilters) {
         __this__ldapFilters.add(new LdapFilter(other_element));
       }
       this.ldapFilters = __this__ldapFilters;
     }
     if (other.isSetPresetScriptIds()) {
-      List<Integer> __this__presetScriptIds = new ArrayList<Integer>(other.presetScriptIds);
+      java.util.List<java.lang.Integer> __this__presetScriptIds = new java.util.ArrayList<java.lang.Integer>(other.presetScriptIds);
       this.presetScriptIds = __this__presetScriptIds;
     }
     if (other.isSetPresetNetworkExceptionIds()) {
-      List<Integer> __this__presetNetworkExceptionIds = new ArrayList<Integer>(other.presetNetworkExceptionIds);
+      java.util.List<java.lang.Integer> __this__presetNetworkExceptionIds = new java.util.ArrayList<java.lang.Integer>(other.presetNetworkExceptionIds);
       this.presetNetworkExceptionIds = __this__presetNetworkExceptionIds;
     }
   }
@@ -455,11 +427,12 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
     this.presetNetworkExceptionIds = null;
   }
 
-  public String getLectureName() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getLectureName() {
     return this.lectureName;
   }
 
-  public LectureWrite setLectureName(String lectureName) {
+  public LectureWrite setLectureName(@org.apache.thrift.annotation.Nullable java.lang.String lectureName) {
     this.lectureName = lectureName;
     return this;
   }
@@ -479,11 +452,12 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
     }
   }
 
-  public String getDescription() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getDescription() {
     return this.description;
   }
 
-  public LectureWrite setDescription(String description) {
+  public LectureWrite setDescription(@org.apache.thrift.annotation.Nullable java.lang.String description) {
     this.description = description;
     return this;
   }
@@ -503,11 +477,12 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
     }
   }
 
-  public String getImageVersionId() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getImageVersionId() {
     return this.imageVersionId;
   }
 
-  public LectureWrite setImageVersionId(String imageVersionId) {
+  public LectureWrite setImageVersionId(@org.apache.thrift.annotation.Nullable java.lang.String imageVersionId) {
     this.imageVersionId = imageVersionId;
     return this;
   }
@@ -538,16 +513,16 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
   }
 
   public void unsetAutoUpdate() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __AUTOUPDATE_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __AUTOUPDATE_ISSET_ID);
   }
 
   /** Returns true if field autoUpdate is set (has been assigned a value) and false otherwise */
   public boolean isSetAutoUpdate() {
-    return EncodingUtils.testBit(__isset_bitfield, __AUTOUPDATE_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __AUTOUPDATE_ISSET_ID);
   }
 
   public void setAutoUpdateIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __AUTOUPDATE_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __AUTOUPDATE_ISSET_ID, value);
   }
 
   public boolean isIsEnabled() {
@@ -561,16 +536,16 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
   }
 
   public void unsetIsEnabled() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISENABLED_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ISENABLED_ISSET_ID);
   }
 
   /** Returns true if field isEnabled is set (has been assigned a value) and false otherwise */
   public boolean isSetIsEnabled() {
-    return EncodingUtils.testBit(__isset_bitfield, __ISENABLED_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ISENABLED_ISSET_ID);
   }
 
   public void setIsEnabledIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISENABLED_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ISENABLED_ISSET_ID, value);
   }
 
   public long getStartTime() {
@@ -584,16 +559,16 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
   }
 
   public void unsetStartTime() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __STARTTIME_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __STARTTIME_ISSET_ID);
   }
 
   /** Returns true if field startTime is set (has been assigned a value) and false otherwise */
   public boolean isSetStartTime() {
-    return EncodingUtils.testBit(__isset_bitfield, __STARTTIME_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __STARTTIME_ISSET_ID);
   }
 
   public void setStartTimeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __STARTTIME_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __STARTTIME_ISSET_ID, value);
   }
 
   public long getEndTime() {
@@ -607,23 +582,24 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
   }
 
   public void unsetEndTime() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ENDTIME_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ENDTIME_ISSET_ID);
   }
 
   /** Returns true if field endTime is set (has been assigned a value) and false otherwise */
   public boolean isSetEndTime() {
-    return EncodingUtils.testBit(__isset_bitfield, __ENDTIME_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ENDTIME_ISSET_ID);
   }
 
   public void setEndTimeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ENDTIME_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ENDTIME_ISSET_ID, value);
   }
 
-  public String getRunscript() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getRunscript() {
     return this.runscript;
   }
 
-  public LectureWrite setRunscript(String runscript) {
+  public LectureWrite setRunscript(@org.apache.thrift.annotation.Nullable java.lang.String runscript) {
     this.runscript = runscript;
     return this;
   }
@@ -647,22 +623,24 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
     return (this.nics == null) ? 0 : this.nics.size();
   }
 
-  public java.util.Iterator<String> getNicsIterator() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.Iterator<java.lang.String> getNicsIterator() {
     return (this.nics == null) ? null : this.nics.iterator();
   }
 
-  public void addToNics(String elem) {
+  public void addToNics(java.lang.String elem) {
     if (this.nics == null) {
-      this.nics = new ArrayList<String>();
+      this.nics = new java.util.ArrayList<java.lang.String>();
     }
     this.nics.add(elem);
   }
 
-  public List<String> getNics() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.List<java.lang.String> getNics() {
     return this.nics;
   }
 
-  public LectureWrite setNics(List<String> nics) {
+  public LectureWrite setNics(@org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> nics) {
     this.nics = nics;
     return this;
   }
@@ -686,22 +664,24 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
     return (this.networkExceptions == null) ? 0 : this.networkExceptions.size();
   }
 
+  @org.apache.thrift.annotation.Nullable
   public java.util.Iterator<NetRule> getNetworkExceptionsIterator() {
     return (this.networkExceptions == null) ? null : this.networkExceptions.iterator();
   }
 
   public void addToNetworkExceptions(NetRule elem) {
     if (this.networkExceptions == null) {
-      this.networkExceptions = new ArrayList<NetRule>();
+      this.networkExceptions = new java.util.ArrayList<NetRule>();
     }
     this.networkExceptions.add(elem);
   }
 
-  public List<NetRule> getNetworkExceptions() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.List<NetRule> getNetworkExceptions() {
     return this.networkExceptions;
   }
 
-  public LectureWrite setNetworkExceptions(List<NetRule> networkExceptions) {
+  public LectureWrite setNetworkExceptions(@org.apache.thrift.annotation.Nullable java.util.List<NetRule> networkExceptions) {
     this.networkExceptions = networkExceptions;
     return this;
   }
@@ -732,16 +712,16 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
   }
 
   public void unsetIsExam() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISEXAM_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ISEXAM_ISSET_ID);
   }
 
   /** Returns true if field isExam is set (has been assigned a value) and false otherwise */
   public boolean isSetIsExam() {
-    return EncodingUtils.testBit(__isset_bitfield, __ISEXAM_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ISEXAM_ISSET_ID);
   }
 
   public void setIsExamIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISEXAM_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ISEXAM_ISSET_ID, value);
   }
 
   public boolean isHasInternetAccess() {
@@ -755,23 +735,24 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
   }
 
   public void unsetHasInternetAccess() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __HASINTERNETACCESS_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __HASINTERNETACCESS_ISSET_ID);
   }
 
   /** Returns true if field hasInternetAccess is set (has been assigned a value) and false otherwise */
   public boolean isSetHasInternetAccess() {
-    return EncodingUtils.testBit(__isset_bitfield, __HASINTERNETACCESS_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __HASINTERNETACCESS_ISSET_ID);
   }
 
   public void setHasInternetAccessIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __HASINTERNETACCESS_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __HASINTERNETACCESS_ISSET_ID, value);
   }
 
+  @org.apache.thrift.annotation.Nullable
   public LecturePermissions getDefaultPermissions() {
     return this.defaultPermissions;
   }
 
-  public LectureWrite setDefaultPermissions(LecturePermissions defaultPermissions) {
+  public LectureWrite setDefaultPermissions(@org.apache.thrift.annotation.Nullable LecturePermissions defaultPermissions) {
     this.defaultPermissions = defaultPermissions;
     return this;
   }
@@ -795,22 +776,24 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
     return (this.addAllowedUsers == null) ? 0 : this.addAllowedUsers.size();
   }
 
-  public java.util.Iterator<String> getAddAllowedUsersIterator() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.Iterator<java.lang.String> getAddAllowedUsersIterator() {
     return (this.addAllowedUsers == null) ? null : this.addAllowedUsers.iterator();
   }
 
-  public void addToAddAllowedUsers(String elem) {
+  public void addToAddAllowedUsers(java.lang.String elem) {
     if (this.addAllowedUsers == null) {
-      this.addAllowedUsers = new ArrayList<String>();
+      this.addAllowedUsers = new java.util.ArrayList<java.lang.String>();
     }
     this.addAllowedUsers.add(elem);
   }
 
-  public List<String> getAddAllowedUsers() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.List<java.lang.String> getAddAllowedUsers() {
     return this.addAllowedUsers;
   }
 
-  public LectureWrite setAddAllowedUsers(List<String> addAllowedUsers) {
+  public LectureWrite setAddAllowedUsers(@org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> addAllowedUsers) {
     this.addAllowedUsers = addAllowedUsers;
     return this;
   }
@@ -834,22 +817,24 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
     return (this.remAllowedUsers == null) ? 0 : this.remAllowedUsers.size();
   }
 
-  public java.util.Iterator<String> getRemAllowedUsersIterator() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.Iterator<java.lang.String> getRemAllowedUsersIterator() {
     return (this.remAllowedUsers == null) ? null : this.remAllowedUsers.iterator();
   }
 
-  public void addToRemAllowedUsers(String elem) {
+  public void addToRemAllowedUsers(java.lang.String elem) {
     if (this.remAllowedUsers == null) {
-      this.remAllowedUsers = new ArrayList<String>();
+      this.remAllowedUsers = new java.util.ArrayList<java.lang.String>();
     }
     this.remAllowedUsers.add(elem);
   }
 
-  public List<String> getRemAllowedUsers() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.List<java.lang.String> getRemAllowedUsers() {
     return this.remAllowedUsers;
   }
 
-  public LectureWrite setRemAllowedUsers(List<String> remAllowedUsers) {
+  public LectureWrite setRemAllowedUsers(@org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> remAllowedUsers) {
     this.remAllowedUsers = remAllowedUsers;
     return this;
   }
@@ -873,22 +858,24 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
     return (this.locationIds == null) ? 0 : this.locationIds.size();
   }
 
-  public java.util.Iterator<Integer> getLocationIdsIterator() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.Iterator<java.lang.Integer> getLocationIdsIterator() {
     return (this.locationIds == null) ? null : this.locationIds.iterator();
   }
 
   public void addToLocationIds(int elem) {
     if (this.locationIds == null) {
-      this.locationIds = new ArrayList<Integer>();
+      this.locationIds = new java.util.ArrayList<java.lang.Integer>();
     }
     this.locationIds.add(elem);
   }
 
-  public List<Integer> getLocationIds() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.List<java.lang.Integer> getLocationIds() {
     return this.locationIds;
   }
 
-  public LectureWrite setLocationIds(List<Integer> locationIds) {
+  public LectureWrite setLocationIds(@org.apache.thrift.annotation.Nullable java.util.List<java.lang.Integer> locationIds) {
     this.locationIds = locationIds;
     return this;
   }
@@ -919,16 +906,16 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
   }
 
   public void unsetLimitToLocations() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __LIMITTOLOCATIONS_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __LIMITTOLOCATIONS_ISSET_ID);
   }
 
   /** Returns true if field limitToLocations is set (has been assigned a value) and false otherwise */
   public boolean isSetLimitToLocations() {
-    return EncodingUtils.testBit(__isset_bitfield, __LIMITTOLOCATIONS_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __LIMITTOLOCATIONS_ISSET_ID);
   }
 
   public void setLimitToLocationsIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __LIMITTOLOCATIONS_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __LIMITTOLOCATIONS_ISSET_ID, value);
   }
 
   public boolean isLimitToAllowedUsers() {
@@ -942,16 +929,16 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
   }
 
   public void unsetLimitToAllowedUsers() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __LIMITTOALLOWEDUSERS_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __LIMITTOALLOWEDUSERS_ISSET_ID);
   }
 
   /** Returns true if field limitToAllowedUsers is set (has been assigned a value) and false otherwise */
   public boolean isSetLimitToAllowedUsers() {
-    return EncodingUtils.testBit(__isset_bitfield, __LIMITTOALLOWEDUSERS_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __LIMITTOALLOWEDUSERS_ISSET_ID);
   }
 
   public void setLimitToAllowedUsersIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __LIMITTOALLOWEDUSERS_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __LIMITTOALLOWEDUSERS_ISSET_ID, value);
   }
 
   public boolean isHasUsbAccess() {
@@ -965,38 +952,40 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
   }
 
   public void unsetHasUsbAccess() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __HASUSBACCESS_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __HASUSBACCESS_ISSET_ID);
   }
 
   /** Returns true if field hasUsbAccess is set (has been assigned a value) and false otherwise */
   public boolean isSetHasUsbAccess() {
-    return EncodingUtils.testBit(__isset_bitfield, __HASUSBACCESS_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __HASUSBACCESS_ISSET_ID);
   }
 
   public void setHasUsbAccessIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __HASUSBACCESS_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __HASUSBACCESS_ISSET_ID, value);
   }
 
   public int getNetworkSharesSize() {
     return (this.networkShares == null) ? 0 : this.networkShares.size();
   }
 
+  @org.apache.thrift.annotation.Nullable
   public java.util.Iterator<NetShare> getNetworkSharesIterator() {
     return (this.networkShares == null) ? null : this.networkShares.iterator();
   }
 
   public void addToNetworkShares(NetShare elem) {
     if (this.networkShares == null) {
-      this.networkShares = new ArrayList<NetShare>();
+      this.networkShares = new java.util.ArrayList<NetShare>();
     }
     this.networkShares.add(elem);
   }
 
-  public List<NetShare> getNetworkShares() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.List<NetShare> getNetworkShares() {
     return this.networkShares;
   }
 
-  public LectureWrite setNetworkShares(List<NetShare> networkShares) {
+  public LectureWrite setNetworkShares(@org.apache.thrift.annotation.Nullable java.util.List<NetShare> networkShares) {
     this.networkShares = networkShares;
     return this;
   }
@@ -1020,22 +1009,24 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
     return (this.ldapFilters == null) ? 0 : this.ldapFilters.size();
   }
 
+  @org.apache.thrift.annotation.Nullable
   public java.util.Iterator<LdapFilter> getLdapFiltersIterator() {
     return (this.ldapFilters == null) ? null : this.ldapFilters.iterator();
   }
 
   public void addToLdapFilters(LdapFilter elem) {
     if (this.ldapFilters == null) {
-      this.ldapFilters = new ArrayList<LdapFilter>();
+      this.ldapFilters = new java.util.ArrayList<LdapFilter>();
     }
     this.ldapFilters.add(elem);
   }
 
-  public List<LdapFilter> getLdapFilters() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.List<LdapFilter> getLdapFilters() {
     return this.ldapFilters;
   }
 
-  public LectureWrite setLdapFilters(List<LdapFilter> ldapFilters) {
+  public LectureWrite setLdapFilters(@org.apache.thrift.annotation.Nullable java.util.List<LdapFilter> ldapFilters) {
     this.ldapFilters = ldapFilters;
     return this;
   }
@@ -1059,22 +1050,24 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
     return (this.presetScriptIds == null) ? 0 : this.presetScriptIds.size();
   }
 
-  public java.util.Iterator<Integer> getPresetScriptIdsIterator() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.Iterator<java.lang.Integer> getPresetScriptIdsIterator() {
     return (this.presetScriptIds == null) ? null : this.presetScriptIds.iterator();
   }
 
   public void addToPresetScriptIds(int elem) {
     if (this.presetScriptIds == null) {
-      this.presetScriptIds = new ArrayList<Integer>();
+      this.presetScriptIds = new java.util.ArrayList<java.lang.Integer>();
     }
     this.presetScriptIds.add(elem);
   }
 
-  public List<Integer> getPresetScriptIds() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.List<java.lang.Integer> getPresetScriptIds() {
     return this.presetScriptIds;
   }
 
-  public LectureWrite setPresetScriptIds(List<Integer> presetScriptIds) {
+  public LectureWrite setPresetScriptIds(@org.apache.thrift.annotation.Nullable java.util.List<java.lang.Integer> presetScriptIds) {
     this.presetScriptIds = presetScriptIds;
     return this;
   }
@@ -1098,22 +1091,24 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
     return (this.presetNetworkExceptionIds == null) ? 0 : this.presetNetworkExceptionIds.size();
   }
 
-  public java.util.Iterator<Integer> getPresetNetworkExceptionIdsIterator() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.Iterator<java.lang.Integer> getPresetNetworkExceptionIdsIterator() {
     return (this.presetNetworkExceptionIds == null) ? null : this.presetNetworkExceptionIds.iterator();
   }
 
   public void addToPresetNetworkExceptionIds(int elem) {
     if (this.presetNetworkExceptionIds == null) {
-      this.presetNetworkExceptionIds = new ArrayList<Integer>();
+      this.presetNetworkExceptionIds = new java.util.ArrayList<java.lang.Integer>();
     }
     this.presetNetworkExceptionIds.add(elem);
   }
 
-  public List<Integer> getPresetNetworkExceptionIds() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.List<java.lang.Integer> getPresetNetworkExceptionIds() {
     return this.presetNetworkExceptionIds;
   }
 
-  public LectureWrite setPresetNetworkExceptionIds(List<Integer> presetNetworkExceptionIds) {
+  public LectureWrite setPresetNetworkExceptionIds(@org.apache.thrift.annotation.Nullable java.util.List<java.lang.Integer> presetNetworkExceptionIds) {
     this.presetNetworkExceptionIds = presetNetworkExceptionIds;
     return this;
   }
@@ -1133,13 +1128,13 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case LECTURE_NAME:
       if (value == null) {
         unsetLectureName();
       } else {
-        setLectureName((String)value);
+        setLectureName((java.lang.String)value);
       }
       break;
 
@@ -1147,7 +1142,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
       if (value == null) {
         unsetDescription();
       } else {
-        setDescription((String)value);
+        setDescription((java.lang.String)value);
       }
       break;
 
@@ -1155,7 +1150,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
       if (value == null) {
         unsetImageVersionId();
       } else {
-        setImageVersionId((String)value);
+        setImageVersionId((java.lang.String)value);
       }
       break;
 
@@ -1163,7 +1158,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
       if (value == null) {
         unsetAutoUpdate();
       } else {
-        setAutoUpdate((Boolean)value);
+        setAutoUpdate((java.lang.Boolean)value);
       }
       break;
 
@@ -1171,7 +1166,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
       if (value == null) {
         unsetIsEnabled();
       } else {
-        setIsEnabled((Boolean)value);
+        setIsEnabled((java.lang.Boolean)value);
       }
       break;
 
@@ -1179,7 +1174,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
       if (value == null) {
         unsetStartTime();
       } else {
-        setStartTime((Long)value);
+        setStartTime((java.lang.Long)value);
       }
       break;
 
@@ -1187,7 +1182,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
       if (value == null) {
         unsetEndTime();
       } else {
-        setEndTime((Long)value);
+        setEndTime((java.lang.Long)value);
       }
       break;
 
@@ -1195,7 +1190,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
       if (value == null) {
         unsetRunscript();
       } else {
-        setRunscript((String)value);
+        setRunscript((java.lang.String)value);
       }
       break;
 
@@ -1203,7 +1198,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
       if (value == null) {
         unsetNics();
       } else {
-        setNics((List<String>)value);
+        setNics((java.util.List<java.lang.String>)value);
       }
       break;
 
@@ -1211,7 +1206,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
       if (value == null) {
         unsetNetworkExceptions();
       } else {
-        setNetworkExceptions((List<NetRule>)value);
+        setNetworkExceptions((java.util.List<NetRule>)value);
       }
       break;
 
@@ -1219,7 +1214,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
       if (value == null) {
         unsetIsExam();
       } else {
-        setIsExam((Boolean)value);
+        setIsExam((java.lang.Boolean)value);
       }
       break;
 
@@ -1227,7 +1222,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
       if (value == null) {
         unsetHasInternetAccess();
       } else {
-        setHasInternetAccess((Boolean)value);
+        setHasInternetAccess((java.lang.Boolean)value);
       }
       break;
 
@@ -1243,7 +1238,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
       if (value == null) {
         unsetAddAllowedUsers();
       } else {
-        setAddAllowedUsers((List<String>)value);
+        setAddAllowedUsers((java.util.List<java.lang.String>)value);
       }
       break;
 
@@ -1251,7 +1246,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
       if (value == null) {
         unsetRemAllowedUsers();
       } else {
-        setRemAllowedUsers((List<String>)value);
+        setRemAllowedUsers((java.util.List<java.lang.String>)value);
       }
       break;
 
@@ -1259,7 +1254,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
       if (value == null) {
         unsetLocationIds();
       } else {
-        setLocationIds((List<Integer>)value);
+        setLocationIds((java.util.List<java.lang.Integer>)value);
       }
       break;
 
@@ -1267,7 +1262,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
       if (value == null) {
         unsetLimitToLocations();
       } else {
-        setLimitToLocations((Boolean)value);
+        setLimitToLocations((java.lang.Boolean)value);
       }
       break;
 
@@ -1275,7 +1270,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
       if (value == null) {
         unsetLimitToAllowedUsers();
       } else {
-        setLimitToAllowedUsers((Boolean)value);
+        setLimitToAllowedUsers((java.lang.Boolean)value);
       }
       break;
 
@@ -1283,7 +1278,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
       if (value == null) {
         unsetHasUsbAccess();
       } else {
-        setHasUsbAccess((Boolean)value);
+        setHasUsbAccess((java.lang.Boolean)value);
       }
       break;
 
@@ -1291,7 +1286,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
       if (value == null) {
         unsetNetworkShares();
       } else {
-        setNetworkShares((List<NetShare>)value);
+        setNetworkShares((java.util.List<NetShare>)value);
       }
       break;
 
@@ -1299,7 +1294,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
       if (value == null) {
         unsetLdapFilters();
       } else {
-        setLdapFilters((List<LdapFilter>)value);
+        setLdapFilters((java.util.List<LdapFilter>)value);
       }
       break;
 
@@ -1307,7 +1302,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
       if (value == null) {
         unsetPresetScriptIds();
       } else {
-        setPresetScriptIds((List<Integer>)value);
+        setPresetScriptIds((java.util.List<java.lang.Integer>)value);
       }
       break;
 
@@ -1315,14 +1310,15 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
       if (value == null) {
         unsetPresetNetworkExceptionIds();
       } else {
-        setPresetNetworkExceptionIds((List<Integer>)value);
+        setPresetNetworkExceptionIds((java.util.List<java.lang.Integer>)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case LECTURE_NAME:
       return getLectureName();
@@ -1394,13 +1390,13 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
       return getPresetNetworkExceptionIds();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -1451,13 +1447,11 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
     case PRESET_NETWORK_EXCEPTION_IDS:
       return isSetPresetNetworkExceptionIds();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
+  public boolean equals(java.lang.Object that) {
     if (that instanceof LectureWrite)
       return this.equals((LectureWrite)that);
     return false;
@@ -1466,6 +1460,8 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
   public boolean equals(LectureWrite that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_lectureName = true && this.isSetLectureName();
     boolean that_present_lectureName = true && that.isSetLectureName();
@@ -1679,124 +1675,83 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_lectureName = true && (isSetLectureName());
-    list.add(present_lectureName);
-    if (present_lectureName)
-      list.add(lectureName);
-
-    boolean present_description = true && (isSetDescription());
-    list.add(present_description);
-    if (present_description)
-      list.add(description);
-
-    boolean present_imageVersionId = true && (isSetImageVersionId());
-    list.add(present_imageVersionId);
-    if (present_imageVersionId)
-      list.add(imageVersionId);
-
-    boolean present_autoUpdate = true;
-    list.add(present_autoUpdate);
-    if (present_autoUpdate)
-      list.add(autoUpdate);
-
-    boolean present_isEnabled = true;
-    list.add(present_isEnabled);
-    if (present_isEnabled)
-      list.add(isEnabled);
-
-    boolean present_startTime = true;
-    list.add(present_startTime);
-    if (present_startTime)
-      list.add(startTime);
-
-    boolean present_endTime = true;
-    list.add(present_endTime);
-    if (present_endTime)
-      list.add(endTime);
-
-    boolean present_runscript = true && (isSetRunscript());
-    list.add(present_runscript);
-    if (present_runscript)
-      list.add(runscript);
-
-    boolean present_nics = true && (isSetNics());
-    list.add(present_nics);
-    if (present_nics)
-      list.add(nics);
-
-    boolean present_networkExceptions = true && (isSetNetworkExceptions());
-    list.add(present_networkExceptions);
-    if (present_networkExceptions)
-      list.add(networkExceptions);
-
-    boolean present_isExam = true;
-    list.add(present_isExam);
-    if (present_isExam)
-      list.add(isExam);
-
-    boolean present_hasInternetAccess = true;
-    list.add(present_hasInternetAccess);
-    if (present_hasInternetAccess)
-      list.add(hasInternetAccess);
-
-    boolean present_defaultPermissions = true && (isSetDefaultPermissions());
-    list.add(present_defaultPermissions);
-    if (present_defaultPermissions)
-      list.add(defaultPermissions);
-
-    boolean present_addAllowedUsers = true && (isSetAddAllowedUsers());
-    list.add(present_addAllowedUsers);
-    if (present_addAllowedUsers)
-      list.add(addAllowedUsers);
-
-    boolean present_remAllowedUsers = true && (isSetRemAllowedUsers());
-    list.add(present_remAllowedUsers);
-    if (present_remAllowedUsers)
-      list.add(remAllowedUsers);
-
-    boolean present_locationIds = true && (isSetLocationIds());
-    list.add(present_locationIds);
-    if (present_locationIds)
-      list.add(locationIds);
-
-    boolean present_limitToLocations = true;
-    list.add(present_limitToLocations);
-    if (present_limitToLocations)
-      list.add(limitToLocations);
-
-    boolean present_limitToAllowedUsers = true;
-    list.add(present_limitToAllowedUsers);
-    if (present_limitToAllowedUsers)
-      list.add(limitToAllowedUsers);
-
-    boolean present_hasUsbAccess = true;
-    list.add(present_hasUsbAccess);
-    if (present_hasUsbAccess)
-      list.add(hasUsbAccess);
-
-    boolean present_networkShares = true && (isSetNetworkShares());
-    list.add(present_networkShares);
-    if (present_networkShares)
-      list.add(networkShares);
-
-    boolean present_ldapFilters = true && (isSetLdapFilters());
-    list.add(present_ldapFilters);
-    if (present_ldapFilters)
-      list.add(ldapFilters);
-
-    boolean present_presetScriptIds = true && (isSetPresetScriptIds());
-    list.add(present_presetScriptIds);
-    if (present_presetScriptIds)
-      list.add(presetScriptIds);
-
-    boolean present_presetNetworkExceptionIds = true && (isSetPresetNetworkExceptionIds());
-    list.add(present_presetNetworkExceptionIds);
-    if (present_presetNetworkExceptionIds)
-      list.add(presetNetworkExceptionIds);
-
-    return list.hashCode();
+    int hashCode = 1;
+
+    hashCode = hashCode * 8191 + ((isSetLectureName()) ? 131071 : 524287);
+    if (isSetLectureName())
+      hashCode = hashCode * 8191 + lectureName.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetDescription()) ? 131071 : 524287);
+    if (isSetDescription())
+      hashCode = hashCode * 8191 + description.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetImageVersionId()) ? 131071 : 524287);
+    if (isSetImageVersionId())
+      hashCode = hashCode * 8191 + imageVersionId.hashCode();
+
+    hashCode = hashCode * 8191 + ((autoUpdate) ? 131071 : 524287);
+
+    hashCode = hashCode * 8191 + ((isEnabled) ? 131071 : 524287);
+
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(startTime);
+
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(endTime);
+
+    hashCode = hashCode * 8191 + ((isSetRunscript()) ? 131071 : 524287);
+    if (isSetRunscript())
+      hashCode = hashCode * 8191 + runscript.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetNics()) ? 131071 : 524287);
+    if (isSetNics())
+      hashCode = hashCode * 8191 + nics.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetNetworkExceptions()) ? 131071 : 524287);
+    if (isSetNetworkExceptions())
+      hashCode = hashCode * 8191 + networkExceptions.hashCode();
+
+    hashCode = hashCode * 8191 + ((isExam) ? 131071 : 524287);
+
+    hashCode = hashCode * 8191 + ((hasInternetAccess) ? 131071 : 524287);
+
+    hashCode = hashCode * 8191 + ((isSetDefaultPermissions()) ? 131071 : 524287);
+    if (isSetDefaultPermissions())
+      hashCode = hashCode * 8191 + defaultPermissions.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetAddAllowedUsers()) ? 131071 : 524287);
+    if (isSetAddAllowedUsers())
+      hashCode = hashCode * 8191 + addAllowedUsers.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetRemAllowedUsers()) ? 131071 : 524287);
+    if (isSetRemAllowedUsers())
+      hashCode = hashCode * 8191 + remAllowedUsers.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetLocationIds()) ? 131071 : 524287);
+    if (isSetLocationIds())
+      hashCode = hashCode * 8191 + locationIds.hashCode();
+
+    hashCode = hashCode * 8191 + ((limitToLocations) ? 131071 : 524287);
+
+    hashCode = hashCode * 8191 + ((limitToAllowedUsers) ? 131071 : 524287);
+
+    hashCode = hashCode * 8191 + ((hasUsbAccess) ? 131071 : 524287);
+
+    hashCode = hashCode * 8191 + ((isSetNetworkShares()) ? 131071 : 524287);
+    if (isSetNetworkShares())
+      hashCode = hashCode * 8191 + networkShares.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetLdapFilters()) ? 131071 : 524287);
+    if (isSetLdapFilters())
+      hashCode = hashCode * 8191 + ldapFilters.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetPresetScriptIds()) ? 131071 : 524287);
+    if (isSetPresetScriptIds())
+      hashCode = hashCode * 8191 + presetScriptIds.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetPresetNetworkExceptionIds()) ? 131071 : 524287);
+    if (isSetPresetNetworkExceptionIds())
+      hashCode = hashCode * 8191 + presetNetworkExceptionIds.hashCode();
+
+    return hashCode;
   }
 
   @Override
@@ -1807,7 +1762,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetLectureName()).compareTo(other.isSetLectureName());
+    lastComparison = java.lang.Boolean.compare(isSetLectureName(), other.isSetLectureName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1817,7 +1772,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetDescription()).compareTo(other.isSetDescription());
+    lastComparison = java.lang.Boolean.compare(isSetDescription(), other.isSetDescription());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1827,7 +1782,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetImageVersionId()).compareTo(other.isSetImageVersionId());
+    lastComparison = java.lang.Boolean.compare(isSetImageVersionId(), other.isSetImageVersionId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1837,7 +1792,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetAutoUpdate()).compareTo(other.isSetAutoUpdate());
+    lastComparison = java.lang.Boolean.compare(isSetAutoUpdate(), other.isSetAutoUpdate());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1847,7 +1802,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetIsEnabled()).compareTo(other.isSetIsEnabled());
+    lastComparison = java.lang.Boolean.compare(isSetIsEnabled(), other.isSetIsEnabled());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1857,7 +1812,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetStartTime()).compareTo(other.isSetStartTime());
+    lastComparison = java.lang.Boolean.compare(isSetStartTime(), other.isSetStartTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1867,7 +1822,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetEndTime()).compareTo(other.isSetEndTime());
+    lastComparison = java.lang.Boolean.compare(isSetEndTime(), other.isSetEndTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1877,7 +1832,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetRunscript()).compareTo(other.isSetRunscript());
+    lastComparison = java.lang.Boolean.compare(isSetRunscript(), other.isSetRunscript());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1887,7 +1842,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetNics()).compareTo(other.isSetNics());
+    lastComparison = java.lang.Boolean.compare(isSetNics(), other.isSetNics());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1897,7 +1852,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetNetworkExceptions()).compareTo(other.isSetNetworkExceptions());
+    lastComparison = java.lang.Boolean.compare(isSetNetworkExceptions(), other.isSetNetworkExceptions());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1907,7 +1862,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetIsExam()).compareTo(other.isSetIsExam());
+    lastComparison = java.lang.Boolean.compare(isSetIsExam(), other.isSetIsExam());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1917,7 +1872,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetHasInternetAccess()).compareTo(other.isSetHasInternetAccess());
+    lastComparison = java.lang.Boolean.compare(isSetHasInternetAccess(), other.isSetHasInternetAccess());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1927,7 +1882,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetDefaultPermissions()).compareTo(other.isSetDefaultPermissions());
+    lastComparison = java.lang.Boolean.compare(isSetDefaultPermissions(), other.isSetDefaultPermissions());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1937,7 +1892,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetAddAllowedUsers()).compareTo(other.isSetAddAllowedUsers());
+    lastComparison = java.lang.Boolean.compare(isSetAddAllowedUsers(), other.isSetAddAllowedUsers());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1947,7 +1902,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetRemAllowedUsers()).compareTo(other.isSetRemAllowedUsers());
+    lastComparison = java.lang.Boolean.compare(isSetRemAllowedUsers(), other.isSetRemAllowedUsers());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1957,7 +1912,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetLocationIds()).compareTo(other.isSetLocationIds());
+    lastComparison = java.lang.Boolean.compare(isSetLocationIds(), other.isSetLocationIds());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1967,7 +1922,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetLimitToLocations()).compareTo(other.isSetLimitToLocations());
+    lastComparison = java.lang.Boolean.compare(isSetLimitToLocations(), other.isSetLimitToLocations());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1977,7 +1932,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetLimitToAllowedUsers()).compareTo(other.isSetLimitToAllowedUsers());
+    lastComparison = java.lang.Boolean.compare(isSetLimitToAllowedUsers(), other.isSetLimitToAllowedUsers());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1987,7 +1942,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetHasUsbAccess()).compareTo(other.isSetHasUsbAccess());
+    lastComparison = java.lang.Boolean.compare(isSetHasUsbAccess(), other.isSetHasUsbAccess());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1997,7 +1952,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetNetworkShares()).compareTo(other.isSetNetworkShares());
+    lastComparison = java.lang.Boolean.compare(isSetNetworkShares(), other.isSetNetworkShares());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -2007,7 +1962,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetLdapFilters()).compareTo(other.isSetLdapFilters());
+    lastComparison = java.lang.Boolean.compare(isSetLdapFilters(), other.isSetLdapFilters());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -2017,7 +1972,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetPresetScriptIds()).compareTo(other.isSetPresetScriptIds());
+    lastComparison = java.lang.Boolean.compare(isSetPresetScriptIds(), other.isSetPresetScriptIds());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -2027,7 +1982,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetPresetNetworkExceptionIds()).compareTo(other.isSetPresetNetworkExceptionIds());
+    lastComparison = java.lang.Boolean.compare(isSetPresetNetworkExceptionIds(), other.isSetPresetNetworkExceptionIds());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -2040,21 +1995,22 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
     return 0;
   }
 
+  @org.apache.thrift.annotation.Nullable
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("LectureWrite(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("LectureWrite(");
     boolean first = true;
 
     sb.append("lectureName:");
@@ -2238,7 +2194,7 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -2248,13 +2204,13 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
     }
   }
 
-  private static class LectureWriteStandardSchemeFactory implements SchemeFactory {
+  private static class LectureWriteStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public LectureWriteStandardScheme getScheme() {
       return new LectureWriteStandardScheme();
     }
   }
 
-  private static class LectureWriteStandardScheme extends StandardScheme<LectureWrite> {
+  private static class LectureWriteStandardScheme extends org.apache.thrift.scheme.StandardScheme<LectureWrite> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, LectureWrite struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -2333,13 +2289,13 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
           case 10: // NICS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list130 = iprot.readListBegin();
-                struct.nics = new ArrayList<String>(_list130.size);
-                String _elem131;
-                for (int _i132 = 0; _i132 < _list130.size; ++_i132)
+                org.apache.thrift.protocol.TList _list138 = iprot.readListBegin();
+                struct.nics = new java.util.ArrayList<java.lang.String>(_list138.size);
+                @org.apache.thrift.annotation.Nullable java.lang.String _elem139;
+                for (int _i140 = 0; _i140 < _list138.size; ++_i140)
                 {
-                  _elem131 = iprot.readString();
-                  struct.nics.add(_elem131);
+                  _elem139 = iprot.readString();
+                  struct.nics.add(_elem139);
                 }
                 iprot.readListEnd();
               }
@@ -2351,14 +2307,14 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
           case 12: // NETWORK_EXCEPTIONS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list133 = iprot.readListBegin();
-                struct.networkExceptions = new ArrayList<NetRule>(_list133.size);
-                NetRule _elem134;
-                for (int _i135 = 0; _i135 < _list133.size; ++_i135)
+                org.apache.thrift.protocol.TList _list141 = iprot.readListBegin();
+                struct.networkExceptions = new java.util.ArrayList<NetRule>(_list141.size);
+                @org.apache.thrift.annotation.Nullable NetRule _elem142;
+                for (int _i143 = 0; _i143 < _list141.size; ++_i143)
                 {
-                  _elem134 = new NetRule();
-                  _elem134.read(iprot);
-                  struct.networkExceptions.add(_elem134);
+                  _elem142 = new NetRule();
+                  _elem142.read(iprot);
+                  struct.networkExceptions.add(_elem142);
                 }
                 iprot.readListEnd();
               }
@@ -2395,13 +2351,13 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
           case 11: // ADD_ALLOWED_USERS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list136 = iprot.readListBegin();
-                struct.addAllowedUsers = new ArrayList<String>(_list136.size);
-                String _elem137;
-                for (int _i138 = 0; _i138 < _list136.size; ++_i138)
+                org.apache.thrift.protocol.TList _list144 = iprot.readListBegin();
+                struct.addAllowedUsers = new java.util.ArrayList<java.lang.String>(_list144.size);
+                @org.apache.thrift.annotation.Nullable java.lang.String _elem145;
+                for (int _i146 = 0; _i146 < _list144.size; ++_i146)
                 {
-                  _elem137 = iprot.readString();
-                  struct.addAllowedUsers.add(_elem137);
+                  _elem145 = iprot.readString();
+                  struct.addAllowedUsers.add(_elem145);
                 }
                 iprot.readListEnd();
               }
@@ -2413,13 +2369,13 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
           case 16: // REM_ALLOWED_USERS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list139 = iprot.readListBegin();
-                struct.remAllowedUsers = new ArrayList<String>(_list139.size);
-                String _elem140;
-                for (int _i141 = 0; _i141 < _list139.size; ++_i141)
+                org.apache.thrift.protocol.TList _list147 = iprot.readListBegin();
+                struct.remAllowedUsers = new java.util.ArrayList<java.lang.String>(_list147.size);
+                @org.apache.thrift.annotation.Nullable java.lang.String _elem148;
+                for (int _i149 = 0; _i149 < _list147.size; ++_i149)
                 {
-                  _elem140 = iprot.readString();
-                  struct.remAllowedUsers.add(_elem140);
+                  _elem148 = iprot.readString();
+                  struct.remAllowedUsers.add(_elem148);
                 }
                 iprot.readListEnd();
               }
@@ -2431,13 +2387,13 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
           case 17: // LOCATION_IDS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list142 = iprot.readListBegin();
-                struct.locationIds = new ArrayList<Integer>(_list142.size);
-                int _elem143;
-                for (int _i144 = 0; _i144 < _list142.size; ++_i144)
+                org.apache.thrift.protocol.TList _list150 = iprot.readListBegin();
+                struct.locationIds = new java.util.ArrayList<java.lang.Integer>(_list150.size);
+                int _elem151;
+                for (int _i152 = 0; _i152 < _list150.size; ++_i152)
                 {
-                  _elem143 = iprot.readI32();
-                  struct.locationIds.add(_elem143);
+                  _elem151 = iprot.readI32();
+                  struct.locationIds.add(_elem151);
                 }
                 iprot.readListEnd();
               }
@@ -2473,14 +2429,14 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
           case 21: // NETWORK_SHARES
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list145 = iprot.readListBegin();
-                struct.networkShares = new ArrayList<NetShare>(_list145.size);
-                NetShare _elem146;
-                for (int _i147 = 0; _i147 < _list145.size; ++_i147)
+                org.apache.thrift.protocol.TList _list153 = iprot.readListBegin();
+                struct.networkShares = new java.util.ArrayList<NetShare>(_list153.size);
+                @org.apache.thrift.annotation.Nullable NetShare _elem154;
+                for (int _i155 = 0; _i155 < _list153.size; ++_i155)
                 {
-                  _elem146 = new NetShare();
-                  _elem146.read(iprot);
-                  struct.networkShares.add(_elem146);
+                  _elem154 = new NetShare();
+                  _elem154.read(iprot);
+                  struct.networkShares.add(_elem154);
                 }
                 iprot.readListEnd();
               }
@@ -2492,14 +2448,14 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
           case 22: // LDAP_FILTERS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list148 = iprot.readListBegin();
-                struct.ldapFilters = new ArrayList<LdapFilter>(_list148.size);
-                LdapFilter _elem149;
-                for (int _i150 = 0; _i150 < _list148.size; ++_i150)
+                org.apache.thrift.protocol.TList _list156 = iprot.readListBegin();
+                struct.ldapFilters = new java.util.ArrayList<LdapFilter>(_list156.size);
+                @org.apache.thrift.annotation.Nullable LdapFilter _elem157;
+                for (int _i158 = 0; _i158 < _list156.size; ++_i158)
                 {
-                  _elem149 = new LdapFilter();
-                  _elem149.read(iprot);
-                  struct.ldapFilters.add(_elem149);
+                  _elem157 = new LdapFilter();
+                  _elem157.read(iprot);
+                  struct.ldapFilters.add(_elem157);
                 }
                 iprot.readListEnd();
               }
@@ -2511,13 +2467,13 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
           case 23: // PRESET_SCRIPT_IDS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list151 = iprot.readListBegin();
-                struct.presetScriptIds = new ArrayList<Integer>(_list151.size);
-                int _elem152;
-                for (int _i153 = 0; _i153 < _list151.size; ++_i153)
+                org.apache.thrift.protocol.TList _list159 = iprot.readListBegin();
+                struct.presetScriptIds = new java.util.ArrayList<java.lang.Integer>(_list159.size);
+                int _elem160;
+                for (int _i161 = 0; _i161 < _list159.size; ++_i161)
                 {
-                  _elem152 = iprot.readI32();
-                  struct.presetScriptIds.add(_elem152);
+                  _elem160 = iprot.readI32();
+                  struct.presetScriptIds.add(_elem160);
                 }
                 iprot.readListEnd();
               }
@@ -2529,13 +2485,13 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
           case 24: // PRESET_NETWORK_EXCEPTION_IDS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list154 = iprot.readListBegin();
-                struct.presetNetworkExceptionIds = new ArrayList<Integer>(_list154.size);
-                int _elem155;
-                for (int _i156 = 0; _i156 < _list154.size; ++_i156)
+                org.apache.thrift.protocol.TList _list162 = iprot.readListBegin();
+                struct.presetNetworkExceptionIds = new java.util.ArrayList<java.lang.Integer>(_list162.size);
+                int _elem163;
+                for (int _i164 = 0; _i164 < _list162.size; ++_i164)
                 {
-                  _elem155 = iprot.readI32();
-                  struct.presetNetworkExceptionIds.add(_elem155);
+                  _elem163 = iprot.readI32();
+                  struct.presetNetworkExceptionIds.add(_elem163);
                 }
                 iprot.readListEnd();
               }
@@ -2595,9 +2551,9 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
         oprot.writeFieldBegin(NICS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.nics.size()));
-          for (String _iter157 : struct.nics)
+          for (java.lang.String _iter165 : struct.nics)
           {
-            oprot.writeString(_iter157);
+            oprot.writeString(_iter165);
           }
           oprot.writeListEnd();
         }
@@ -2608,9 +2564,9 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
           oprot.writeFieldBegin(ADD_ALLOWED_USERS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.addAllowedUsers.size()));
-            for (String _iter158 : struct.addAllowedUsers)
+            for (java.lang.String _iter166 : struct.addAllowedUsers)
             {
-              oprot.writeString(_iter158);
+              oprot.writeString(_iter166);
             }
             oprot.writeListEnd();
           }
@@ -2622,9 +2578,9 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
           oprot.writeFieldBegin(NETWORK_EXCEPTIONS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.networkExceptions.size()));
-            for (NetRule _iter159 : struct.networkExceptions)
+            for (NetRule _iter167 : struct.networkExceptions)
             {
-              _iter159.write(oprot);
+              _iter167.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -2647,9 +2603,9 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
           oprot.writeFieldBegin(REM_ALLOWED_USERS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.remAllowedUsers.size()));
-            for (String _iter160 : struct.remAllowedUsers)
+            for (java.lang.String _iter168 : struct.remAllowedUsers)
             {
-              oprot.writeString(_iter160);
+              oprot.writeString(_iter168);
             }
             oprot.writeListEnd();
           }
@@ -2660,9 +2616,9 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
         oprot.writeFieldBegin(LOCATION_IDS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, struct.locationIds.size()));
-          for (int _iter161 : struct.locationIds)
+          for (int _iter169 : struct.locationIds)
           {
-            oprot.writeI32(_iter161);
+            oprot.writeI32(_iter169);
           }
           oprot.writeListEnd();
         }
@@ -2682,9 +2638,9 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
           oprot.writeFieldBegin(NETWORK_SHARES_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.networkShares.size()));
-            for (NetShare _iter162 : struct.networkShares)
+            for (NetShare _iter170 : struct.networkShares)
             {
-              _iter162.write(oprot);
+              _iter170.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -2696,9 +2652,9 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
           oprot.writeFieldBegin(LDAP_FILTERS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.ldapFilters.size()));
-            for (LdapFilter _iter163 : struct.ldapFilters)
+            for (LdapFilter _iter171 : struct.ldapFilters)
             {
-              _iter163.write(oprot);
+              _iter171.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -2710,9 +2666,9 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
           oprot.writeFieldBegin(PRESET_SCRIPT_IDS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, struct.presetScriptIds.size()));
-            for (int _iter164 : struct.presetScriptIds)
+            for (int _iter172 : struct.presetScriptIds)
             {
-              oprot.writeI32(_iter164);
+              oprot.writeI32(_iter172);
             }
             oprot.writeListEnd();
           }
@@ -2724,9 +2680,9 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
           oprot.writeFieldBegin(PRESET_NETWORK_EXCEPTION_IDS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, struct.presetNetworkExceptionIds.size()));
-            for (int _iter165 : struct.presetNetworkExceptionIds)
+            for (int _iter173 : struct.presetNetworkExceptionIds)
             {
-              oprot.writeI32(_iter165);
+              oprot.writeI32(_iter173);
             }
             oprot.writeListEnd();
           }
@@ -2739,18 +2695,18 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
 
   }
 
-  private static class LectureWriteTupleSchemeFactory implements SchemeFactory {
+  private static class LectureWriteTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public LectureWriteTupleScheme getScheme() {
       return new LectureWriteTupleScheme();
     }
   }
 
-  private static class LectureWriteTupleScheme extends TupleScheme<LectureWrite> {
+  private static class LectureWriteTupleScheme extends org.apache.thrift.scheme.TupleScheme<LectureWrite> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, LectureWrite struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetLectureName()) {
         optionals.set(0);
       }
@@ -2848,18 +2804,18 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
       if (struct.isSetNics()) {
         {
           oprot.writeI32(struct.nics.size());
-          for (String _iter166 : struct.nics)
+          for (java.lang.String _iter174 : struct.nics)
           {
-            oprot.writeString(_iter166);
+            oprot.writeString(_iter174);
           }
         }
       }
       if (struct.isSetNetworkExceptions()) {
         {
           oprot.writeI32(struct.networkExceptions.size());
-          for (NetRule _iter167 : struct.networkExceptions)
+          for (NetRule _iter175 : struct.networkExceptions)
           {
-            _iter167.write(oprot);
+            _iter175.write(oprot);
           }
         }
       }
@@ -2875,27 +2831,27 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
       if (struct.isSetAddAllowedUsers()) {
         {
           oprot.writeI32(struct.addAllowedUsers.size());
-          for (String _iter168 : struct.addAllowedUsers)
+          for (java.lang.String _iter176 : struct.addAllowedUsers)
           {
-            oprot.writeString(_iter168);
+            oprot.writeString(_iter176);
           }
         }
       }
       if (struct.isSetRemAllowedUsers()) {
         {
           oprot.writeI32(struct.remAllowedUsers.size());
-          for (String _iter169 : struct.remAllowedUsers)
+          for (java.lang.String _iter177 : struct.remAllowedUsers)
           {
-            oprot.writeString(_iter169);
+            oprot.writeString(_iter177);
           }
         }
       }
       if (struct.isSetLocationIds()) {
         {
           oprot.writeI32(struct.locationIds.size());
-          for (int _iter170 : struct.locationIds)
+          for (int _iter178 : struct.locationIds)
           {
-            oprot.writeI32(_iter170);
+            oprot.writeI32(_iter178);
           }
         }
       }
@@ -2911,36 +2867,36 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
       if (struct.isSetNetworkShares()) {
         {
           oprot.writeI32(struct.networkShares.size());
-          for (NetShare _iter171 : struct.networkShares)
+          for (NetShare _iter179 : struct.networkShares)
           {
-            _iter171.write(oprot);
+            _iter179.write(oprot);
           }
         }
       }
       if (struct.isSetLdapFilters()) {
         {
           oprot.writeI32(struct.ldapFilters.size());
-          for (LdapFilter _iter172 : struct.ldapFilters)
+          for (LdapFilter _iter180 : struct.ldapFilters)
           {
-            _iter172.write(oprot);
+            _iter180.write(oprot);
           }
         }
       }
       if (struct.isSetPresetScriptIds()) {
         {
           oprot.writeI32(struct.presetScriptIds.size());
-          for (int _iter173 : struct.presetScriptIds)
+          for (int _iter181 : struct.presetScriptIds)
           {
-            oprot.writeI32(_iter173);
+            oprot.writeI32(_iter181);
           }
         }
       }
       if (struct.isSetPresetNetworkExceptionIds()) {
         {
           oprot.writeI32(struct.presetNetworkExceptionIds.size());
-          for (int _iter174 : struct.presetNetworkExceptionIds)
+          for (int _iter182 : struct.presetNetworkExceptionIds)
           {
-            oprot.writeI32(_iter174);
+            oprot.writeI32(_iter182);
           }
         }
       }
@@ -2948,8 +2904,8 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, LectureWrite struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(23);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(23);
       if (incoming.get(0)) {
         struct.lectureName = iprot.readString();
         struct.setLectureNameIsSet(true);
@@ -2984,27 +2940,27 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
       }
       if (incoming.get(8)) {
         {
-          org.apache.thrift.protocol.TList _list175 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.nics = new ArrayList<String>(_list175.size);
-          String _elem176;
-          for (int _i177 = 0; _i177 < _list175.size; ++_i177)
+          org.apache.thrift.protocol.TList _list183 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+          struct.nics = new java.util.ArrayList<java.lang.String>(_list183.size);
+          @org.apache.thrift.annotation.Nullable java.lang.String _elem184;
+          for (int _i185 = 0; _i185 < _list183.size; ++_i185)
           {
-            _elem176 = iprot.readString();
-            struct.nics.add(_elem176);
+            _elem184 = iprot.readString();
+            struct.nics.add(_elem184);
           }
         }
         struct.setNicsIsSet(true);
       }
       if (incoming.get(9)) {
         {
-          org.apache.thrift.protocol.TList _list178 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.networkExceptions = new ArrayList<NetRule>(_list178.size);
-          NetRule _elem179;
-          for (int _i180 = 0; _i180 < _list178.size; ++_i180)
+          org.apache.thrift.protocol.TList _list186 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.networkExceptions = new java.util.ArrayList<NetRule>(_list186.size);
+          @org.apache.thrift.annotation.Nullable NetRule _elem187;
+          for (int _i188 = 0; _i188 < _list186.size; ++_i188)
           {
-            _elem179 = new NetRule();
-            _elem179.read(iprot);
-            struct.networkExceptions.add(_elem179);
+            _elem187 = new NetRule();
+            _elem187.read(iprot);
+            struct.networkExceptions.add(_elem187);
           }
         }
         struct.setNetworkExceptionsIsSet(true);
@@ -3024,39 +2980,39 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
       }
       if (incoming.get(13)) {
         {
-          org.apache.thrift.protocol.TList _list181 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.addAllowedUsers = new ArrayList<String>(_list181.size);
-          String _elem182;
-          for (int _i183 = 0; _i183 < _list181.size; ++_i183)
+          org.apache.thrift.protocol.TList _list189 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+          struct.addAllowedUsers = new java.util.ArrayList<java.lang.String>(_list189.size);
+          @org.apache.thrift.annotation.Nullable java.lang.String _elem190;
+          for (int _i191 = 0; _i191 < _list189.size; ++_i191)
           {
-            _elem182 = iprot.readString();
-            struct.addAllowedUsers.add(_elem182);
+            _elem190 = iprot.readString();
+            struct.addAllowedUsers.add(_elem190);
           }
         }
         struct.setAddAllowedUsersIsSet(true);
       }
       if (incoming.get(14)) {
         {
-          org.apache.thrift.protocol.TList _list184 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.remAllowedUsers = new ArrayList<String>(_list184.size);
-          String _elem185;
-          for (int _i186 = 0; _i186 < _list184.size; ++_i186)
+          org.apache.thrift.protocol.TList _list192 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+          struct.remAllowedUsers = new java.util.ArrayList<java.lang.String>(_list192.size);
+          @org.apache.thrift.annotation.Nullable java.lang.String _elem193;
+          for (int _i194 = 0; _i194 < _list192.size; ++_i194)
           {
-            _elem185 = iprot.readString();
-            struct.remAllowedUsers.add(_elem185);
+            _elem193 = iprot.readString();
+            struct.remAllowedUsers.add(_elem193);
           }
         }
         struct.setRemAllowedUsersIsSet(true);
       }
       if (incoming.get(15)) {
         {
-          org.apache.thrift.protocol.TList _list187 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32());
-          struct.locationIds = new ArrayList<Integer>(_list187.size);
-          int _elem188;
-          for (int _i189 = 0; _i189 < _list187.size; ++_i189)
+          org.apache.thrift.protocol.TList _list195 = iprot.readListBegin(org.apache.thrift.protocol.TType.I32);
+          struct.locationIds = new java.util.ArrayList<java.lang.Integer>(_list195.size);
+          int _elem196;
+          for (int _i197 = 0; _i197 < _list195.size; ++_i197)
           {
-            _elem188 = iprot.readI32();
-            struct.locationIds.add(_elem188);
+            _elem196 = iprot.readI32();
+            struct.locationIds.add(_elem196);
           }
         }
         struct.setLocationIdsIsSet(true);
@@ -3075,54 +3031,54 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
       }
       if (incoming.get(19)) {
         {
-          org.apache.thrift.protocol.TList _list190 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.networkShares = new ArrayList<NetShare>(_list190.size);
-          NetShare _elem191;
-          for (int _i192 = 0; _i192 < _list190.size; ++_i192)
+          org.apache.thrift.protocol.TList _list198 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.networkShares = new java.util.ArrayList<NetShare>(_list198.size);
+          @org.apache.thrift.annotation.Nullable NetShare _elem199;
+          for (int _i200 = 0; _i200 < _list198.size; ++_i200)
           {
-            _elem191 = new NetShare();
-            _elem191.read(iprot);
-            struct.networkShares.add(_elem191);
+            _elem199 = new NetShare();
+            _elem199.read(iprot);
+            struct.networkShares.add(_elem199);
           }
         }
         struct.setNetworkSharesIsSet(true);
       }
       if (incoming.get(20)) {
         {
-          org.apache.thrift.protocol.TList _list193 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.ldapFilters = new ArrayList<LdapFilter>(_list193.size);
-          LdapFilter _elem194;
-          for (int _i195 = 0; _i195 < _list193.size; ++_i195)
+          org.apache.thrift.protocol.TList _list201 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.ldapFilters = new java.util.ArrayList<LdapFilter>(_list201.size);
+          @org.apache.thrift.annotation.Nullable LdapFilter _elem202;
+          for (int _i203 = 0; _i203 < _list201.size; ++_i203)
           {
-            _elem194 = new LdapFilter();
-            _elem194.read(iprot);
-            struct.ldapFilters.add(_elem194);
+            _elem202 = new LdapFilter();
+            _elem202.read(iprot);
+            struct.ldapFilters.add(_elem202);
           }
         }
         struct.setLdapFiltersIsSet(true);
       }
       if (incoming.get(21)) {
         {
-          org.apache.thrift.protocol.TList _list196 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32());
-          struct.presetScriptIds = new ArrayList<Integer>(_list196.size);
-          int _elem197;
-          for (int _i198 = 0; _i198 < _list196.size; ++_i198)
+          org.apache.thrift.protocol.TList _list204 = iprot.readListBegin(org.apache.thrift.protocol.TType.I32);
+          struct.presetScriptIds = new java.util.ArrayList<java.lang.Integer>(_list204.size);
+          int _elem205;
+          for (int _i206 = 0; _i206 < _list204.size; ++_i206)
           {
-            _elem197 = iprot.readI32();
-            struct.presetScriptIds.add(_elem197);
+            _elem205 = iprot.readI32();
+            struct.presetScriptIds.add(_elem205);
           }
         }
         struct.setPresetScriptIdsIsSet(true);
       }
       if (incoming.get(22)) {
         {
-          org.apache.thrift.protocol.TList _list199 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32());
-          struct.presetNetworkExceptionIds = new ArrayList<Integer>(_list199.size);
-          int _elem200;
-          for (int _i201 = 0; _i201 < _list199.size; ++_i201)
+          org.apache.thrift.protocol.TList _list207 = iprot.readListBegin(org.apache.thrift.protocol.TType.I32);
+          struct.presetNetworkExceptionIds = new java.util.ArrayList<java.lang.Integer>(_list207.size);
+          int _elem208;
+          for (int _i209 = 0; _i209 < _list207.size; ++_i209)
           {
-            _elem200 = iprot.readI32();
-            struct.presetNetworkExceptionIds.add(_elem200);
+            _elem208 = iprot.readI32();
+            struct.presetNetworkExceptionIds.add(_elem208);
           }
         }
         struct.setPresetNetworkExceptionIdsIsSet(true);
@@ -3130,5 +3086,8 @@ public class LectureWrite implements org.apache.thrift.TBase<LectureWrite, Lectu
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/Location.java b/src/main/java/org/openslx/bwlp/thrift/iface/Location.java
index 005389b..1cf1117 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/Location.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/Location.java
@@ -1,40 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.openslx.bwlp.thrift.iface;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-18")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
 public class Location implements org.apache.thrift.TBase<Location, Location._Fields>, java.io.Serializable, Cloneable, Comparable<Location> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Location");
 
@@ -42,14 +15,11 @@ public class Location implements org.apache.thrift.TBase<Location, Location._Fie
   private static final org.apache.thrift.protocol.TField LOCATION_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("locationName", org.apache.thrift.protocol.TType.STRING, (short)2);
   private static final org.apache.thrift.protocol.TField PARENT_LOCATION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("parentLocationId", org.apache.thrift.protocol.TType.I32, (short)3);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new LocationStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new LocationTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new LocationStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new LocationTupleSchemeFactory();
 
   public int locationId; // required
-  public String locationName; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String locationName; // required
   public int parentLocationId; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@@ -58,10 +28,10 @@ public class Location implements org.apache.thrift.TBase<Location, Location._Fie
     LOCATION_NAME((short)2, "locationName"),
     PARENT_LOCATION_ID((short)3, "parentLocationId");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -69,6 +39,7 @@ public class Location implements org.apache.thrift.TBase<Location, Location._Fie
     /**
      * Find the _Fields constant that matches fieldId, or null if its not found.
      */
+    @org.apache.thrift.annotation.Nullable
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
         case 1: // LOCATION_ID
@@ -88,21 +59,22 @@ public class Location implements org.apache.thrift.TBase<Location, Location._Fie
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    @org.apache.thrift.annotation.Nullable
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -111,7 +83,7 @@ public class Location implements org.apache.thrift.TBase<Location, Location._Fie
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -120,16 +92,16 @@ public class Location implements org.apache.thrift.TBase<Location, Location._Fie
   private static final int __LOCATIONID_ISSET_ID = 0;
   private static final int __PARENTLOCATIONID_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.LOCATION_ID, new org.apache.thrift.meta_data.FieldMetaData("locationId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
     tmpMap.put(_Fields.LOCATION_NAME, new org.apache.thrift.meta_data.FieldMetaData("locationName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.PARENT_LOCATION_ID, new org.apache.thrift.meta_data.FieldMetaData("parentLocationId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Location.class, metaDataMap);
   }
 
@@ -138,7 +110,7 @@ public class Location implements org.apache.thrift.TBase<Location, Location._Fie
 
   public Location(
     int locationId,
-    String locationName,
+    java.lang.String locationName,
     int parentLocationId)
   {
     this();
@@ -185,23 +157,24 @@ public class Location implements org.apache.thrift.TBase<Location, Location._Fie
   }
 
   public void unsetLocationId() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __LOCATIONID_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __LOCATIONID_ISSET_ID);
   }
 
   /** Returns true if field locationId is set (has been assigned a value) and false otherwise */
   public boolean isSetLocationId() {
-    return EncodingUtils.testBit(__isset_bitfield, __LOCATIONID_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __LOCATIONID_ISSET_ID);
   }
 
   public void setLocationIdIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __LOCATIONID_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __LOCATIONID_ISSET_ID, value);
   }
 
-  public String getLocationName() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getLocationName() {
     return this.locationName;
   }
 
-  public Location setLocationName(String locationName) {
+  public Location setLocationName(@org.apache.thrift.annotation.Nullable java.lang.String locationName) {
     this.locationName = locationName;
     return this;
   }
@@ -232,25 +205,25 @@ public class Location implements org.apache.thrift.TBase<Location, Location._Fie
   }
 
   public void unsetParentLocationId() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __PARENTLOCATIONID_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __PARENTLOCATIONID_ISSET_ID);
   }
 
   /** Returns true if field parentLocationId is set (has been assigned a value) and false otherwise */
   public boolean isSetParentLocationId() {
-    return EncodingUtils.testBit(__isset_bitfield, __PARENTLOCATIONID_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __PARENTLOCATIONID_ISSET_ID);
   }
 
   public void setParentLocationIdIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __PARENTLOCATIONID_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __PARENTLOCATIONID_ISSET_ID, value);
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case LOCATION_ID:
       if (value == null) {
         unsetLocationId();
       } else {
-        setLocationId((Integer)value);
+        setLocationId((java.lang.Integer)value);
       }
       break;
 
@@ -258,7 +231,7 @@ public class Location implements org.apache.thrift.TBase<Location, Location._Fie
       if (value == null) {
         unsetLocationName();
       } else {
-        setLocationName((String)value);
+        setLocationName((java.lang.String)value);
       }
       break;
 
@@ -266,14 +239,15 @@ public class Location implements org.apache.thrift.TBase<Location, Location._Fie
       if (value == null) {
         unsetParentLocationId();
       } else {
-        setParentLocationId((Integer)value);
+        setParentLocationId((java.lang.Integer)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case LOCATION_ID:
       return getLocationId();
@@ -285,13 +259,13 @@ public class Location implements org.apache.thrift.TBase<Location, Location._Fie
       return getParentLocationId();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -302,13 +276,11 @@ public class Location implements org.apache.thrift.TBase<Location, Location._Fie
     case PARENT_LOCATION_ID:
       return isSetParentLocationId();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
+  public boolean equals(java.lang.Object that) {
     if (that instanceof Location)
       return this.equals((Location)that);
     return false;
@@ -317,6 +289,8 @@ public class Location implements org.apache.thrift.TBase<Location, Location._Fie
   public boolean equals(Location that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_locationId = true;
     boolean that_present_locationId = true;
@@ -350,24 +324,17 @@ public class Location implements org.apache.thrift.TBase<Location, Location._Fie
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_locationId = true;
-    list.add(present_locationId);
-    if (present_locationId)
-      list.add(locationId);
+    hashCode = hashCode * 8191 + locationId;
 
-    boolean present_locationName = true && (isSetLocationName());
-    list.add(present_locationName);
-    if (present_locationName)
-      list.add(locationName);
+    hashCode = hashCode * 8191 + ((isSetLocationName()) ? 131071 : 524287);
+    if (isSetLocationName())
+      hashCode = hashCode * 8191 + locationName.hashCode();
 
-    boolean present_parentLocationId = true;
-    list.add(present_parentLocationId);
-    if (present_parentLocationId)
-      list.add(parentLocationId);
+    hashCode = hashCode * 8191 + parentLocationId;
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -378,7 +345,7 @@ public class Location implements org.apache.thrift.TBase<Location, Location._Fie
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetLocationId()).compareTo(other.isSetLocationId());
+    lastComparison = java.lang.Boolean.compare(isSetLocationId(), other.isSetLocationId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -388,7 +355,7 @@ public class Location implements org.apache.thrift.TBase<Location, Location._Fie
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetLocationName()).compareTo(other.isSetLocationName());
+    lastComparison = java.lang.Boolean.compare(isSetLocationName(), other.isSetLocationName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -398,7 +365,7 @@ public class Location implements org.apache.thrift.TBase<Location, Location._Fie
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetParentLocationId()).compareTo(other.isSetParentLocationId());
+    lastComparison = java.lang.Boolean.compare(isSetParentLocationId(), other.isSetParentLocationId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -411,21 +378,22 @@ public class Location implements org.apache.thrift.TBase<Location, Location._Fie
     return 0;
   }
 
+  @org.apache.thrift.annotation.Nullable
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("Location(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("Location(");
     boolean first = true;
 
     sb.append("locationId:");
@@ -460,7 +428,7 @@ public class Location implements org.apache.thrift.TBase<Location, Location._Fie
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -470,13 +438,13 @@ public class Location implements org.apache.thrift.TBase<Location, Location._Fie
     }
   }
 
-  private static class LocationStandardSchemeFactory implements SchemeFactory {
+  private static class LocationStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public LocationStandardScheme getScheme() {
       return new LocationStandardScheme();
     }
   }
 
-  private static class LocationStandardScheme extends StandardScheme<Location> {
+  private static class LocationStandardScheme extends org.apache.thrift.scheme.StandardScheme<Location> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, Location struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -544,18 +512,18 @@ public class Location implements org.apache.thrift.TBase<Location, Location._Fie
 
   }
 
-  private static class LocationTupleSchemeFactory implements SchemeFactory {
+  private static class LocationTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public LocationTupleScheme getScheme() {
       return new LocationTupleScheme();
     }
   }
 
-  private static class LocationTupleScheme extends TupleScheme<Location> {
+  private static class LocationTupleScheme extends org.apache.thrift.scheme.TupleScheme<Location> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, Location struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetLocationId()) {
         optionals.set(0);
       }
@@ -579,8 +547,8 @@ public class Location implements org.apache.thrift.TBase<Location, Location._Fie
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, Location struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(3);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(3);
       if (incoming.get(0)) {
         struct.locationId = iprot.readI32();
         struct.setLocationIdIsSet(true);
@@ -596,5 +564,8 @@ public class Location implements org.apache.thrift.TBase<Location, Location._Fie
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/MasterServer.java b/src/main/java/org/openslx/bwlp/thrift/iface/MasterServer.java
index 4733419..8d97c8b 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/MasterServer.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/MasterServer.java
@@ -1,143 +1,116 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.openslx.bwlp.thrift.iface;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2017-09-06")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
 public class MasterServer {
 
   public interface Iface {
 
     public boolean ping() throws org.apache.thrift.TException;
 
-    public SessionData authenticate(String login, String password) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException;
+    public SessionData authenticate(java.lang.String login, java.lang.String password) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException;
 
-    public ClientSessionData localAccountLogin(String login, String password) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException;
+    public ClientSessionData localAccountLogin(java.lang.String login, java.lang.String password) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException;
 
-    public void setUsedSatellite(String sessionId, String satelliteName) throws org.apache.thrift.TException;
+    public void setUsedSatellite(java.lang.String sessionId, java.lang.String satelliteName) throws org.apache.thrift.TException;
 
-    public List<UserInfo> findUser(String sessionId, String organizationId, String searchTerm) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException;
+    public java.util.List<UserInfo> findUser(java.lang.String sessionId, java.lang.String organizationId, java.lang.String searchTerm) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException;
 
-    public List<ImageSummaryRead> getPublicImages(String sessionId, int page) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException;
+    public java.util.List<ImageSummaryRead> getPublicImages(java.lang.String sessionId, int page) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException;
 
-    public ImageDetailsRead getImageDetails(String sessionId, String imageBaseId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException;
+    public ImageDetailsRead getImageDetails(java.lang.String sessionId, java.lang.String imageBaseId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException;
 
-    public UserInfo getUser(String userToken, String userId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException;
+    public UserInfo getUser(java.lang.String userToken, java.lang.String userId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException;
 
-    public void invalidateSession(String sessionId) throws TInvalidTokenException, org.apache.thrift.TException;
+    public void invalidateSession(java.lang.String sessionId) throws TInvalidTokenException, org.apache.thrift.TException;
 
-    public UserInfo getUserFromToken(String token) throws TInvalidTokenException, org.apache.thrift.TException;
+    public UserInfo getUserFromToken(java.lang.String token) throws TInvalidTokenException, org.apache.thrift.TException;
 
-    public boolean isServerAuthenticated(String serverSessionId) throws org.apache.thrift.TException;
+    public boolean isServerAuthenticated(java.lang.String serverSessionId) throws org.apache.thrift.TException;
 
-    public ByteBuffer startServerAuthentication(int satelliteId) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException;
+    public java.nio.ByteBuffer startServerAuthentication(int satelliteId) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException;
 
-    public ServerSessionData serverAuthenticate(int satelliteId, ByteBuffer challengeResponse) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException;
+    public ServerSessionData serverAuthenticate(int satelliteId, java.nio.ByteBuffer challengeResponse) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException;
 
-    public ImagePublishData getImageData(String serverSessionId, String imageVersionId) throws TAuthorizationException, TInvocationException, TNotFoundException, org.apache.thrift.TException;
+    public ImagePublishData getImageData(java.lang.String serverSessionId, java.lang.String imageVersionId) throws TAuthorizationException, TInvocationException, TNotFoundException, org.apache.thrift.TException;
 
-    public TransferInformation submitImage(String userToken, ImagePublishData imageDescription, List<ByteBuffer> blockHashes) throws TAuthorizationException, TInvocationException, TTransferRejectedException, org.apache.thrift.TException;
+    public TransferInformation submitImage(java.lang.String userToken, ImagePublishData imageDescription, java.util.List<java.nio.ByteBuffer> blockHashes) throws TAuthorizationException, TInvocationException, TTransferRejectedException, org.apache.thrift.TException;
 
-    public int registerSatellite(String userToken, String displayName, List<String> addresses, String modulus, String exponent, ByteBuffer certsha256) throws TInvocationException, org.apache.thrift.TException;
+    public int registerSatellite(java.lang.String userToken, java.lang.String displayName, java.util.List<java.lang.String> addresses, java.lang.String modulus, java.lang.String exponent, java.nio.ByteBuffer certsha256) throws TInvocationException, org.apache.thrift.TException;
 
-    public boolean updateSatellite(String serverSessionId, String displayName, List<String> addresses) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException;
+    public boolean updateSatellite(java.lang.String serverSessionId, java.lang.String displayName, java.util.List<java.lang.String> addresses) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException;
 
-    public TransferInformation downloadImage(String sessionId, String imageVersionId) throws TAuthorizationException, TInvocationException, TNotFoundException, org.apache.thrift.TException;
+    public TransferInformation downloadImage(java.lang.String sessionId, java.lang.String imageVersionId) throws TAuthorizationException, TInvocationException, TNotFoundException, org.apache.thrift.TException;
 
-    public List<Organization> getOrganizations() throws TInvocationException, org.apache.thrift.TException;
+    public java.util.List<Organization> getOrganizations() throws TInvocationException, org.apache.thrift.TException;
 
-    public List<OperatingSystem> getOperatingSystems() throws TInvocationException, org.apache.thrift.TException;
+    public java.util.List<OperatingSystem> getOperatingSystems() throws TInvocationException, org.apache.thrift.TException;
 
-    public List<Virtualizer> getVirtualizers() throws TInvocationException, org.apache.thrift.TException;
+    public java.util.List<Virtualizer> getVirtualizers() throws TInvocationException, org.apache.thrift.TException;
 
-    public List<MasterTag> getTags(long startDate) throws TInvocationException, org.apache.thrift.TException;
+    public java.util.List<MasterTag> getTags(long startDate) throws TInvocationException, org.apache.thrift.TException;
 
-    public List<MasterSoftware> getSoftware(long startDate) throws TInvocationException, org.apache.thrift.TException;
+    public java.util.List<MasterSoftware> getSoftware(long startDate) throws TInvocationException, org.apache.thrift.TException;
 
-    public TransferStatus queryUploadStatus(String uploadToken) throws TInvalidTokenException, org.apache.thrift.TException;
+    public TransferStatus queryUploadStatus(java.lang.String uploadToken) throws TInvalidTokenException, org.apache.thrift.TException;
 
   }
 
   public interface AsyncIface {
 
-    public void ping(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void ping(org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException;
 
-    public void authenticate(String login, String password, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void authenticate(java.lang.String login, java.lang.String password, org.apache.thrift.async.AsyncMethodCallback<SessionData> resultHandler) throws org.apache.thrift.TException;
 
-    public void localAccountLogin(String login, String password, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void localAccountLogin(java.lang.String login, java.lang.String password, org.apache.thrift.async.AsyncMethodCallback<ClientSessionData> resultHandler) throws org.apache.thrift.TException;
 
-    public void setUsedSatellite(String sessionId, String satelliteName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void setUsedSatellite(java.lang.String sessionId, java.lang.String satelliteName, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
 
-    public void findUser(String sessionId, String organizationId, String searchTerm, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void findUser(java.lang.String sessionId, java.lang.String organizationId, java.lang.String searchTerm, org.apache.thrift.async.AsyncMethodCallback<java.util.List<UserInfo>> resultHandler) throws org.apache.thrift.TException;
 
-    public void getPublicImages(String sessionId, int page, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void getPublicImages(java.lang.String sessionId, int page, org.apache.thrift.async.AsyncMethodCallback<java.util.List<ImageSummaryRead>> resultHandler) throws org.apache.thrift.TException;
 
-    public void getImageDetails(String sessionId, String imageBaseId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void getImageDetails(java.lang.String sessionId, java.lang.String imageBaseId, org.apache.thrift.async.AsyncMethodCallback<ImageDetailsRead> resultHandler) throws org.apache.thrift.TException;
 
-    public void getUser(String userToken, String userId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void getUser(java.lang.String userToken, java.lang.String userId, org.apache.thrift.async.AsyncMethodCallback<UserInfo> resultHandler) throws org.apache.thrift.TException;
 
-    public void invalidateSession(String sessionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void invalidateSession(java.lang.String sessionId, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
 
-    public void getUserFromToken(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void getUserFromToken(java.lang.String token, org.apache.thrift.async.AsyncMethodCallback<UserInfo> resultHandler) throws org.apache.thrift.TException;
 
-    public void isServerAuthenticated(String serverSessionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void isServerAuthenticated(java.lang.String serverSessionId, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException;
 
-    public void startServerAuthentication(int satelliteId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void startServerAuthentication(int satelliteId, org.apache.thrift.async.AsyncMethodCallback<java.nio.ByteBuffer> resultHandler) throws org.apache.thrift.TException;
 
-    public void serverAuthenticate(int satelliteId, ByteBuffer challengeResponse, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void serverAuthenticate(int satelliteId, java.nio.ByteBuffer challengeResponse, org.apache.thrift.async.AsyncMethodCallback<ServerSessionData> resultHandler) throws org.apache.thrift.TException;
 
-    public void getImageData(String serverSessionId, String imageVersionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void getImageData(java.lang.String serverSessionId, java.lang.String imageVersionId, org.apache.thrift.async.AsyncMethodCallback<ImagePublishData> resultHandler) throws org.apache.thrift.TException;
 
-    public void submitImage(String userToken, ImagePublishData imageDescription, List<ByteBuffer> blockHashes, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void submitImage(java.lang.String userToken, ImagePublishData imageDescription, java.util.List<java.nio.ByteBuffer> blockHashes, org.apache.thrift.async.AsyncMethodCallback<TransferInformation> resultHandler) throws org.apache.thrift.TException;
 
-    public void registerSatellite(String userToken, String displayName, List<String> addresses, String modulus, String exponent, ByteBuffer certsha256, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void registerSatellite(java.lang.String userToken, java.lang.String displayName, java.util.List<java.lang.String> addresses, java.lang.String modulus, java.lang.String exponent, java.nio.ByteBuffer certsha256, org.apache.thrift.async.AsyncMethodCallback<java.lang.Integer> resultHandler) throws org.apache.thrift.TException;
 
-    public void updateSatellite(String serverSessionId, String displayName, List<String> addresses, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void updateSatellite(java.lang.String serverSessionId, java.lang.String displayName, java.util.List<java.lang.String> addresses, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException;
 
-    public void downloadImage(String sessionId, String imageVersionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void downloadImage(java.lang.String sessionId, java.lang.String imageVersionId, org.apache.thrift.async.AsyncMethodCallback<TransferInformation> resultHandler) throws org.apache.thrift.TException;
 
-    public void getOrganizations(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void getOrganizations(org.apache.thrift.async.AsyncMethodCallback<java.util.List<Organization>> resultHandler) throws org.apache.thrift.TException;
 
-    public void getOperatingSystems(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void getOperatingSystems(org.apache.thrift.async.AsyncMethodCallback<java.util.List<OperatingSystem>> resultHandler) throws org.apache.thrift.TException;
 
-    public void getVirtualizers(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void getVirtualizers(org.apache.thrift.async.AsyncMethodCallback<java.util.List<Virtualizer>> resultHandler) throws org.apache.thrift.TException;
 
-    public void getTags(long startDate, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void getTags(long startDate, org.apache.thrift.async.AsyncMethodCallback<java.util.List<MasterTag>> resultHandler) throws org.apache.thrift.TException;
 
-    public void getSoftware(long startDate, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void getSoftware(long startDate, org.apache.thrift.async.AsyncMethodCallback<java.util.List<MasterSoftware>> resultHandler) throws org.apache.thrift.TException;
 
-    public void queryUploadStatus(String uploadToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void queryUploadStatus(java.lang.String uploadToken, org.apache.thrift.async.AsyncMethodCallback<TransferStatus> resultHandler) throws org.apache.thrift.TException;
 
   }
 
@@ -183,13 +156,13 @@ public class MasterServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "ping failed: unknown result");
     }
 
-    public SessionData authenticate(String login, String password) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException
+    public SessionData authenticate(java.lang.String login, java.lang.String password) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException
     {
       send_authenticate(login, password);
       return recv_authenticate();
     }
 
-    public void send_authenticate(String login, String password) throws org.apache.thrift.TException
+    public void send_authenticate(java.lang.String login, java.lang.String password) throws org.apache.thrift.TException
     {
       authenticate_args args = new authenticate_args();
       args.setLogin(login);
@@ -213,13 +186,13 @@ public class MasterServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "authenticate failed: unknown result");
     }
 
-    public ClientSessionData localAccountLogin(String login, String password) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException
+    public ClientSessionData localAccountLogin(java.lang.String login, java.lang.String password) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException
     {
       send_localAccountLogin(login, password);
       return recv_localAccountLogin();
     }
 
-    public void send_localAccountLogin(String login, String password) throws org.apache.thrift.TException
+    public void send_localAccountLogin(java.lang.String login, java.lang.String password) throws org.apache.thrift.TException
     {
       localAccountLogin_args args = new localAccountLogin_args();
       args.setLogin(login);
@@ -243,13 +216,13 @@ public class MasterServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "localAccountLogin failed: unknown result");
     }
 
-    public void setUsedSatellite(String sessionId, String satelliteName) throws org.apache.thrift.TException
+    public void setUsedSatellite(java.lang.String sessionId, java.lang.String satelliteName) throws org.apache.thrift.TException
     {
       send_setUsedSatellite(sessionId, satelliteName);
       recv_setUsedSatellite();
     }
 
-    public void send_setUsedSatellite(String sessionId, String satelliteName) throws org.apache.thrift.TException
+    public void send_setUsedSatellite(java.lang.String sessionId, java.lang.String satelliteName) throws org.apache.thrift.TException
     {
       setUsedSatellite_args args = new setUsedSatellite_args();
       args.setSessionId(sessionId);
@@ -264,13 +237,13 @@ public class MasterServer {
       return;
     }
 
-    public List<UserInfo> findUser(String sessionId, String organizationId, String searchTerm) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException
+    public java.util.List<UserInfo> findUser(java.lang.String sessionId, java.lang.String organizationId, java.lang.String searchTerm) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException
     {
       send_findUser(sessionId, organizationId, searchTerm);
       return recv_findUser();
     }
 
-    public void send_findUser(String sessionId, String organizationId, String searchTerm) throws org.apache.thrift.TException
+    public void send_findUser(java.lang.String sessionId, java.lang.String organizationId, java.lang.String searchTerm) throws org.apache.thrift.TException
     {
       findUser_args args = new findUser_args();
       args.setSessionId(sessionId);
@@ -279,7 +252,7 @@ public class MasterServer {
       sendBase("findUser", args);
     }
 
-    public List<UserInfo> recv_findUser() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException
+    public java.util.List<UserInfo> recv_findUser() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException
     {
       findUser_result result = new findUser_result();
       receiveBase(result, "findUser");
@@ -295,13 +268,13 @@ public class MasterServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "findUser failed: unknown result");
     }
 
-    public List<ImageSummaryRead> getPublicImages(String sessionId, int page) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException
+    public java.util.List<ImageSummaryRead> getPublicImages(java.lang.String sessionId, int page) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException
     {
       send_getPublicImages(sessionId, page);
       return recv_getPublicImages();
     }
 
-    public void send_getPublicImages(String sessionId, int page) throws org.apache.thrift.TException
+    public void send_getPublicImages(java.lang.String sessionId, int page) throws org.apache.thrift.TException
     {
       getPublicImages_args args = new getPublicImages_args();
       args.setSessionId(sessionId);
@@ -309,7 +282,7 @@ public class MasterServer {
       sendBase("getPublicImages", args);
     }
 
-    public List<ImageSummaryRead> recv_getPublicImages() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException
+    public java.util.List<ImageSummaryRead> recv_getPublicImages() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException
     {
       getPublicImages_result result = new getPublicImages_result();
       receiveBase(result, "getPublicImages");
@@ -325,13 +298,13 @@ public class MasterServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getPublicImages failed: unknown result");
     }
 
-    public ImageDetailsRead getImageDetails(String sessionId, String imageBaseId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException
+    public ImageDetailsRead getImageDetails(java.lang.String sessionId, java.lang.String imageBaseId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException
     {
       send_getImageDetails(sessionId, imageBaseId);
       return recv_getImageDetails();
     }
 
-    public void send_getImageDetails(String sessionId, String imageBaseId) throws org.apache.thrift.TException
+    public void send_getImageDetails(java.lang.String sessionId, java.lang.String imageBaseId) throws org.apache.thrift.TException
     {
       getImageDetails_args args = new getImageDetails_args();
       args.setSessionId(sessionId);
@@ -358,13 +331,13 @@ public class MasterServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getImageDetails failed: unknown result");
     }
 
-    public UserInfo getUser(String userToken, String userId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException
+    public UserInfo getUser(java.lang.String userToken, java.lang.String userId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException
     {
       send_getUser(userToken, userId);
       return recv_getUser();
     }
 
-    public void send_getUser(String userToken, String userId) throws org.apache.thrift.TException
+    public void send_getUser(java.lang.String userToken, java.lang.String userId) throws org.apache.thrift.TException
     {
       getUser_args args = new getUser_args();
       args.setUserToken(userToken);
@@ -391,13 +364,13 @@ public class MasterServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getUser failed: unknown result");
     }
 
-    public void invalidateSession(String sessionId) throws TInvalidTokenException, org.apache.thrift.TException
+    public void invalidateSession(java.lang.String sessionId) throws TInvalidTokenException, org.apache.thrift.TException
     {
       send_invalidateSession(sessionId);
       recv_invalidateSession();
     }
 
-    public void send_invalidateSession(String sessionId) throws org.apache.thrift.TException
+    public void send_invalidateSession(java.lang.String sessionId) throws org.apache.thrift.TException
     {
       invalidateSession_args args = new invalidateSession_args();
       args.setSessionId(sessionId);
@@ -414,13 +387,13 @@ public class MasterServer {
       return;
     }
 
-    public UserInfo getUserFromToken(String token) throws TInvalidTokenException, org.apache.thrift.TException
+    public UserInfo getUserFromToken(java.lang.String token) throws TInvalidTokenException, org.apache.thrift.TException
     {
       send_getUserFromToken(token);
       return recv_getUserFromToken();
     }
 
-    public void send_getUserFromToken(String token) throws org.apache.thrift.TException
+    public void send_getUserFromToken(java.lang.String token) throws org.apache.thrift.TException
     {
       getUserFromToken_args args = new getUserFromToken_args();
       args.setToken(token);
@@ -440,13 +413,13 @@ public class MasterServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getUserFromToken failed: unknown result");
     }
 
-    public boolean isServerAuthenticated(String serverSessionId) throws org.apache.thrift.TException
+    public boolean isServerAuthenticated(java.lang.String serverSessionId) throws org.apache.thrift.TException
     {
       send_isServerAuthenticated(serverSessionId);
       return recv_isServerAuthenticated();
     }
 
-    public void send_isServerAuthenticated(String serverSessionId) throws org.apache.thrift.TException
+    public void send_isServerAuthenticated(java.lang.String serverSessionId) throws org.apache.thrift.TException
     {
       isServerAuthenticated_args args = new isServerAuthenticated_args();
       args.setServerSessionId(serverSessionId);
@@ -463,7 +436,7 @@ public class MasterServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "isServerAuthenticated failed: unknown result");
     }
 
-    public ByteBuffer startServerAuthentication(int satelliteId) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException
+    public java.nio.ByteBuffer startServerAuthentication(int satelliteId) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException
     {
       send_startServerAuthentication(satelliteId);
       return recv_startServerAuthentication();
@@ -476,7 +449,7 @@ public class MasterServer {
       sendBase("startServerAuthentication", args);
     }
 
-    public ByteBuffer recv_startServerAuthentication() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException
+    public java.nio.ByteBuffer recv_startServerAuthentication() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException
     {
       startServerAuthentication_result result = new startServerAuthentication_result();
       receiveBase(result, "startServerAuthentication");
@@ -492,13 +465,13 @@ public class MasterServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "startServerAuthentication failed: unknown result");
     }
 
-    public ServerSessionData serverAuthenticate(int satelliteId, ByteBuffer challengeResponse) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException
+    public ServerSessionData serverAuthenticate(int satelliteId, java.nio.ByteBuffer challengeResponse) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException
     {
       send_serverAuthenticate(satelliteId, challengeResponse);
       return recv_serverAuthenticate();
     }
 
-    public void send_serverAuthenticate(int satelliteId, ByteBuffer challengeResponse) throws org.apache.thrift.TException
+    public void send_serverAuthenticate(int satelliteId, java.nio.ByteBuffer challengeResponse) throws org.apache.thrift.TException
     {
       serverAuthenticate_args args = new serverAuthenticate_args();
       args.setSatelliteId(satelliteId);
@@ -522,13 +495,13 @@ public class MasterServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "serverAuthenticate failed: unknown result");
     }
 
-    public ImagePublishData getImageData(String serverSessionId, String imageVersionId) throws TAuthorizationException, TInvocationException, TNotFoundException, org.apache.thrift.TException
+    public ImagePublishData getImageData(java.lang.String serverSessionId, java.lang.String imageVersionId) throws TAuthorizationException, TInvocationException, TNotFoundException, org.apache.thrift.TException
     {
       send_getImageData(serverSessionId, imageVersionId);
       return recv_getImageData();
     }
 
-    public void send_getImageData(String serverSessionId, String imageVersionId) throws org.apache.thrift.TException
+    public void send_getImageData(java.lang.String serverSessionId, java.lang.String imageVersionId) throws org.apache.thrift.TException
     {
       getImageData_args args = new getImageData_args();
       args.setServerSessionId(serverSessionId);
@@ -555,13 +528,13 @@ public class MasterServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getImageData failed: unknown result");
     }
 
-    public TransferInformation submitImage(String userToken, ImagePublishData imageDescription, List<ByteBuffer> blockHashes) throws TAuthorizationException, TInvocationException, TTransferRejectedException, org.apache.thrift.TException
+    public TransferInformation submitImage(java.lang.String userToken, ImagePublishData imageDescription, java.util.List<java.nio.ByteBuffer> blockHashes) throws TAuthorizationException, TInvocationException, TTransferRejectedException, org.apache.thrift.TException
     {
       send_submitImage(userToken, imageDescription, blockHashes);
       return recv_submitImage();
     }
 
-    public void send_submitImage(String userToken, ImagePublishData imageDescription, List<ByteBuffer> blockHashes) throws org.apache.thrift.TException
+    public void send_submitImage(java.lang.String userToken, ImagePublishData imageDescription, java.util.List<java.nio.ByteBuffer> blockHashes) throws org.apache.thrift.TException
     {
       submitImage_args args = new submitImage_args();
       args.setUserToken(userToken);
@@ -589,13 +562,13 @@ public class MasterServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "submitImage failed: unknown result");
     }
 
-    public int registerSatellite(String userToken, String displayName, List<String> addresses, String modulus, String exponent, ByteBuffer certsha256) throws TInvocationException, org.apache.thrift.TException
+    public int registerSatellite(java.lang.String userToken, java.lang.String displayName, java.util.List<java.lang.String> addresses, java.lang.String modulus, java.lang.String exponent, java.nio.ByteBuffer certsha256) throws TInvocationException, org.apache.thrift.TException
     {
       send_registerSatellite(userToken, displayName, addresses, modulus, exponent, certsha256);
       return recv_registerSatellite();
     }
 
-    public void send_registerSatellite(String userToken, String displayName, List<String> addresses, String modulus, String exponent, ByteBuffer certsha256) throws org.apache.thrift.TException
+    public void send_registerSatellite(java.lang.String userToken, java.lang.String displayName, java.util.List<java.lang.String> addresses, java.lang.String modulus, java.lang.String exponent, java.nio.ByteBuffer certsha256) throws org.apache.thrift.TException
     {
       registerSatellite_args args = new registerSatellite_args();
       args.setUserToken(userToken);
@@ -620,13 +593,13 @@ public class MasterServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "registerSatellite failed: unknown result");
     }
 
-    public boolean updateSatellite(String serverSessionId, String displayName, List<String> addresses) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException
+    public boolean updateSatellite(java.lang.String serverSessionId, java.lang.String displayName, java.util.List<java.lang.String> addresses) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException
     {
       send_updateSatellite(serverSessionId, displayName, addresses);
       return recv_updateSatellite();
     }
 
-    public void send_updateSatellite(String serverSessionId, String displayName, List<String> addresses) throws org.apache.thrift.TException
+    public void send_updateSatellite(java.lang.String serverSessionId, java.lang.String displayName, java.util.List<java.lang.String> addresses) throws org.apache.thrift.TException
     {
       updateSatellite_args args = new updateSatellite_args();
       args.setServerSessionId(serverSessionId);
@@ -651,13 +624,13 @@ public class MasterServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "updateSatellite failed: unknown result");
     }
 
-    public TransferInformation downloadImage(String sessionId, String imageVersionId) throws TAuthorizationException, TInvocationException, TNotFoundException, org.apache.thrift.TException
+    public TransferInformation downloadImage(java.lang.String sessionId, java.lang.String imageVersionId) throws TAuthorizationException, TInvocationException, TNotFoundException, org.apache.thrift.TException
     {
       send_downloadImage(sessionId, imageVersionId);
       return recv_downloadImage();
     }
 
-    public void send_downloadImage(String sessionId, String imageVersionId) throws org.apache.thrift.TException
+    public void send_downloadImage(java.lang.String sessionId, java.lang.String imageVersionId) throws org.apache.thrift.TException
     {
       downloadImage_args args = new downloadImage_args();
       args.setSessionId(sessionId);
@@ -684,7 +657,7 @@ public class MasterServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "downloadImage failed: unknown result");
     }
 
-    public List<Organization> getOrganizations() throws TInvocationException, org.apache.thrift.TException
+    public java.util.List<Organization> getOrganizations() throws TInvocationException, org.apache.thrift.TException
     {
       send_getOrganizations();
       return recv_getOrganizations();
@@ -696,7 +669,7 @@ public class MasterServer {
       sendBase("getOrganizations", args);
     }
 
-    public List<Organization> recv_getOrganizations() throws TInvocationException, org.apache.thrift.TException
+    public java.util.List<Organization> recv_getOrganizations() throws TInvocationException, org.apache.thrift.TException
     {
       getOrganizations_result result = new getOrganizations_result();
       receiveBase(result, "getOrganizations");
@@ -709,7 +682,7 @@ public class MasterServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getOrganizations failed: unknown result");
     }
 
-    public List<OperatingSystem> getOperatingSystems() throws TInvocationException, org.apache.thrift.TException
+    public java.util.List<OperatingSystem> getOperatingSystems() throws TInvocationException, org.apache.thrift.TException
     {
       send_getOperatingSystems();
       return recv_getOperatingSystems();
@@ -721,7 +694,7 @@ public class MasterServer {
       sendBase("getOperatingSystems", args);
     }
 
-    public List<OperatingSystem> recv_getOperatingSystems() throws TInvocationException, org.apache.thrift.TException
+    public java.util.List<OperatingSystem> recv_getOperatingSystems() throws TInvocationException, org.apache.thrift.TException
     {
       getOperatingSystems_result result = new getOperatingSystems_result();
       receiveBase(result, "getOperatingSystems");
@@ -734,7 +707,7 @@ public class MasterServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getOperatingSystems failed: unknown result");
     }
 
-    public List<Virtualizer> getVirtualizers() throws TInvocationException, org.apache.thrift.TException
+    public java.util.List<Virtualizer> getVirtualizers() throws TInvocationException, org.apache.thrift.TException
     {
       send_getVirtualizers();
       return recv_getVirtualizers();
@@ -746,7 +719,7 @@ public class MasterServer {
       sendBase("getVirtualizers", args);
     }
 
-    public List<Virtualizer> recv_getVirtualizers() throws TInvocationException, org.apache.thrift.TException
+    public java.util.List<Virtualizer> recv_getVirtualizers() throws TInvocationException, org.apache.thrift.TException
     {
       getVirtualizers_result result = new getVirtualizers_result();
       receiveBase(result, "getVirtualizers");
@@ -759,7 +732,7 @@ public class MasterServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getVirtualizers failed: unknown result");
     }
 
-    public List<MasterTag> getTags(long startDate) throws TInvocationException, org.apache.thrift.TException
+    public java.util.List<MasterTag> getTags(long startDate) throws TInvocationException, org.apache.thrift.TException
     {
       send_getTags(startDate);
       return recv_getTags();
@@ -772,7 +745,7 @@ public class MasterServer {
       sendBase("getTags", args);
     }
 
-    public List<MasterTag> recv_getTags() throws TInvocationException, org.apache.thrift.TException
+    public java.util.List<MasterTag> recv_getTags() throws TInvocationException, org.apache.thrift.TException
     {
       getTags_result result = new getTags_result();
       receiveBase(result, "getTags");
@@ -785,7 +758,7 @@ public class MasterServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getTags failed: unknown result");
     }
 
-    public List<MasterSoftware> getSoftware(long startDate) throws TInvocationException, org.apache.thrift.TException
+    public java.util.List<MasterSoftware> getSoftware(long startDate) throws TInvocationException, org.apache.thrift.TException
     {
       send_getSoftware(startDate);
       return recv_getSoftware();
@@ -798,7 +771,7 @@ public class MasterServer {
       sendBase("getSoftware", args);
     }
 
-    public List<MasterSoftware> recv_getSoftware() throws TInvocationException, org.apache.thrift.TException
+    public java.util.List<MasterSoftware> recv_getSoftware() throws TInvocationException, org.apache.thrift.TException
     {
       getSoftware_result result = new getSoftware_result();
       receiveBase(result, "getSoftware");
@@ -811,13 +784,13 @@ public class MasterServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getSoftware failed: unknown result");
     }
 
-    public TransferStatus queryUploadStatus(String uploadToken) throws TInvalidTokenException, org.apache.thrift.TException
+    public TransferStatus queryUploadStatus(java.lang.String uploadToken) throws TInvalidTokenException, org.apache.thrift.TException
     {
       send_queryUploadStatus(uploadToken);
       return recv_queryUploadStatus();
     }
 
-    public void send_queryUploadStatus(String uploadToken) throws org.apache.thrift.TException
+    public void send_queryUploadStatus(java.lang.String uploadToken) throws org.apache.thrift.TException
     {
       queryUploadStatus_args args = new queryUploadStatus_args();
       args.setUploadToken(uploadToken);
@@ -855,15 +828,15 @@ public class MasterServer {
       super(protocolFactory, clientManager, transport);
     }
 
-    public void ping(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void ping(org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       ping_call method_call = new ping_call(resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class ping_call extends org.apache.thrift.async.TAsyncMethodCall {
-      public ping_call(org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class ping_call extends org.apache.thrift.async.TAsyncMethodCall<java.lang.Boolean> {
+      public ping_call(org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
       }
 
@@ -874,9 +847,9 @@ public class MasterServer {
         prot.writeMessageEnd();
       }
 
-      public boolean getResult() throws org.apache.thrift.TException {
+      public java.lang.Boolean getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
@@ -884,17 +857,17 @@ public class MasterServer {
       }
     }
 
-    public void authenticate(String login, String password, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void authenticate(java.lang.String login, java.lang.String password, org.apache.thrift.async.AsyncMethodCallback<SessionData> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       authenticate_call method_call = new authenticate_call(login, password, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class authenticate_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String login;
-      private String password;
-      public authenticate_call(String login, String password, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class authenticate_call extends org.apache.thrift.async.TAsyncMethodCall<SessionData> {
+      private java.lang.String login;
+      private java.lang.String password;
+      public authenticate_call(java.lang.String login, java.lang.String password, org.apache.thrift.async.AsyncMethodCallback<SessionData> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.login = login;
         this.password = password;
@@ -911,7 +884,7 @@ public class MasterServer {
 
       public SessionData getResult() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
@@ -919,17 +892,17 @@ public class MasterServer {
       }
     }
 
-    public void localAccountLogin(String login, String password, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void localAccountLogin(java.lang.String login, java.lang.String password, org.apache.thrift.async.AsyncMethodCallback<ClientSessionData> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       localAccountLogin_call method_call = new localAccountLogin_call(login, password, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class localAccountLogin_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String login;
-      private String password;
-      public localAccountLogin_call(String login, String password, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class localAccountLogin_call extends org.apache.thrift.async.TAsyncMethodCall<ClientSessionData> {
+      private java.lang.String login;
+      private java.lang.String password;
+      public localAccountLogin_call(java.lang.String login, java.lang.String password, org.apache.thrift.async.AsyncMethodCallback<ClientSessionData> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.login = login;
         this.password = password;
@@ -946,7 +919,7 @@ public class MasterServer {
 
       public ClientSessionData getResult() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
@@ -954,17 +927,17 @@ public class MasterServer {
       }
     }
 
-    public void setUsedSatellite(String sessionId, String satelliteName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void setUsedSatellite(java.lang.String sessionId, java.lang.String satelliteName, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       setUsedSatellite_call method_call = new setUsedSatellite_call(sessionId, satelliteName, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class setUsedSatellite_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String sessionId;
-      private String satelliteName;
-      public setUsedSatellite_call(String sessionId, String satelliteName, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class setUsedSatellite_call extends org.apache.thrift.async.TAsyncMethodCall<Void> {
+      private java.lang.String sessionId;
+      private java.lang.String satelliteName;
+      public setUsedSatellite_call(java.lang.String sessionId, java.lang.String satelliteName, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.sessionId = sessionId;
         this.satelliteName = satelliteName;
@@ -979,28 +952,28 @@ public class MasterServer {
         prot.writeMessageEnd();
       }
 
-      public void getResult() throws org.apache.thrift.TException {
+      public Void getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
-        (new Client(prot)).recv_setUsedSatellite();
+        return null;
       }
     }
 
-    public void findUser(String sessionId, String organizationId, String searchTerm, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void findUser(java.lang.String sessionId, java.lang.String organizationId, java.lang.String searchTerm, org.apache.thrift.async.AsyncMethodCallback<java.util.List<UserInfo>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       findUser_call method_call = new findUser_call(sessionId, organizationId, searchTerm, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class findUser_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String sessionId;
-      private String organizationId;
-      private String searchTerm;
-      public findUser_call(String sessionId, String organizationId, String searchTerm, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class findUser_call extends org.apache.thrift.async.TAsyncMethodCall<java.util.List<UserInfo>> {
+      private java.lang.String sessionId;
+      private java.lang.String organizationId;
+      private java.lang.String searchTerm;
+      public findUser_call(java.lang.String sessionId, java.lang.String organizationId, java.lang.String searchTerm, org.apache.thrift.async.AsyncMethodCallback<java.util.List<UserInfo>> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.sessionId = sessionId;
         this.organizationId = organizationId;
@@ -1017,9 +990,9 @@ public class MasterServer {
         prot.writeMessageEnd();
       }
 
-      public List<UserInfo> getResult() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException {
+      public java.util.List<UserInfo> getResult() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
@@ -1027,17 +1000,17 @@ public class MasterServer {
       }
     }
 
-    public void getPublicImages(String sessionId, int page, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void getPublicImages(java.lang.String sessionId, int page, org.apache.thrift.async.AsyncMethodCallback<java.util.List<ImageSummaryRead>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       getPublicImages_call method_call = new getPublicImages_call(sessionId, page, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class getPublicImages_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String sessionId;
+    public static class getPublicImages_call extends org.apache.thrift.async.TAsyncMethodCall<java.util.List<ImageSummaryRead>> {
+      private java.lang.String sessionId;
       private int page;
-      public getPublicImages_call(String sessionId, int page, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public getPublicImages_call(java.lang.String sessionId, int page, org.apache.thrift.async.AsyncMethodCallback<java.util.List<ImageSummaryRead>> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.sessionId = sessionId;
         this.page = page;
@@ -1052,9 +1025,9 @@ public class MasterServer {
         prot.writeMessageEnd();
       }
 
-      public List<ImageSummaryRead> getResult() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException {
+      public java.util.List<ImageSummaryRead> getResult() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
@@ -1062,17 +1035,17 @@ public class MasterServer {
       }
     }
 
-    public void getImageDetails(String sessionId, String imageBaseId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void getImageDetails(java.lang.String sessionId, java.lang.String imageBaseId, org.apache.thrift.async.AsyncMethodCallback<ImageDetailsRead> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       getImageDetails_call method_call = new getImageDetails_call(sessionId, imageBaseId, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class getImageDetails_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String sessionId;
-      private String imageBaseId;
-      public getImageDetails_call(String sessionId, String imageBaseId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class getImageDetails_call extends org.apache.thrift.async.TAsyncMethodCall<ImageDetailsRead> {
+      private java.lang.String sessionId;
+      private java.lang.String imageBaseId;
+      public getImageDetails_call(java.lang.String sessionId, java.lang.String imageBaseId, org.apache.thrift.async.AsyncMethodCallback<ImageDetailsRead> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.sessionId = sessionId;
         this.imageBaseId = imageBaseId;
@@ -1089,7 +1062,7 @@ public class MasterServer {
 
       public ImageDetailsRead getResult() throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
@@ -1097,17 +1070,17 @@ public class MasterServer {
       }
     }
 
-    public void getUser(String userToken, String userId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void getUser(java.lang.String userToken, java.lang.String userId, org.apache.thrift.async.AsyncMethodCallback<UserInfo> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       getUser_call method_call = new getUser_call(userToken, userId, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class getUser_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String userToken;
-      private String userId;
-      public getUser_call(String userToken, String userId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class getUser_call extends org.apache.thrift.async.TAsyncMethodCall<UserInfo> {
+      private java.lang.String userToken;
+      private java.lang.String userId;
+      public getUser_call(java.lang.String userToken, java.lang.String userId, org.apache.thrift.async.AsyncMethodCallback<UserInfo> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.userToken = userToken;
         this.userId = userId;
@@ -1124,7 +1097,7 @@ public class MasterServer {
 
       public UserInfo getResult() throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
@@ -1132,16 +1105,16 @@ public class MasterServer {
       }
     }
 
-    public void invalidateSession(String sessionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void invalidateSession(java.lang.String sessionId, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       invalidateSession_call method_call = new invalidateSession_call(sessionId, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class invalidateSession_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String sessionId;
-      public invalidateSession_call(String sessionId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class invalidateSession_call extends org.apache.thrift.async.TAsyncMethodCall<Void> {
+      private java.lang.String sessionId;
+      public invalidateSession_call(java.lang.String sessionId, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.sessionId = sessionId;
       }
@@ -1154,26 +1127,26 @@ public class MasterServer {
         prot.writeMessageEnd();
       }
 
-      public void getResult() throws TInvalidTokenException, org.apache.thrift.TException {
+      public Void getResult() throws TInvalidTokenException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
-        (new Client(prot)).recv_invalidateSession();
+        return null;
       }
     }
 
-    public void getUserFromToken(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void getUserFromToken(java.lang.String token, org.apache.thrift.async.AsyncMethodCallback<UserInfo> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       getUserFromToken_call method_call = new getUserFromToken_call(token, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class getUserFromToken_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String token;
-      public getUserFromToken_call(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class getUserFromToken_call extends org.apache.thrift.async.TAsyncMethodCall<UserInfo> {
+      private java.lang.String token;
+      public getUserFromToken_call(java.lang.String token, org.apache.thrift.async.AsyncMethodCallback<UserInfo> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.token = token;
       }
@@ -1188,7 +1161,7 @@ public class MasterServer {
 
       public UserInfo getResult() throws TInvalidTokenException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
@@ -1196,16 +1169,16 @@ public class MasterServer {
       }
     }
 
-    public void isServerAuthenticated(String serverSessionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void isServerAuthenticated(java.lang.String serverSessionId, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       isServerAuthenticated_call method_call = new isServerAuthenticated_call(serverSessionId, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class isServerAuthenticated_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String serverSessionId;
-      public isServerAuthenticated_call(String serverSessionId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class isServerAuthenticated_call extends org.apache.thrift.async.TAsyncMethodCall<java.lang.Boolean> {
+      private java.lang.String serverSessionId;
+      public isServerAuthenticated_call(java.lang.String serverSessionId, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.serverSessionId = serverSessionId;
       }
@@ -1218,9 +1191,9 @@ public class MasterServer {
         prot.writeMessageEnd();
       }
 
-      public boolean getResult() throws org.apache.thrift.TException {
+      public java.lang.Boolean getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
@@ -1228,16 +1201,16 @@ public class MasterServer {
       }
     }
 
-    public void startServerAuthentication(int satelliteId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void startServerAuthentication(int satelliteId, org.apache.thrift.async.AsyncMethodCallback<java.nio.ByteBuffer> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       startServerAuthentication_call method_call = new startServerAuthentication_call(satelliteId, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class startServerAuthentication_call extends org.apache.thrift.async.TAsyncMethodCall {
+    public static class startServerAuthentication_call extends org.apache.thrift.async.TAsyncMethodCall<java.nio.ByteBuffer> {
       private int satelliteId;
-      public startServerAuthentication_call(int satelliteId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public startServerAuthentication_call(int satelliteId, org.apache.thrift.async.AsyncMethodCallback<java.nio.ByteBuffer> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.satelliteId = satelliteId;
       }
@@ -1250,9 +1223,9 @@ public class MasterServer {
         prot.writeMessageEnd();
       }
 
-      public ByteBuffer getResult() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException {
+      public java.nio.ByteBuffer getResult() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
@@ -1260,17 +1233,17 @@ public class MasterServer {
       }
     }
 
-    public void serverAuthenticate(int satelliteId, ByteBuffer challengeResponse, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void serverAuthenticate(int satelliteId, java.nio.ByteBuffer challengeResponse, org.apache.thrift.async.AsyncMethodCallback<ServerSessionData> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       serverAuthenticate_call method_call = new serverAuthenticate_call(satelliteId, challengeResponse, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class serverAuthenticate_call extends org.apache.thrift.async.TAsyncMethodCall {
+    public static class serverAuthenticate_call extends org.apache.thrift.async.TAsyncMethodCall<ServerSessionData> {
       private int satelliteId;
-      private ByteBuffer challengeResponse;
-      public serverAuthenticate_call(int satelliteId, ByteBuffer challengeResponse, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      private java.nio.ByteBuffer challengeResponse;
+      public serverAuthenticate_call(int satelliteId, java.nio.ByteBuffer challengeResponse, org.apache.thrift.async.AsyncMethodCallback<ServerSessionData> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.satelliteId = satelliteId;
         this.challengeResponse = challengeResponse;
@@ -1287,7 +1260,7 @@ public class MasterServer {
 
       public ServerSessionData getResult() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
@@ -1295,17 +1268,17 @@ public class MasterServer {
       }
     }
 
-    public void getImageData(String serverSessionId, String imageVersionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void getImageData(java.lang.String serverSessionId, java.lang.String imageVersionId, org.apache.thrift.async.AsyncMethodCallback<ImagePublishData> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       getImageData_call method_call = new getImageData_call(serverSessionId, imageVersionId, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class getImageData_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String serverSessionId;
-      private String imageVersionId;
-      public getImageData_call(String serverSessionId, String imageVersionId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class getImageData_call extends org.apache.thrift.async.TAsyncMethodCall<ImagePublishData> {
+      private java.lang.String serverSessionId;
+      private java.lang.String imageVersionId;
+      public getImageData_call(java.lang.String serverSessionId, java.lang.String imageVersionId, org.apache.thrift.async.AsyncMethodCallback<ImagePublishData> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.serverSessionId = serverSessionId;
         this.imageVersionId = imageVersionId;
@@ -1322,7 +1295,7 @@ public class MasterServer {
 
       public ImagePublishData getResult() throws TAuthorizationException, TInvocationException, TNotFoundException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
@@ -1330,18 +1303,18 @@ public class MasterServer {
       }
     }
 
-    public void submitImage(String userToken, ImagePublishData imageDescription, List<ByteBuffer> blockHashes, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void submitImage(java.lang.String userToken, ImagePublishData imageDescription, java.util.List<java.nio.ByteBuffer> blockHashes, org.apache.thrift.async.AsyncMethodCallback<TransferInformation> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       submitImage_call method_call = new submitImage_call(userToken, imageDescription, blockHashes, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class submitImage_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String userToken;
+    public static class submitImage_call extends org.apache.thrift.async.TAsyncMethodCall<TransferInformation> {
+      private java.lang.String userToken;
       private ImagePublishData imageDescription;
-      private List<ByteBuffer> blockHashes;
-      public submitImage_call(String userToken, ImagePublishData imageDescription, List<ByteBuffer> blockHashes, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      private java.util.List<java.nio.ByteBuffer> blockHashes;
+      public submitImage_call(java.lang.String userToken, ImagePublishData imageDescription, java.util.List<java.nio.ByteBuffer> blockHashes, org.apache.thrift.async.AsyncMethodCallback<TransferInformation> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.userToken = userToken;
         this.imageDescription = imageDescription;
@@ -1360,7 +1333,7 @@ public class MasterServer {
 
       public TransferInformation getResult() throws TAuthorizationException, TInvocationException, TTransferRejectedException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
@@ -1368,21 +1341,21 @@ public class MasterServer {
       }
     }
 
-    public void registerSatellite(String userToken, String displayName, List<String> addresses, String modulus, String exponent, ByteBuffer certsha256, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void registerSatellite(java.lang.String userToken, java.lang.String displayName, java.util.List<java.lang.String> addresses, java.lang.String modulus, java.lang.String exponent, java.nio.ByteBuffer certsha256, org.apache.thrift.async.AsyncMethodCallback<java.lang.Integer> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       registerSatellite_call method_call = new registerSatellite_call(userToken, displayName, addresses, modulus, exponent, certsha256, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class registerSatellite_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String userToken;
-      private String displayName;
-      private List<String> addresses;
-      private String modulus;
-      private String exponent;
-      private ByteBuffer certsha256;
-      public registerSatellite_call(String userToken, String displayName, List<String> addresses, String modulus, String exponent, ByteBuffer certsha256, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class registerSatellite_call extends org.apache.thrift.async.TAsyncMethodCall<java.lang.Integer> {
+      private java.lang.String userToken;
+      private java.lang.String displayName;
+      private java.util.List<java.lang.String> addresses;
+      private java.lang.String modulus;
+      private java.lang.String exponent;
+      private java.nio.ByteBuffer certsha256;
+      public registerSatellite_call(java.lang.String userToken, java.lang.String displayName, java.util.List<java.lang.String> addresses, java.lang.String modulus, java.lang.String exponent, java.nio.ByteBuffer certsha256, org.apache.thrift.async.AsyncMethodCallback<java.lang.Integer> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.userToken = userToken;
         this.displayName = displayName;
@@ -1405,9 +1378,9 @@ public class MasterServer {
         prot.writeMessageEnd();
       }
 
-      public int getResult() throws TInvocationException, org.apache.thrift.TException {
+      public java.lang.Integer getResult() throws TInvocationException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
@@ -1415,18 +1388,18 @@ public class MasterServer {
       }
     }
 
-    public void updateSatellite(String serverSessionId, String displayName, List<String> addresses, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void updateSatellite(java.lang.String serverSessionId, java.lang.String displayName, java.util.List<java.lang.String> addresses, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       updateSatellite_call method_call = new updateSatellite_call(serverSessionId, displayName, addresses, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class updateSatellite_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String serverSessionId;
-      private String displayName;
-      private List<String> addresses;
-      public updateSatellite_call(String serverSessionId, String displayName, List<String> addresses, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class updateSatellite_call extends org.apache.thrift.async.TAsyncMethodCall<java.lang.Boolean> {
+      private java.lang.String serverSessionId;
+      private java.lang.String displayName;
+      private java.util.List<java.lang.String> addresses;
+      public updateSatellite_call(java.lang.String serverSessionId, java.lang.String displayName, java.util.List<java.lang.String> addresses, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.serverSessionId = serverSessionId;
         this.displayName = displayName;
@@ -1443,9 +1416,9 @@ public class MasterServer {
         prot.writeMessageEnd();
       }
 
-      public boolean getResult() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException {
+      public java.lang.Boolean getResult() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
@@ -1453,17 +1426,17 @@ public class MasterServer {
       }
     }
 
-    public void downloadImage(String sessionId, String imageVersionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void downloadImage(java.lang.String sessionId, java.lang.String imageVersionId, org.apache.thrift.async.AsyncMethodCallback<TransferInformation> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       downloadImage_call method_call = new downloadImage_call(sessionId, imageVersionId, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class downloadImage_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String sessionId;
-      private String imageVersionId;
-      public downloadImage_call(String sessionId, String imageVersionId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class downloadImage_call extends org.apache.thrift.async.TAsyncMethodCall<TransferInformation> {
+      private java.lang.String sessionId;
+      private java.lang.String imageVersionId;
+      public downloadImage_call(java.lang.String sessionId, java.lang.String imageVersionId, org.apache.thrift.async.AsyncMethodCallback<TransferInformation> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.sessionId = sessionId;
         this.imageVersionId = imageVersionId;
@@ -1480,7 +1453,7 @@ public class MasterServer {
 
       public TransferInformation getResult() throws TAuthorizationException, TInvocationException, TNotFoundException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
@@ -1488,15 +1461,15 @@ public class MasterServer {
       }
     }
 
-    public void getOrganizations(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void getOrganizations(org.apache.thrift.async.AsyncMethodCallback<java.util.List<Organization>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       getOrganizations_call method_call = new getOrganizations_call(resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class getOrganizations_call extends org.apache.thrift.async.TAsyncMethodCall {
-      public getOrganizations_call(org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class getOrganizations_call extends org.apache.thrift.async.TAsyncMethodCall<java.util.List<Organization>> {
+      public getOrganizations_call(org.apache.thrift.async.AsyncMethodCallback<java.util.List<Organization>> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
       }
 
@@ -1507,9 +1480,9 @@ public class MasterServer {
         prot.writeMessageEnd();
       }
 
-      public List<Organization> getResult() throws TInvocationException, org.apache.thrift.TException {
+      public java.util.List<Organization> getResult() throws TInvocationException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
@@ -1517,15 +1490,15 @@ public class MasterServer {
       }
     }
 
-    public void getOperatingSystems(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void getOperatingSystems(org.apache.thrift.async.AsyncMethodCallback<java.util.List<OperatingSystem>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       getOperatingSystems_call method_call = new getOperatingSystems_call(resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class getOperatingSystems_call extends org.apache.thrift.async.TAsyncMethodCall {
-      public getOperatingSystems_call(org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class getOperatingSystems_call extends org.apache.thrift.async.TAsyncMethodCall<java.util.List<OperatingSystem>> {
+      public getOperatingSystems_call(org.apache.thrift.async.AsyncMethodCallback<java.util.List<OperatingSystem>> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
       }
 
@@ -1536,9 +1509,9 @@ public class MasterServer {
         prot.writeMessageEnd();
       }
 
-      public List<OperatingSystem> getResult() throws TInvocationException, org.apache.thrift.TException {
+      public java.util.List<OperatingSystem> getResult() throws TInvocationException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
@@ -1546,15 +1519,15 @@ public class MasterServer {
       }
     }
 
-    public void getVirtualizers(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void getVirtualizers(org.apache.thrift.async.AsyncMethodCallback<java.util.List<Virtualizer>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       getVirtualizers_call method_call = new getVirtualizers_call(resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class getVirtualizers_call extends org.apache.thrift.async.TAsyncMethodCall {
-      public getVirtualizers_call(org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class getVirtualizers_call extends org.apache.thrift.async.TAsyncMethodCall<java.util.List<Virtualizer>> {
+      public getVirtualizers_call(org.apache.thrift.async.AsyncMethodCallback<java.util.List<Virtualizer>> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
       }
 
@@ -1565,9 +1538,9 @@ public class MasterServer {
         prot.writeMessageEnd();
       }
 
-      public List<Virtualizer> getResult() throws TInvocationException, org.apache.thrift.TException {
+      public java.util.List<Virtualizer> getResult() throws TInvocationException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
@@ -1575,16 +1548,16 @@ public class MasterServer {
       }
     }
 
-    public void getTags(long startDate, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void getTags(long startDate, org.apache.thrift.async.AsyncMethodCallback<java.util.List<MasterTag>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       getTags_call method_call = new getTags_call(startDate, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class getTags_call extends org.apache.thrift.async.TAsyncMethodCall {
+    public static class getTags_call extends org.apache.thrift.async.TAsyncMethodCall<java.util.List<MasterTag>> {
       private long startDate;
-      public getTags_call(long startDate, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public getTags_call(long startDate, org.apache.thrift.async.AsyncMethodCallback<java.util.List<MasterTag>> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.startDate = startDate;
       }
@@ -1597,9 +1570,9 @@ public class MasterServer {
         prot.writeMessageEnd();
       }
 
-      public List<MasterTag> getResult() throws TInvocationException, org.apache.thrift.TException {
+      public java.util.List<MasterTag> getResult() throws TInvocationException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
@@ -1607,16 +1580,16 @@ public class MasterServer {
       }
     }
 
-    public void getSoftware(long startDate, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void getSoftware(long startDate, org.apache.thrift.async.AsyncMethodCallback<java.util.List<MasterSoftware>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       getSoftware_call method_call = new getSoftware_call(startDate, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class getSoftware_call extends org.apache.thrift.async.TAsyncMethodCall {
+    public static class getSoftware_call extends org.apache.thrift.async.TAsyncMethodCall<java.util.List<MasterSoftware>> {
       private long startDate;
-      public getSoftware_call(long startDate, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public getSoftware_call(long startDate, org.apache.thrift.async.AsyncMethodCallback<java.util.List<MasterSoftware>> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.startDate = startDate;
       }
@@ -1629,9 +1602,9 @@ public class MasterServer {
         prot.writeMessageEnd();
       }
 
-      public List<MasterSoftware> getResult() throws TInvocationException, org.apache.thrift.TException {
+      public java.util.List<MasterSoftware> getResult() throws TInvocationException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
@@ -1639,16 +1612,16 @@ public class MasterServer {
       }
     }
 
-    public void queryUploadStatus(String uploadToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void queryUploadStatus(java.lang.String uploadToken, org.apache.thrift.async.AsyncMethodCallback<TransferStatus> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       queryUploadStatus_call method_call = new queryUploadStatus_call(uploadToken, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class queryUploadStatus_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String uploadToken;
-      public queryUploadStatus_call(String uploadToken, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class queryUploadStatus_call extends org.apache.thrift.async.TAsyncMethodCall<TransferStatus> {
+      private java.lang.String uploadToken;
+      public queryUploadStatus_call(java.lang.String uploadToken, org.apache.thrift.async.AsyncMethodCallback<TransferStatus> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.uploadToken = uploadToken;
       }
@@ -1663,7 +1636,7 @@ public class MasterServer {
 
       public TransferStatus getResult() throws TInvalidTokenException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
@@ -1674,16 +1647,16 @@ public class MasterServer {
   }
 
   public static class Processor<I extends Iface> extends org.apache.thrift.TBaseProcessor<I> implements org.apache.thrift.TProcessor {
-    private static final Logger LOGGER = LoggerFactory.getLogger(Processor.class.getName());
+    private static final org.slf4j.Logger _LOGGER = org.slf4j.LoggerFactory.getLogger(Processor.class.getName());
     public Processor(I iface) {
-      super(iface, getProcessMap(new HashMap<String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>>()));
+      super(iface, getProcessMap(new java.util.HashMap<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>>()));
     }
 
-    protected Processor(I iface, Map<String,  org.apache.thrift.ProcessFunction<I, ? extends  org.apache.thrift.TBase>> processMap) {
+    protected Processor(I iface, java.util.Map<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>> processMap) {
       super(iface, getProcessMap(processMap));
     }
 
-    private static <I extends Iface> Map<String,  org.apache.thrift.ProcessFunction<I, ? extends  org.apache.thrift.TBase>> getProcessMap(Map<String,  org.apache.thrift.ProcessFunction<I, ? extends  org.apache.thrift.TBase>> processMap) {
+    private static <I extends Iface> java.util.Map<java.lang.String,  org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>> getProcessMap(java.util.Map<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends  org.apache.thrift.TBase>> processMap) {
       processMap.put("ping", new ping());
       processMap.put("authenticate", new authenticate());
       processMap.put("localAccountLogin", new localAccountLogin());
@@ -1724,6 +1697,11 @@ public class MasterServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public ping_result getResult(I iface, ping_args args) throws org.apache.thrift.TException {
         ping_result result = new ping_result();
         result.success = iface.ping();
@@ -1745,6 +1723,11 @@ public class MasterServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public authenticate_result getResult(I iface, authenticate_args args) throws org.apache.thrift.TException {
         authenticate_result result = new authenticate_result();
         try {
@@ -1771,6 +1754,11 @@ public class MasterServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public localAccountLogin_result getResult(I iface, localAccountLogin_args args) throws org.apache.thrift.TException {
         localAccountLogin_result result = new localAccountLogin_result();
         try {
@@ -1797,6 +1785,11 @@ public class MasterServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public setUsedSatellite_result getResult(I iface, setUsedSatellite_args args) throws org.apache.thrift.TException {
         setUsedSatellite_result result = new setUsedSatellite_result();
         iface.setUsedSatellite(args.sessionId, args.satelliteName);
@@ -1817,6 +1810,11 @@ public class MasterServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public findUser_result getResult(I iface, findUser_args args) throws org.apache.thrift.TException {
         findUser_result result = new findUser_result();
         try {
@@ -1843,6 +1841,11 @@ public class MasterServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public getPublicImages_result getResult(I iface, getPublicImages_args args) throws org.apache.thrift.TException {
         getPublicImages_result result = new getPublicImages_result();
         try {
@@ -1869,6 +1872,11 @@ public class MasterServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public getImageDetails_result getResult(I iface, getImageDetails_args args) throws org.apache.thrift.TException {
         getImageDetails_result result = new getImageDetails_result();
         try {
@@ -1897,6 +1905,11 @@ public class MasterServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public getUser_result getResult(I iface, getUser_args args) throws org.apache.thrift.TException {
         getUser_result result = new getUser_result();
         try {
@@ -1925,6 +1938,11 @@ public class MasterServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public invalidateSession_result getResult(I iface, invalidateSession_args args) throws org.apache.thrift.TException {
         invalidateSession_result result = new invalidateSession_result();
         try {
@@ -1949,6 +1967,11 @@ public class MasterServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public getUserFromToken_result getResult(I iface, getUserFromToken_args args) throws org.apache.thrift.TException {
         getUserFromToken_result result = new getUserFromToken_result();
         try {
@@ -1973,6 +1996,11 @@ public class MasterServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public isServerAuthenticated_result getResult(I iface, isServerAuthenticated_args args) throws org.apache.thrift.TException {
         isServerAuthenticated_result result = new isServerAuthenticated_result();
         result.success = iface.isServerAuthenticated(args.serverSessionId);
@@ -1994,6 +2022,11 @@ public class MasterServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public startServerAuthentication_result getResult(I iface, startServerAuthentication_args args) throws org.apache.thrift.TException {
         startServerAuthentication_result result = new startServerAuthentication_result();
         try {
@@ -2020,6 +2053,11 @@ public class MasterServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public serverAuthenticate_result getResult(I iface, serverAuthenticate_args args) throws org.apache.thrift.TException {
         serverAuthenticate_result result = new serverAuthenticate_result();
         try {
@@ -2046,6 +2084,11 @@ public class MasterServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public getImageData_result getResult(I iface, getImageData_args args) throws org.apache.thrift.TException {
         getImageData_result result = new getImageData_result();
         try {
@@ -2074,6 +2117,11 @@ public class MasterServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public submitImage_result getResult(I iface, submitImage_args args) throws org.apache.thrift.TException {
         submitImage_result result = new submitImage_result();
         try {
@@ -2102,6 +2150,11 @@ public class MasterServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public registerSatellite_result getResult(I iface, registerSatellite_args args) throws org.apache.thrift.TException {
         registerSatellite_result result = new registerSatellite_result();
         try {
@@ -2127,6 +2180,11 @@ public class MasterServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public updateSatellite_result getResult(I iface, updateSatellite_args args) throws org.apache.thrift.TException {
         updateSatellite_result result = new updateSatellite_result();
         try {
@@ -2154,6 +2212,11 @@ public class MasterServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public downloadImage_result getResult(I iface, downloadImage_args args) throws org.apache.thrift.TException {
         downloadImage_result result = new downloadImage_result();
         try {
@@ -2182,6 +2245,11 @@ public class MasterServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public getOrganizations_result getResult(I iface, getOrganizations_args args) throws org.apache.thrift.TException {
         getOrganizations_result result = new getOrganizations_result();
         try {
@@ -2206,6 +2274,11 @@ public class MasterServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public getOperatingSystems_result getResult(I iface, getOperatingSystems_args args) throws org.apache.thrift.TException {
         getOperatingSystems_result result = new getOperatingSystems_result();
         try {
@@ -2230,6 +2303,11 @@ public class MasterServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public getVirtualizers_result getResult(I iface, getVirtualizers_args args) throws org.apache.thrift.TException {
         getVirtualizers_result result = new getVirtualizers_result();
         try {
@@ -2254,6 +2332,11 @@ public class MasterServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public getTags_result getResult(I iface, getTags_args args) throws org.apache.thrift.TException {
         getTags_result result = new getTags_result();
         try {
@@ -2278,6 +2361,11 @@ public class MasterServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public getSoftware_result getResult(I iface, getSoftware_args args) throws org.apache.thrift.TException {
         getSoftware_result result = new getSoftware_result();
         try {
@@ -2302,6 +2390,11 @@ public class MasterServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public queryUploadStatus_result getResult(I iface, queryUploadStatus_args args) throws org.apache.thrift.TException {
         queryUploadStatus_result result = new queryUploadStatus_result();
         try {
@@ -2316,16 +2409,16 @@ public class MasterServer {
   }
 
   public static class AsyncProcessor<I extends AsyncIface> extends org.apache.thrift.TBaseAsyncProcessor<I> {
-    private static final Logger LOGGER = LoggerFactory.getLogger(AsyncProcessor.class.getName());
+    private static final org.slf4j.Logger _LOGGER = org.slf4j.LoggerFactory.getLogger(AsyncProcessor.class.getName());
     public AsyncProcessor(I iface) {
-      super(iface, getProcessMap(new HashMap<String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase, ?>>()));
+      super(iface, getProcessMap(new java.util.HashMap<java.lang.String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase, ?>>()));
     }
 
-    protected AsyncProcessor(I iface, Map<String,  org.apache.thrift.AsyncProcessFunction<I, ? extends  org.apache.thrift.TBase, ?>> processMap) {
+    protected AsyncProcessor(I iface, java.util.Map<java.lang.String,  org.apache.thrift.AsyncProcessFunction<I, ? extends  org.apache.thrift.TBase, ?>> processMap) {
       super(iface, getProcessMap(processMap));
     }
 
-    private static <I extends AsyncIface> Map<String,  org.apache.thrift.AsyncProcessFunction<I, ? extends  org.apache.thrift.TBase,?>> getProcessMap(Map<String,  org.apache.thrift.AsyncProcessFunction<I, ? extends  org.apache.thrift.TBase, ?>> processMap) {
+    private static <I extends AsyncIface> java.util.Map<java.lang.String,  org.apache.thrift.AsyncProcessFunction<I, ? extends  org.apache.thrift.TBase,?>> getProcessMap(java.util.Map<java.lang.String,  org.apache.thrift.AsyncProcessFunction<I, ? extends  org.apache.thrift.TBase, ?>> processMap) {
       processMap.put("ping", new ping());
       processMap.put("authenticate", new authenticate());
       processMap.put("localAccountLogin", new localAccountLogin());
@@ -2353,7 +2446,7 @@ public class MasterServer {
       return processMap;
     }
 
-    public static class ping<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, ping_args, Boolean> {
+    public static class ping<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, ping_args, java.lang.Boolean> {
       public ping() {
         super("ping");
       }
@@ -2362,36 +2455,46 @@ public class MasterServer {
         return new ping_args();
       }
 
-      public AsyncMethodCallback<Boolean> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<Boolean>() { 
-          public void onComplete(Boolean o) {
+        return new org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean>() { 
+          public void onComplete(java.lang.Boolean o) {
             ping_result result = new ping_result();
             result.success = o;
             result.setSuccessIsSet(true);
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             ping_result result = new ping_result();
-            {
+            if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -2400,7 +2503,7 @@ public class MasterServer {
         return false;
       }
 
-      public void start(I iface, ping_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
+      public void start(I iface, ping_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
         iface.ping(resultHandler);
       }
     }
@@ -2414,46 +2517,53 @@ public class MasterServer {
         return new authenticate_args();
       }
 
-      public AsyncMethodCallback<SessionData> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<SessionData> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<SessionData>() { 
+        return new org.apache.thrift.async.AsyncMethodCallback<SessionData>() { 
           public void onComplete(SessionData o) {
             authenticate_result result = new authenticate_result();
             result.success = o;
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             authenticate_result result = new authenticate_result();
             if (e instanceof TAuthorizationException) {
-                        result.failure = (TAuthorizationException) e;
-                        result.setFailureIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TInvocationException) {
-                        result.error = (TInvocationException) e;
-                        result.setErrorIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.failure = (TAuthorizationException) e;
+              result.setFailureIsSet(true);
+              msg = result;
+            } else if (e instanceof TInvocationException) {
+              result.error = (TInvocationException) e;
+              result.setErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -2462,7 +2572,7 @@ public class MasterServer {
         return false;
       }
 
-      public void start(I iface, authenticate_args args, org.apache.thrift.async.AsyncMethodCallback<SessionData> resultHandler) throws TException {
+      public void start(I iface, authenticate_args args, org.apache.thrift.async.AsyncMethodCallback<SessionData> resultHandler) throws org.apache.thrift.TException {
         iface.authenticate(args.login, args.password,resultHandler);
       }
     }
@@ -2476,46 +2586,53 @@ public class MasterServer {
         return new localAccountLogin_args();
       }
 
-      public AsyncMethodCallback<ClientSessionData> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<ClientSessionData> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<ClientSessionData>() { 
+        return new org.apache.thrift.async.AsyncMethodCallback<ClientSessionData>() { 
           public void onComplete(ClientSessionData o) {
             localAccountLogin_result result = new localAccountLogin_result();
             result.success = o;
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             localAccountLogin_result result = new localAccountLogin_result();
             if (e instanceof TAuthorizationException) {
-                        result.failure = (TAuthorizationException) e;
-                        result.setFailureIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TInvocationException) {
-                        result.error = (TInvocationException) e;
-                        result.setErrorIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.failure = (TAuthorizationException) e;
+              result.setFailureIsSet(true);
+              msg = result;
+            } else if (e instanceof TInvocationException) {
+              result.error = (TInvocationException) e;
+              result.setErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -2524,7 +2641,7 @@ public class MasterServer {
         return false;
       }
 
-      public void start(I iface, localAccountLogin_args args, org.apache.thrift.async.AsyncMethodCallback<ClientSessionData> resultHandler) throws TException {
+      public void start(I iface, localAccountLogin_args args, org.apache.thrift.async.AsyncMethodCallback<ClientSessionData> resultHandler) throws org.apache.thrift.TException {
         iface.localAccountLogin(args.login, args.password,resultHandler);
       }
     }
@@ -2538,34 +2655,44 @@ public class MasterServer {
         return new setUsedSatellite_args();
       }
 
-      public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<Void> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<Void>() { 
+        return new org.apache.thrift.async.AsyncMethodCallback<Void>() { 
           public void onComplete(Void o) {
             setUsedSatellite_result result = new setUsedSatellite_result();
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             setUsedSatellite_result result = new setUsedSatellite_result();
-            {
+            if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -2574,12 +2701,12 @@ public class MasterServer {
         return false;
       }
 
-      public void start(I iface, setUsedSatellite_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
+      public void start(I iface, setUsedSatellite_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.setUsedSatellite(args.sessionId, args.satelliteName,resultHandler);
       }
     }
 
-    public static class findUser<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, findUser_args, List<UserInfo>> {
+    public static class findUser<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, findUser_args, java.util.List<UserInfo>> {
       public findUser() {
         super("findUser");
       }
@@ -2588,46 +2715,53 @@ public class MasterServer {
         return new findUser_args();
       }
 
-      public AsyncMethodCallback<List<UserInfo>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<java.util.List<UserInfo>> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<List<UserInfo>>() { 
-          public void onComplete(List<UserInfo> o) {
+        return new org.apache.thrift.async.AsyncMethodCallback<java.util.List<UserInfo>>() { 
+          public void onComplete(java.util.List<UserInfo> o) {
             findUser_result result = new findUser_result();
             result.success = o;
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             findUser_result result = new findUser_result();
             if (e instanceof TAuthorizationException) {
-                        result.failure = (TAuthorizationException) e;
-                        result.setFailureIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TInvocationException) {
-                        result.error = (TInvocationException) e;
-                        result.setErrorIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.failure = (TAuthorizationException) e;
+              result.setFailureIsSet(true);
+              msg = result;
+            } else if (e instanceof TInvocationException) {
+              result.error = (TInvocationException) e;
+              result.setErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -2636,12 +2770,12 @@ public class MasterServer {
         return false;
       }
 
-      public void start(I iface, findUser_args args, org.apache.thrift.async.AsyncMethodCallback<List<UserInfo>> resultHandler) throws TException {
+      public void start(I iface, findUser_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<UserInfo>> resultHandler) throws org.apache.thrift.TException {
         iface.findUser(args.sessionId, args.organizationId, args.searchTerm,resultHandler);
       }
     }
 
-    public static class getPublicImages<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getPublicImages_args, List<ImageSummaryRead>> {
+    public static class getPublicImages<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getPublicImages_args, java.util.List<ImageSummaryRead>> {
       public getPublicImages() {
         super("getPublicImages");
       }
@@ -2650,46 +2784,53 @@ public class MasterServer {
         return new getPublicImages_args();
       }
 
-      public AsyncMethodCallback<List<ImageSummaryRead>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<java.util.List<ImageSummaryRead>> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<List<ImageSummaryRead>>() { 
-          public void onComplete(List<ImageSummaryRead> o) {
+        return new org.apache.thrift.async.AsyncMethodCallback<java.util.List<ImageSummaryRead>>() { 
+          public void onComplete(java.util.List<ImageSummaryRead> o) {
             getPublicImages_result result = new getPublicImages_result();
             result.success = o;
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             getPublicImages_result result = new getPublicImages_result();
             if (e instanceof TAuthorizationException) {
-                        result.failure = (TAuthorizationException) e;
-                        result.setFailureIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TInvocationException) {
-                        result.error = (TInvocationException) e;
-                        result.setErrorIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.failure = (TAuthorizationException) e;
+              result.setFailureIsSet(true);
+              msg = result;
+            } else if (e instanceof TInvocationException) {
+              result.error = (TInvocationException) e;
+              result.setErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -2698,7 +2839,7 @@ public class MasterServer {
         return false;
       }
 
-      public void start(I iface, getPublicImages_args args, org.apache.thrift.async.AsyncMethodCallback<List<ImageSummaryRead>> resultHandler) throws TException {
+      public void start(I iface, getPublicImages_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<ImageSummaryRead>> resultHandler) throws org.apache.thrift.TException {
         iface.getPublicImages(args.sessionId, args.page,resultHandler);
       }
     }
@@ -2712,51 +2853,57 @@ public class MasterServer {
         return new getImageDetails_args();
       }
 
-      public AsyncMethodCallback<ImageDetailsRead> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<ImageDetailsRead> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<ImageDetailsRead>() { 
+        return new org.apache.thrift.async.AsyncMethodCallback<ImageDetailsRead>() { 
           public void onComplete(ImageDetailsRead o) {
             getImageDetails_result result = new getImageDetails_result();
             result.success = o;
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             getImageDetails_result result = new getImageDetails_result();
             if (e instanceof TAuthorizationException) {
-                        result.authError = (TAuthorizationException) e;
-                        result.setAuthErrorIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TNotFoundException) {
-                        result.notFound = (TNotFoundException) e;
-                        result.setNotFoundIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TInvocationException) {
-                        result.serverError = (TInvocationException) e;
-                        result.setServerErrorIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.authError = (TAuthorizationException) e;
+              result.setAuthErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof TNotFoundException) {
+              result.notFound = (TNotFoundException) e;
+              result.setNotFoundIsSet(true);
+              msg = result;
+            } else if (e instanceof TInvocationException) {
+              result.serverError = (TInvocationException) e;
+              result.setServerErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -2765,7 +2912,7 @@ public class MasterServer {
         return false;
       }
 
-      public void start(I iface, getImageDetails_args args, org.apache.thrift.async.AsyncMethodCallback<ImageDetailsRead> resultHandler) throws TException {
+      public void start(I iface, getImageDetails_args args, org.apache.thrift.async.AsyncMethodCallback<ImageDetailsRead> resultHandler) throws org.apache.thrift.TException {
         iface.getImageDetails(args.sessionId, args.imageBaseId,resultHandler);
       }
     }
@@ -2779,51 +2926,57 @@ public class MasterServer {
         return new getUser_args();
       }
 
-      public AsyncMethodCallback<UserInfo> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<UserInfo> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<UserInfo>() { 
+        return new org.apache.thrift.async.AsyncMethodCallback<UserInfo>() { 
           public void onComplete(UserInfo o) {
             getUser_result result = new getUser_result();
             result.success = o;
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             getUser_result result = new getUser_result();
             if (e instanceof TAuthorizationException) {
-                        result.authError = (TAuthorizationException) e;
-                        result.setAuthErrorIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TNotFoundException) {
-                        result.notFound = (TNotFoundException) e;
-                        result.setNotFoundIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TInvocationException) {
-                        result.serverError = (TInvocationException) e;
-                        result.setServerErrorIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.authError = (TAuthorizationException) e;
+              result.setAuthErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof TNotFoundException) {
+              result.notFound = (TNotFoundException) e;
+              result.setNotFoundIsSet(true);
+              msg = result;
+            } else if (e instanceof TInvocationException) {
+              result.serverError = (TInvocationException) e;
+              result.setServerErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -2832,7 +2985,7 @@ public class MasterServer {
         return false;
       }
 
-      public void start(I iface, getUser_args args, org.apache.thrift.async.AsyncMethodCallback<UserInfo> resultHandler) throws TException {
+      public void start(I iface, getUser_args args, org.apache.thrift.async.AsyncMethodCallback<UserInfo> resultHandler) throws org.apache.thrift.TException {
         iface.getUser(args.userToken, args.userId,resultHandler);
       }
     }
@@ -2846,40 +2999,48 @@ public class MasterServer {
         return new invalidateSession_args();
       }
 
-      public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<Void> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<Void>() { 
+        return new org.apache.thrift.async.AsyncMethodCallback<Void>() { 
           public void onComplete(Void o) {
             invalidateSession_result result = new invalidateSession_result();
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             invalidateSession_result result = new invalidateSession_result();
             if (e instanceof TInvalidTokenException) {
-                        result.ex = (TInvalidTokenException) e;
-                        result.setExIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.ex = (TInvalidTokenException) e;
+              result.setExIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -2888,7 +3049,7 @@ public class MasterServer {
         return false;
       }
 
-      public void start(I iface, invalidateSession_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
+      public void start(I iface, invalidateSession_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.invalidateSession(args.sessionId,resultHandler);
       }
     }
@@ -2902,41 +3063,49 @@ public class MasterServer {
         return new getUserFromToken_args();
       }
 
-      public AsyncMethodCallback<UserInfo> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<UserInfo> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<UserInfo>() { 
+        return new org.apache.thrift.async.AsyncMethodCallback<UserInfo>() { 
           public void onComplete(UserInfo o) {
             getUserFromToken_result result = new getUserFromToken_result();
             result.success = o;
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             getUserFromToken_result result = new getUserFromToken_result();
             if (e instanceof TInvalidTokenException) {
-                        result.failure = (TInvalidTokenException) e;
-                        result.setFailureIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.failure = (TInvalidTokenException) e;
+              result.setFailureIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -2945,12 +3114,12 @@ public class MasterServer {
         return false;
       }
 
-      public void start(I iface, getUserFromToken_args args, org.apache.thrift.async.AsyncMethodCallback<UserInfo> resultHandler) throws TException {
+      public void start(I iface, getUserFromToken_args args, org.apache.thrift.async.AsyncMethodCallback<UserInfo> resultHandler) throws org.apache.thrift.TException {
         iface.getUserFromToken(args.token,resultHandler);
       }
     }
 
-    public static class isServerAuthenticated<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, isServerAuthenticated_args, Boolean> {
+    public static class isServerAuthenticated<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, isServerAuthenticated_args, java.lang.Boolean> {
       public isServerAuthenticated() {
         super("isServerAuthenticated");
       }
@@ -2959,36 +3128,46 @@ public class MasterServer {
         return new isServerAuthenticated_args();
       }
 
-      public AsyncMethodCallback<Boolean> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<Boolean>() { 
-          public void onComplete(Boolean o) {
+        return new org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean>() { 
+          public void onComplete(java.lang.Boolean o) {
             isServerAuthenticated_result result = new isServerAuthenticated_result();
             result.success = o;
             result.setSuccessIsSet(true);
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             isServerAuthenticated_result result = new isServerAuthenticated_result();
-            {
+            if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -2997,12 +3176,12 @@ public class MasterServer {
         return false;
       }
 
-      public void start(I iface, isServerAuthenticated_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
+      public void start(I iface, isServerAuthenticated_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
         iface.isServerAuthenticated(args.serverSessionId,resultHandler);
       }
     }
 
-    public static class startServerAuthentication<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, startServerAuthentication_args, ByteBuffer> {
+    public static class startServerAuthentication<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, startServerAuthentication_args, java.nio.ByteBuffer> {
       public startServerAuthentication() {
         super("startServerAuthentication");
       }
@@ -3011,46 +3190,53 @@ public class MasterServer {
         return new startServerAuthentication_args();
       }
 
-      public AsyncMethodCallback<ByteBuffer> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<java.nio.ByteBuffer> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<ByteBuffer>() { 
-          public void onComplete(ByteBuffer o) {
+        return new org.apache.thrift.async.AsyncMethodCallback<java.nio.ByteBuffer>() { 
+          public void onComplete(java.nio.ByteBuffer o) {
             startServerAuthentication_result result = new startServerAuthentication_result();
             result.success = o;
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             startServerAuthentication_result result = new startServerAuthentication_result();
             if (e instanceof TAuthorizationException) {
-                        result.failure = (TAuthorizationException) e;
-                        result.setFailureIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TInvocationException) {
-                        result.error = (TInvocationException) e;
-                        result.setErrorIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.failure = (TAuthorizationException) e;
+              result.setFailureIsSet(true);
+              msg = result;
+            } else if (e instanceof TInvocationException) {
+              result.error = (TInvocationException) e;
+              result.setErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -3059,7 +3245,7 @@ public class MasterServer {
         return false;
       }
 
-      public void start(I iface, startServerAuthentication_args args, org.apache.thrift.async.AsyncMethodCallback<ByteBuffer> resultHandler) throws TException {
+      public void start(I iface, startServerAuthentication_args args, org.apache.thrift.async.AsyncMethodCallback<java.nio.ByteBuffer> resultHandler) throws org.apache.thrift.TException {
         iface.startServerAuthentication(args.satelliteId,resultHandler);
       }
     }
@@ -3073,46 +3259,53 @@ public class MasterServer {
         return new serverAuthenticate_args();
       }
 
-      public AsyncMethodCallback<ServerSessionData> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<ServerSessionData> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<ServerSessionData>() { 
+        return new org.apache.thrift.async.AsyncMethodCallback<ServerSessionData>() { 
           public void onComplete(ServerSessionData o) {
             serverAuthenticate_result result = new serverAuthenticate_result();
             result.success = o;
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             serverAuthenticate_result result = new serverAuthenticate_result();
             if (e instanceof TAuthorizationException) {
-                        result.failure = (TAuthorizationException) e;
-                        result.setFailureIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TInvocationException) {
-                        result.errr = (TInvocationException) e;
-                        result.setErrrIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.failure = (TAuthorizationException) e;
+              result.setFailureIsSet(true);
+              msg = result;
+            } else if (e instanceof TInvocationException) {
+              result.errr = (TInvocationException) e;
+              result.setErrrIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -3121,7 +3314,7 @@ public class MasterServer {
         return false;
       }
 
-      public void start(I iface, serverAuthenticate_args args, org.apache.thrift.async.AsyncMethodCallback<ServerSessionData> resultHandler) throws TException {
+      public void start(I iface, serverAuthenticate_args args, org.apache.thrift.async.AsyncMethodCallback<ServerSessionData> resultHandler) throws org.apache.thrift.TException {
         iface.serverAuthenticate(args.satelliteId, args.challengeResponse,resultHandler);
       }
     }
@@ -3135,51 +3328,57 @@ public class MasterServer {
         return new getImageData_args();
       }
 
-      public AsyncMethodCallback<ImagePublishData> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<ImagePublishData> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<ImagePublishData>() { 
+        return new org.apache.thrift.async.AsyncMethodCallback<ImagePublishData>() { 
           public void onComplete(ImagePublishData o) {
             getImageData_result result = new getImageData_result();
             result.success = o;
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             getImageData_result result = new getImageData_result();
             if (e instanceof TAuthorizationException) {
-                        result.failure = (TAuthorizationException) e;
-                        result.setFailureIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TInvocationException) {
-                        result.failure2 = (TInvocationException) e;
-                        result.setFailure2IsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TNotFoundException) {
-                        result.f3 = (TNotFoundException) e;
-                        result.setF3IsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.failure = (TAuthorizationException) e;
+              result.setFailureIsSet(true);
+              msg = result;
+            } else if (e instanceof TInvocationException) {
+              result.failure2 = (TInvocationException) e;
+              result.setFailure2IsSet(true);
+              msg = result;
+            } else if (e instanceof TNotFoundException) {
+              result.f3 = (TNotFoundException) e;
+              result.setF3IsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -3188,7 +3387,7 @@ public class MasterServer {
         return false;
       }
 
-      public void start(I iface, getImageData_args args, org.apache.thrift.async.AsyncMethodCallback<ImagePublishData> resultHandler) throws TException {
+      public void start(I iface, getImageData_args args, org.apache.thrift.async.AsyncMethodCallback<ImagePublishData> resultHandler) throws org.apache.thrift.TException {
         iface.getImageData(args.serverSessionId, args.imageVersionId,resultHandler);
       }
     }
@@ -3202,51 +3401,57 @@ public class MasterServer {
         return new submitImage_args();
       }
 
-      public AsyncMethodCallback<TransferInformation> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<TransferInformation> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<TransferInformation>() { 
+        return new org.apache.thrift.async.AsyncMethodCallback<TransferInformation>() { 
           public void onComplete(TransferInformation o) {
             submitImage_result result = new submitImage_result();
             result.success = o;
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             submitImage_result result = new submitImage_result();
             if (e instanceof TAuthorizationException) {
-                        result.failure = (TAuthorizationException) e;
-                        result.setFailureIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TInvocationException) {
-                        result.failure2 = (TInvocationException) e;
-                        result.setFailure2IsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TTransferRejectedException) {
-                        result.failure3 = (TTransferRejectedException) e;
-                        result.setFailure3IsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.failure = (TAuthorizationException) e;
+              result.setFailureIsSet(true);
+              msg = result;
+            } else if (e instanceof TInvocationException) {
+              result.failure2 = (TInvocationException) e;
+              result.setFailure2IsSet(true);
+              msg = result;
+            } else if (e instanceof TTransferRejectedException) {
+              result.failure3 = (TTransferRejectedException) e;
+              result.setFailure3IsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -3255,12 +3460,12 @@ public class MasterServer {
         return false;
       }
 
-      public void start(I iface, submitImage_args args, org.apache.thrift.async.AsyncMethodCallback<TransferInformation> resultHandler) throws TException {
+      public void start(I iface, submitImage_args args, org.apache.thrift.async.AsyncMethodCallback<TransferInformation> resultHandler) throws org.apache.thrift.TException {
         iface.submitImage(args.userToken, args.imageDescription, args.blockHashes,resultHandler);
       }
     }
 
-    public static class registerSatellite<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, registerSatellite_args, Integer> {
+    public static class registerSatellite<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, registerSatellite_args, java.lang.Integer> {
       public registerSatellite() {
         super("registerSatellite");
       }
@@ -3269,42 +3474,50 @@ public class MasterServer {
         return new registerSatellite_args();
       }
 
-      public AsyncMethodCallback<Integer> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<java.lang.Integer> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<Integer>() { 
-          public void onComplete(Integer o) {
+        return new org.apache.thrift.async.AsyncMethodCallback<java.lang.Integer>() { 
+          public void onComplete(java.lang.Integer o) {
             registerSatellite_result result = new registerSatellite_result();
             result.success = o;
             result.setSuccessIsSet(true);
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             registerSatellite_result result = new registerSatellite_result();
             if (e instanceof TInvocationException) {
-                        result.error = (TInvocationException) e;
-                        result.setErrorIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.error = (TInvocationException) e;
+              result.setErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -3313,12 +3526,12 @@ public class MasterServer {
         return false;
       }
 
-      public void start(I iface, registerSatellite_args args, org.apache.thrift.async.AsyncMethodCallback<Integer> resultHandler) throws TException {
+      public void start(I iface, registerSatellite_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Integer> resultHandler) throws org.apache.thrift.TException {
         iface.registerSatellite(args.userToken, args.displayName, args.addresses, args.modulus, args.exponent, args.certsha256,resultHandler);
       }
     }
 
-    public static class updateSatellite<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateSatellite_args, Boolean> {
+    public static class updateSatellite<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateSatellite_args, java.lang.Boolean> {
       public updateSatellite() {
         super("updateSatellite");
       }
@@ -3327,47 +3540,54 @@ public class MasterServer {
         return new updateSatellite_args();
       }
 
-      public AsyncMethodCallback<Boolean> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<Boolean>() { 
-          public void onComplete(Boolean o) {
+        return new org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean>() { 
+          public void onComplete(java.lang.Boolean o) {
             updateSatellite_result result = new updateSatellite_result();
             result.success = o;
             result.setSuccessIsSet(true);
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             updateSatellite_result result = new updateSatellite_result();
             if (e instanceof TAuthorizationException) {
-                        result.failure = (TAuthorizationException) e;
-                        result.setFailureIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TInvocationException) {
-                        result.error = (TInvocationException) e;
-                        result.setErrorIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.failure = (TAuthorizationException) e;
+              result.setFailureIsSet(true);
+              msg = result;
+            } else if (e instanceof TInvocationException) {
+              result.error = (TInvocationException) e;
+              result.setErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -3376,7 +3596,7 @@ public class MasterServer {
         return false;
       }
 
-      public void start(I iface, updateSatellite_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
+      public void start(I iface, updateSatellite_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Boolean> resultHandler) throws org.apache.thrift.TException {
         iface.updateSatellite(args.serverSessionId, args.displayName, args.addresses,resultHandler);
       }
     }
@@ -3390,51 +3610,57 @@ public class MasterServer {
         return new downloadImage_args();
       }
 
-      public AsyncMethodCallback<TransferInformation> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<TransferInformation> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<TransferInformation>() { 
+        return new org.apache.thrift.async.AsyncMethodCallback<TransferInformation>() { 
           public void onComplete(TransferInformation o) {
             downloadImage_result result = new downloadImage_result();
             result.success = o;
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             downloadImage_result result = new downloadImage_result();
             if (e instanceof TAuthorizationException) {
-                        result.failure = (TAuthorizationException) e;
-                        result.setFailureIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TInvocationException) {
-                        result.failure2 = (TInvocationException) e;
-                        result.setFailure2IsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TNotFoundException) {
-                        result.f3 = (TNotFoundException) e;
-                        result.setF3IsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.failure = (TAuthorizationException) e;
+              result.setFailureIsSet(true);
+              msg = result;
+            } else if (e instanceof TInvocationException) {
+              result.failure2 = (TInvocationException) e;
+              result.setFailure2IsSet(true);
+              msg = result;
+            } else if (e instanceof TNotFoundException) {
+              result.f3 = (TNotFoundException) e;
+              result.setF3IsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -3443,12 +3669,12 @@ public class MasterServer {
         return false;
       }
 
-      public void start(I iface, downloadImage_args args, org.apache.thrift.async.AsyncMethodCallback<TransferInformation> resultHandler) throws TException {
+      public void start(I iface, downloadImage_args args, org.apache.thrift.async.AsyncMethodCallback<TransferInformation> resultHandler) throws org.apache.thrift.TException {
         iface.downloadImage(args.sessionId, args.imageVersionId,resultHandler);
       }
     }
 
-    public static class getOrganizations<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getOrganizations_args, List<Organization>> {
+    public static class getOrganizations<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getOrganizations_args, java.util.List<Organization>> {
       public getOrganizations() {
         super("getOrganizations");
       }
@@ -3457,41 +3683,49 @@ public class MasterServer {
         return new getOrganizations_args();
       }
 
-      public AsyncMethodCallback<List<Organization>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<java.util.List<Organization>> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<List<Organization>>() { 
-          public void onComplete(List<Organization> o) {
+        return new org.apache.thrift.async.AsyncMethodCallback<java.util.List<Organization>>() { 
+          public void onComplete(java.util.List<Organization> o) {
             getOrganizations_result result = new getOrganizations_result();
             result.success = o;
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             getOrganizations_result result = new getOrganizations_result();
             if (e instanceof TInvocationException) {
-                        result.serverError = (TInvocationException) e;
-                        result.setServerErrorIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.serverError = (TInvocationException) e;
+              result.setServerErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -3500,12 +3734,12 @@ public class MasterServer {
         return false;
       }
 
-      public void start(I iface, getOrganizations_args args, org.apache.thrift.async.AsyncMethodCallback<List<Organization>> resultHandler) throws TException {
+      public void start(I iface, getOrganizations_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<Organization>> resultHandler) throws org.apache.thrift.TException {
         iface.getOrganizations(resultHandler);
       }
     }
 
-    public static class getOperatingSystems<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getOperatingSystems_args, List<OperatingSystem>> {
+    public static class getOperatingSystems<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getOperatingSystems_args, java.util.List<OperatingSystem>> {
       public getOperatingSystems() {
         super("getOperatingSystems");
       }
@@ -3514,41 +3748,49 @@ public class MasterServer {
         return new getOperatingSystems_args();
       }
 
-      public AsyncMethodCallback<List<OperatingSystem>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<java.util.List<OperatingSystem>> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<List<OperatingSystem>>() { 
-          public void onComplete(List<OperatingSystem> o) {
+        return new org.apache.thrift.async.AsyncMethodCallback<java.util.List<OperatingSystem>>() { 
+          public void onComplete(java.util.List<OperatingSystem> o) {
             getOperatingSystems_result result = new getOperatingSystems_result();
             result.success = o;
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             getOperatingSystems_result result = new getOperatingSystems_result();
             if (e instanceof TInvocationException) {
-                        result.serverError = (TInvocationException) e;
-                        result.setServerErrorIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.serverError = (TInvocationException) e;
+              result.setServerErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -3557,12 +3799,12 @@ public class MasterServer {
         return false;
       }
 
-      public void start(I iface, getOperatingSystems_args args, org.apache.thrift.async.AsyncMethodCallback<List<OperatingSystem>> resultHandler) throws TException {
+      public void start(I iface, getOperatingSystems_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<OperatingSystem>> resultHandler) throws org.apache.thrift.TException {
         iface.getOperatingSystems(resultHandler);
       }
     }
 
-    public static class getVirtualizers<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getVirtualizers_args, List<Virtualizer>> {
+    public static class getVirtualizers<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getVirtualizers_args, java.util.List<Virtualizer>> {
       public getVirtualizers() {
         super("getVirtualizers");
       }
@@ -3571,41 +3813,49 @@ public class MasterServer {
         return new getVirtualizers_args();
       }
 
-      public AsyncMethodCallback<List<Virtualizer>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<java.util.List<Virtualizer>> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<List<Virtualizer>>() { 
-          public void onComplete(List<Virtualizer> o) {
+        return new org.apache.thrift.async.AsyncMethodCallback<java.util.List<Virtualizer>>() { 
+          public void onComplete(java.util.List<Virtualizer> o) {
             getVirtualizers_result result = new getVirtualizers_result();
             result.success = o;
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             getVirtualizers_result result = new getVirtualizers_result();
             if (e instanceof TInvocationException) {
-                        result.serverError = (TInvocationException) e;
-                        result.setServerErrorIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.serverError = (TInvocationException) e;
+              result.setServerErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -3614,12 +3864,12 @@ public class MasterServer {
         return false;
       }
 
-      public void start(I iface, getVirtualizers_args args, org.apache.thrift.async.AsyncMethodCallback<List<Virtualizer>> resultHandler) throws TException {
+      public void start(I iface, getVirtualizers_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<Virtualizer>> resultHandler) throws org.apache.thrift.TException {
         iface.getVirtualizers(resultHandler);
       }
     }
 
-    public static class getTags<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getTags_args, List<MasterTag>> {
+    public static class getTags<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getTags_args, java.util.List<MasterTag>> {
       public getTags() {
         super("getTags");
       }
@@ -3628,41 +3878,49 @@ public class MasterServer {
         return new getTags_args();
       }
 
-      public AsyncMethodCallback<List<MasterTag>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<java.util.List<MasterTag>> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<List<MasterTag>>() { 
-          public void onComplete(List<MasterTag> o) {
+        return new org.apache.thrift.async.AsyncMethodCallback<java.util.List<MasterTag>>() { 
+          public void onComplete(java.util.List<MasterTag> o) {
             getTags_result result = new getTags_result();
             result.success = o;
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             getTags_result result = new getTags_result();
             if (e instanceof TInvocationException) {
-                        result.serverError = (TInvocationException) e;
-                        result.setServerErrorIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.serverError = (TInvocationException) e;
+              result.setServerErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -3671,12 +3929,12 @@ public class MasterServer {
         return false;
       }
 
-      public void start(I iface, getTags_args args, org.apache.thrift.async.AsyncMethodCallback<List<MasterTag>> resultHandler) throws TException {
+      public void start(I iface, getTags_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<MasterTag>> resultHandler) throws org.apache.thrift.TException {
         iface.getTags(args.startDate,resultHandler);
       }
     }
 
-    public static class getSoftware<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getSoftware_args, List<MasterSoftware>> {
+    public static class getSoftware<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getSoftware_args, java.util.List<MasterSoftware>> {
       public getSoftware() {
         super("getSoftware");
       }
@@ -3685,41 +3943,49 @@ public class MasterServer {
         return new getSoftware_args();
       }
 
-      public AsyncMethodCallback<List<MasterSoftware>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<java.util.List<MasterSoftware>> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<List<MasterSoftware>>() { 
-          public void onComplete(List<MasterSoftware> o) {
+        return new org.apache.thrift.async.AsyncMethodCallback<java.util.List<MasterSoftware>>() { 
+          public void onComplete(java.util.List<MasterSoftware> o) {
             getSoftware_result result = new getSoftware_result();
             result.success = o;
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             getSoftware_result result = new getSoftware_result();
             if (e instanceof TInvocationException) {
-                        result.serverError = (TInvocationException) e;
-                        result.setServerErrorIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.serverError = (TInvocationException) e;
+              result.setServerErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -3728,7 +3994,7 @@ public class MasterServer {
         return false;
       }
 
-      public void start(I iface, getSoftware_args args, org.apache.thrift.async.AsyncMethodCallback<List<MasterSoftware>> resultHandler) throws TException {
+      public void start(I iface, getSoftware_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<MasterSoftware>> resultHandler) throws org.apache.thrift.TException {
         iface.getSoftware(args.startDate,resultHandler);
       }
     }
@@ -3742,41 +4008,49 @@ public class MasterServer {
         return new queryUploadStatus_args();
       }
 
-      public AsyncMethodCallback<TransferStatus> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<TransferStatus> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<TransferStatus>() { 
+        return new org.apache.thrift.async.AsyncMethodCallback<TransferStatus>() { 
           public void onComplete(TransferStatus o) {
             queryUploadStatus_result result = new queryUploadStatus_result();
             result.success = o;
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             queryUploadStatus_result result = new queryUploadStatus_result();
             if (e instanceof TInvalidTokenException) {
-                        result.ex1 = (TInvalidTokenException) e;
-                        result.setEx1IsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.ex1 = (TInvalidTokenException) e;
+              result.setEx1IsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -3785,7 +4059,7 @@ public class MasterServer {
         return false;
       }
 
-      public void start(I iface, queryUploadStatus_args args, org.apache.thrift.async.AsyncMethodCallback<TransferStatus> resultHandler) throws TException {
+      public void start(I iface, queryUploadStatus_args args, org.apache.thrift.async.AsyncMethodCallback<TransferStatus> resultHandler) throws org.apache.thrift.TException {
         iface.queryUploadStatus(args.uploadToken,resultHandler);
       }
     }
@@ -3796,21 +4070,18 @@ public class MasterServer {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ping_args");
 
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new ping_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new ping_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ping_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ping_argsTupleSchemeFactory();
 
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
 ;
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -3818,6 +4089,7 @@ public class MasterServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           default:
@@ -3831,21 +4103,22 @@ public class MasterServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -3854,14 +4127,14 @@ public class MasterServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ping_args.class, metaDataMap);
     }
 
@@ -3882,32 +4155,31 @@ public class MasterServer {
     public void clear() {
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof ping_args)
         return this.equals((ping_args)that);
       return false;
@@ -3916,15 +4188,17 @@ public class MasterServer {
     public boolean equals(ping_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       return true;
     }
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -3938,21 +4212,22 @@ public class MasterServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("ping_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("ping_args(");
       boolean first = true;
 
       sb.append(")");
@@ -3972,7 +4247,7 @@ public class MasterServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -3980,13 +4255,13 @@ public class MasterServer {
       }
     }
 
-    private static class ping_argsStandardSchemeFactory implements SchemeFactory {
+    private static class ping_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public ping_argsStandardScheme getScheme() {
         return new ping_argsStandardScheme();
       }
     }
 
-    private static class ping_argsStandardScheme extends StandardScheme<ping_args> {
+    private static class ping_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<ping_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, ping_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -4019,25 +4294,28 @@ public class MasterServer {
 
     }
 
-    private static class ping_argsTupleSchemeFactory implements SchemeFactory {
+    private static class ping_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public ping_argsTupleScheme getScheme() {
         return new ping_argsTupleScheme();
       }
     }
 
-    private static class ping_argsTupleScheme extends TupleScheme<ping_args> {
+    private static class ping_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<ping_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, ping_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
       }
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, ping_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class ping_result implements org.apache.thrift.TBase<ping_result, ping_result._Fields>, java.io.Serializable, Cloneable, Comparable<ping_result>   {
@@ -4045,11 +4323,8 @@ public class MasterServer {
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.BOOL, (short)0);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new ping_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new ping_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ping_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ping_resultTupleSchemeFactory();
 
     public boolean success; // required
 
@@ -4057,10 +4332,10 @@ public class MasterServer {
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SUCCESS((short)0, "success");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -4068,6 +4343,7 @@ public class MasterServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
@@ -4083,21 +4359,22 @@ public class MasterServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -4106,7 +4383,7 @@ public class MasterServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
@@ -4114,12 +4391,12 @@ public class MasterServer {
     // isset id assignments
     private static final int __SUCCESS_ISSET_ID = 0;
     private byte __isset_bitfield = 0;
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ping_result.class, metaDataMap);
     }
 
@@ -4163,57 +4440,56 @@ public class MasterServer {
     }
 
     public void unsetSuccess() {
-      __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID);
+      __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID);
     }
 
     /** Returns true if field success is set (has been assigned a value) and false otherwise */
     public boolean isSetSuccess() {
-      return EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID);
+      return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID);
     }
 
     public void setSuccessIsSet(boolean value) {
-      __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value);
+      __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value);
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
           unsetSuccess();
         } else {
-          setSuccess((Boolean)value);
+          setSuccess((java.lang.Boolean)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
         return isSuccess();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
       case SUCCESS:
         return isSetSuccess();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof ping_result)
         return this.equals((ping_result)that);
       return false;
@@ -4222,6 +4498,8 @@ public class MasterServer {
     public boolean equals(ping_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_success = true;
       boolean that_present_success = true;
@@ -4237,14 +4515,11 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_success = true;
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
+      hashCode = hashCode * 8191 + ((success) ? 131071 : 524287);
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -4255,7 +4530,7 @@ public class MasterServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -4268,21 +4543,22 @@ public class MasterServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("ping_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("ping_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -4305,7 +4581,7 @@ public class MasterServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
         __isset_bitfield = 0;
@@ -4315,13 +4591,13 @@ public class MasterServer {
       }
     }
 
-    private static class ping_resultStandardSchemeFactory implements SchemeFactory {
+    private static class ping_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public ping_resultStandardScheme getScheme() {
         return new ping_resultStandardScheme();
       }
     }
 
-    private static class ping_resultStandardScheme extends StandardScheme<ping_result> {
+    private static class ping_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<ping_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, ping_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -4367,18 +4643,18 @@ public class MasterServer {
 
     }
 
-    private static class ping_resultTupleSchemeFactory implements SchemeFactory {
+    private static class ping_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public ping_resultTupleScheme getScheme() {
         return new ping_resultTupleScheme();
       }
     }
 
-    private static class ping_resultTupleScheme extends TupleScheme<ping_result> {
+    private static class ping_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<ping_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, ping_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
           optionals.set(0);
         }
@@ -4390,8 +4666,8 @@ public class MasterServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, ping_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(1);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
           struct.success = iprot.readBool();
           struct.setSuccessIsSet(true);
@@ -4399,6 +4675,9 @@ public class MasterServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class authenticate_args implements org.apache.thrift.TBase<authenticate_args, authenticate_args._Fields>, java.io.Serializable, Cloneable, Comparable<authenticate_args>   {
@@ -4407,24 +4686,21 @@ public class MasterServer {
     private static final org.apache.thrift.protocol.TField LOGIN_FIELD_DESC = new org.apache.thrift.protocol.TField("login", org.apache.thrift.protocol.TType.STRING, (short)1);
     private static final org.apache.thrift.protocol.TField PASSWORD_FIELD_DESC = new org.apache.thrift.protocol.TField("password", org.apache.thrift.protocol.TType.STRING, (short)2);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new authenticate_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new authenticate_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new authenticate_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new authenticate_argsTupleSchemeFactory();
 
-    public String login; // required
-    public String password; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String login; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String password; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       LOGIN((short)1, "login"),
       PASSWORD((short)2, "password");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -4432,6 +4708,7 @@ public class MasterServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // LOGIN
@@ -4449,21 +4726,22 @@ public class MasterServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -4472,20 +4750,20 @@ public class MasterServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.LOGIN, new org.apache.thrift.meta_data.FieldMetaData("login", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
       tmpMap.put(_Fields.PASSWORD, new org.apache.thrift.meta_data.FieldMetaData("password", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(authenticate_args.class, metaDataMap);
     }
 
@@ -4493,8 +4771,8 @@ public class MasterServer {
     }
 
     public authenticate_args(
-      String login,
-      String password)
+      java.lang.String login,
+      java.lang.String password)
     {
       this();
       this.login = login;
@@ -4523,11 +4801,12 @@ public class MasterServer {
       this.password = null;
     }
 
-    public String getLogin() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getLogin() {
       return this.login;
     }
 
-    public authenticate_args setLogin(String login) {
+    public authenticate_args setLogin(@org.apache.thrift.annotation.Nullable java.lang.String login) {
       this.login = login;
       return this;
     }
@@ -4547,11 +4826,12 @@ public class MasterServer {
       }
     }
 
-    public String getPassword() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getPassword() {
       return this.password;
     }
 
-    public authenticate_args setPassword(String password) {
+    public authenticate_args setPassword(@org.apache.thrift.annotation.Nullable java.lang.String password) {
       this.password = password;
       return this;
     }
@@ -4571,13 +4851,13 @@ public class MasterServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case LOGIN:
         if (value == null) {
           unsetLogin();
         } else {
-          setLogin((String)value);
+          setLogin((java.lang.String)value);
         }
         break;
 
@@ -4585,14 +4865,15 @@ public class MasterServer {
         if (value == null) {
           unsetPassword();
         } else {
-          setPassword((String)value);
+          setPassword((java.lang.String)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case LOGIN:
         return getLogin();
@@ -4601,13 +4882,13 @@ public class MasterServer {
         return getPassword();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -4616,13 +4897,11 @@ public class MasterServer {
       case PASSWORD:
         return isSetPassword();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof authenticate_args)
         return this.equals((authenticate_args)that);
       return false;
@@ -4631,6 +4910,8 @@ public class MasterServer {
     public boolean equals(authenticate_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_login = true && this.isSetLogin();
       boolean that_present_login = true && that.isSetLogin();
@@ -4655,19 +4936,17 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_login = true && (isSetLogin());
-      list.add(present_login);
-      if (present_login)
-        list.add(login);
+      hashCode = hashCode * 8191 + ((isSetLogin()) ? 131071 : 524287);
+      if (isSetLogin())
+        hashCode = hashCode * 8191 + login.hashCode();
 
-      boolean present_password = true && (isSetPassword());
-      list.add(present_password);
-      if (present_password)
-        list.add(password);
+      hashCode = hashCode * 8191 + ((isSetPassword()) ? 131071 : 524287);
+      if (isSetPassword())
+        hashCode = hashCode * 8191 + password.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -4678,7 +4957,7 @@ public class MasterServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetLogin()).compareTo(other.isSetLogin());
+      lastComparison = java.lang.Boolean.compare(isSetLogin(), other.isSetLogin());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -4688,7 +4967,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetPassword()).compareTo(other.isSetPassword());
+      lastComparison = java.lang.Boolean.compare(isSetPassword(), other.isSetPassword());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -4701,21 +4980,22 @@ public class MasterServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("authenticate_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("authenticate_args(");
       boolean first = true;
 
       sb.append("login:");
@@ -4750,7 +5030,7 @@ public class MasterServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -4758,13 +5038,13 @@ public class MasterServer {
       }
     }
 
-    private static class authenticate_argsStandardSchemeFactory implements SchemeFactory {
+    private static class authenticate_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public authenticate_argsStandardScheme getScheme() {
         return new authenticate_argsStandardScheme();
       }
     }
 
-    private static class authenticate_argsStandardScheme extends StandardScheme<authenticate_args> {
+    private static class authenticate_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<authenticate_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, authenticate_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -4823,18 +5103,18 @@ public class MasterServer {
 
     }
 
-    private static class authenticate_argsTupleSchemeFactory implements SchemeFactory {
+    private static class authenticate_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public authenticate_argsTupleScheme getScheme() {
         return new authenticate_argsTupleScheme();
       }
     }
 
-    private static class authenticate_argsTupleScheme extends TupleScheme<authenticate_args> {
+    private static class authenticate_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<authenticate_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, authenticate_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetLogin()) {
           optionals.set(0);
         }
@@ -4852,8 +5132,8 @@ public class MasterServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, authenticate_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(2);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           struct.login = iprot.readString();
           struct.setLoginIsSet(true);
@@ -4865,6 +5145,9 @@ public class MasterServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class authenticate_result implements org.apache.thrift.TBase<authenticate_result, authenticate_result._Fields>, java.io.Serializable, Cloneable, Comparable<authenticate_result>   {
@@ -4874,15 +5157,12 @@ public class MasterServer {
     private static final org.apache.thrift.protocol.TField FAILURE_FIELD_DESC = new org.apache.thrift.protocol.TField("failure", org.apache.thrift.protocol.TType.STRUCT, (short)1);
     private static final org.apache.thrift.protocol.TField ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("error", org.apache.thrift.protocol.TType.STRUCT, (short)2);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new authenticate_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new authenticate_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new authenticate_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new authenticate_resultTupleSchemeFactory();
 
-    public SessionData success; // required
-    public TAuthorizationException failure; // required
-    public TInvocationException error; // required
+    public @org.apache.thrift.annotation.Nullable SessionData success; // required
+    public @org.apache.thrift.annotation.Nullable TAuthorizationException failure; // required
+    public @org.apache.thrift.annotation.Nullable TInvocationException error; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -4890,10 +5170,10 @@ public class MasterServer {
       FAILURE((short)1, "failure"),
       ERROR((short)2, "error");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -4901,6 +5181,7 @@ public class MasterServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
@@ -4920,21 +5201,22 @@ public class MasterServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -4943,22 +5225,22 @@ public class MasterServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, SessionData.class)));
       tmpMap.put(_Fields.FAILURE, new org.apache.thrift.meta_data.FieldMetaData("failure", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class)));
       tmpMap.put(_Fields.ERROR, new org.apache.thrift.meta_data.FieldMetaData("error", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(authenticate_result.class, metaDataMap);
     }
 
@@ -5002,11 +5284,12 @@ public class MasterServer {
       this.error = null;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public SessionData getSuccess() {
       return this.success;
     }
 
-    public authenticate_result setSuccess(SessionData success) {
+    public authenticate_result setSuccess(@org.apache.thrift.annotation.Nullable SessionData success) {
       this.success = success;
       return this;
     }
@@ -5026,11 +5309,12 @@ public class MasterServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TAuthorizationException getFailure() {
       return this.failure;
     }
 
-    public authenticate_result setFailure(TAuthorizationException failure) {
+    public authenticate_result setFailure(@org.apache.thrift.annotation.Nullable TAuthorizationException failure) {
       this.failure = failure;
       return this;
     }
@@ -5050,11 +5334,12 @@ public class MasterServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvocationException getError() {
       return this.error;
     }
 
-    public authenticate_result setError(TInvocationException error) {
+    public authenticate_result setError(@org.apache.thrift.annotation.Nullable TInvocationException error) {
       this.error = error;
       return this;
     }
@@ -5074,7 +5359,7 @@ public class MasterServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
@@ -5103,7 +5388,8 @@ public class MasterServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
         return getSuccess();
@@ -5115,13 +5401,13 @@ public class MasterServer {
         return getError();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -5132,13 +5418,11 @@ public class MasterServer {
       case ERROR:
         return isSetError();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof authenticate_result)
         return this.equals((authenticate_result)that);
       return false;
@@ -5147,6 +5431,8 @@ public class MasterServer {
     public boolean equals(authenticate_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_success = true && this.isSetSuccess();
       boolean that_present_success = true && that.isSetSuccess();
@@ -5180,24 +5466,21 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
 
-      boolean present_failure = true && (isSetFailure());
-      list.add(present_failure);
-      if (present_failure)
-        list.add(failure);
+      hashCode = hashCode * 8191 + ((isSetFailure()) ? 131071 : 524287);
+      if (isSetFailure())
+        hashCode = hashCode * 8191 + failure.hashCode();
 
-      boolean present_error = true && (isSetError());
-      list.add(present_error);
-      if (present_error)
-        list.add(error);
+      hashCode = hashCode * 8191 + ((isSetError()) ? 131071 : 524287);
+      if (isSetError())
+        hashCode = hashCode * 8191 + error.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -5208,7 +5491,7 @@ public class MasterServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -5218,7 +5501,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure());
+      lastComparison = java.lang.Boolean.compare(isSetFailure(), other.isSetFailure());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -5228,7 +5511,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetError()).compareTo(other.isSetError());
+      lastComparison = java.lang.Boolean.compare(isSetError(), other.isSetError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -5241,21 +5524,22 @@ public class MasterServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("authenticate_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("authenticate_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -5301,7 +5585,7 @@ public class MasterServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -5309,13 +5593,13 @@ public class MasterServer {
       }
     }
 
-    private static class authenticate_resultStandardSchemeFactory implements SchemeFactory {
+    private static class authenticate_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public authenticate_resultStandardScheme getScheme() {
         return new authenticate_resultStandardScheme();
       }
     }
 
-    private static class authenticate_resultStandardScheme extends StandardScheme<authenticate_result> {
+    private static class authenticate_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<authenticate_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, authenticate_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -5390,18 +5674,18 @@ public class MasterServer {
 
     }
 
-    private static class authenticate_resultTupleSchemeFactory implements SchemeFactory {
+    private static class authenticate_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public authenticate_resultTupleScheme getScheme() {
         return new authenticate_resultTupleScheme();
       }
     }
 
-    private static class authenticate_resultTupleScheme extends TupleScheme<authenticate_result> {
+    private static class authenticate_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<authenticate_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, authenticate_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
           optionals.set(0);
         }
@@ -5425,8 +5709,8 @@ public class MasterServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, authenticate_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(3);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           struct.success = new SessionData();
           struct.success.read(iprot);
@@ -5445,6 +5729,9 @@ public class MasterServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class localAccountLogin_args implements org.apache.thrift.TBase<localAccountLogin_args, localAccountLogin_args._Fields>, java.io.Serializable, Cloneable, Comparable<localAccountLogin_args>   {
@@ -5453,24 +5740,21 @@ public class MasterServer {
     private static final org.apache.thrift.protocol.TField LOGIN_FIELD_DESC = new org.apache.thrift.protocol.TField("login", org.apache.thrift.protocol.TType.STRING, (short)1);
     private static final org.apache.thrift.protocol.TField PASSWORD_FIELD_DESC = new org.apache.thrift.protocol.TField("password", org.apache.thrift.protocol.TType.STRING, (short)2);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new localAccountLogin_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new localAccountLogin_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new localAccountLogin_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new localAccountLogin_argsTupleSchemeFactory();
 
-    public String login; // required
-    public String password; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String login; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String password; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       LOGIN((short)1, "login"),
       PASSWORD((short)2, "password");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -5478,6 +5762,7 @@ public class MasterServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // LOGIN
@@ -5495,21 +5780,22 @@ public class MasterServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -5518,20 +5804,20 @@ public class MasterServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.LOGIN, new org.apache.thrift.meta_data.FieldMetaData("login", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
       tmpMap.put(_Fields.PASSWORD, new org.apache.thrift.meta_data.FieldMetaData("password", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(localAccountLogin_args.class, metaDataMap);
     }
 
@@ -5539,8 +5825,8 @@ public class MasterServer {
     }
 
     public localAccountLogin_args(
-      String login,
-      String password)
+      java.lang.String login,
+      java.lang.String password)
     {
       this();
       this.login = login;
@@ -5569,11 +5855,12 @@ public class MasterServer {
       this.password = null;
     }
 
-    public String getLogin() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getLogin() {
       return this.login;
     }
 
-    public localAccountLogin_args setLogin(String login) {
+    public localAccountLogin_args setLogin(@org.apache.thrift.annotation.Nullable java.lang.String login) {
       this.login = login;
       return this;
     }
@@ -5593,11 +5880,12 @@ public class MasterServer {
       }
     }
 
-    public String getPassword() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getPassword() {
       return this.password;
     }
 
-    public localAccountLogin_args setPassword(String password) {
+    public localAccountLogin_args setPassword(@org.apache.thrift.annotation.Nullable java.lang.String password) {
       this.password = password;
       return this;
     }
@@ -5617,13 +5905,13 @@ public class MasterServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case LOGIN:
         if (value == null) {
           unsetLogin();
         } else {
-          setLogin((String)value);
+          setLogin((java.lang.String)value);
         }
         break;
 
@@ -5631,14 +5919,15 @@ public class MasterServer {
         if (value == null) {
           unsetPassword();
         } else {
-          setPassword((String)value);
+          setPassword((java.lang.String)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case LOGIN:
         return getLogin();
@@ -5647,13 +5936,13 @@ public class MasterServer {
         return getPassword();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -5662,13 +5951,11 @@ public class MasterServer {
       case PASSWORD:
         return isSetPassword();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof localAccountLogin_args)
         return this.equals((localAccountLogin_args)that);
       return false;
@@ -5677,6 +5964,8 @@ public class MasterServer {
     public boolean equals(localAccountLogin_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_login = true && this.isSetLogin();
       boolean that_present_login = true && that.isSetLogin();
@@ -5701,19 +5990,17 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_login = true && (isSetLogin());
-      list.add(present_login);
-      if (present_login)
-        list.add(login);
+      hashCode = hashCode * 8191 + ((isSetLogin()) ? 131071 : 524287);
+      if (isSetLogin())
+        hashCode = hashCode * 8191 + login.hashCode();
 
-      boolean present_password = true && (isSetPassword());
-      list.add(present_password);
-      if (present_password)
-        list.add(password);
+      hashCode = hashCode * 8191 + ((isSetPassword()) ? 131071 : 524287);
+      if (isSetPassword())
+        hashCode = hashCode * 8191 + password.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -5724,7 +6011,7 @@ public class MasterServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetLogin()).compareTo(other.isSetLogin());
+      lastComparison = java.lang.Boolean.compare(isSetLogin(), other.isSetLogin());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -5734,7 +6021,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetPassword()).compareTo(other.isSetPassword());
+      lastComparison = java.lang.Boolean.compare(isSetPassword(), other.isSetPassword());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -5747,21 +6034,22 @@ public class MasterServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("localAccountLogin_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("localAccountLogin_args(");
       boolean first = true;
 
       sb.append("login:");
@@ -5796,7 +6084,7 @@ public class MasterServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -5804,13 +6092,13 @@ public class MasterServer {
       }
     }
 
-    private static class localAccountLogin_argsStandardSchemeFactory implements SchemeFactory {
+    private static class localAccountLogin_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public localAccountLogin_argsStandardScheme getScheme() {
         return new localAccountLogin_argsStandardScheme();
       }
     }
 
-    private static class localAccountLogin_argsStandardScheme extends StandardScheme<localAccountLogin_args> {
+    private static class localAccountLogin_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<localAccountLogin_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, localAccountLogin_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -5869,18 +6157,18 @@ public class MasterServer {
 
     }
 
-    private static class localAccountLogin_argsTupleSchemeFactory implements SchemeFactory {
+    private static class localAccountLogin_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public localAccountLogin_argsTupleScheme getScheme() {
         return new localAccountLogin_argsTupleScheme();
       }
     }
 
-    private static class localAccountLogin_argsTupleScheme extends TupleScheme<localAccountLogin_args> {
+    private static class localAccountLogin_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<localAccountLogin_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, localAccountLogin_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetLogin()) {
           optionals.set(0);
         }
@@ -5898,8 +6186,8 @@ public class MasterServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, localAccountLogin_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(2);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           struct.login = iprot.readString();
           struct.setLoginIsSet(true);
@@ -5911,6 +6199,9 @@ public class MasterServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class localAccountLogin_result implements org.apache.thrift.TBase<localAccountLogin_result, localAccountLogin_result._Fields>, java.io.Serializable, Cloneable, Comparable<localAccountLogin_result>   {
@@ -5920,15 +6211,12 @@ public class MasterServer {
     private static final org.apache.thrift.protocol.TField FAILURE_FIELD_DESC = new org.apache.thrift.protocol.TField("failure", org.apache.thrift.protocol.TType.STRUCT, (short)1);
     private static final org.apache.thrift.protocol.TField ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("error", org.apache.thrift.protocol.TType.STRUCT, (short)2);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new localAccountLogin_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new localAccountLogin_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new localAccountLogin_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new localAccountLogin_resultTupleSchemeFactory();
 
-    public ClientSessionData success; // required
-    public TAuthorizationException failure; // required
-    public TInvocationException error; // required
+    public @org.apache.thrift.annotation.Nullable ClientSessionData success; // required
+    public @org.apache.thrift.annotation.Nullable TAuthorizationException failure; // required
+    public @org.apache.thrift.annotation.Nullable TInvocationException error; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -5936,10 +6224,10 @@ public class MasterServer {
       FAILURE((short)1, "failure"),
       ERROR((short)2, "error");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -5947,6 +6235,7 @@ public class MasterServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
@@ -5966,21 +6255,22 @@ public class MasterServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -5989,22 +6279,22 @@ public class MasterServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ClientSessionData.class)));
       tmpMap.put(_Fields.FAILURE, new org.apache.thrift.meta_data.FieldMetaData("failure", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class)));
       tmpMap.put(_Fields.ERROR, new org.apache.thrift.meta_data.FieldMetaData("error", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(localAccountLogin_result.class, metaDataMap);
     }
 
@@ -6048,11 +6338,12 @@ public class MasterServer {
       this.error = null;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public ClientSessionData getSuccess() {
       return this.success;
     }
 
-    public localAccountLogin_result setSuccess(ClientSessionData success) {
+    public localAccountLogin_result setSuccess(@org.apache.thrift.annotation.Nullable ClientSessionData success) {
       this.success = success;
       return this;
     }
@@ -6072,11 +6363,12 @@ public class MasterServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TAuthorizationException getFailure() {
       return this.failure;
     }
 
-    public localAccountLogin_result setFailure(TAuthorizationException failure) {
+    public localAccountLogin_result setFailure(@org.apache.thrift.annotation.Nullable TAuthorizationException failure) {
       this.failure = failure;
       return this;
     }
@@ -6096,11 +6388,12 @@ public class MasterServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvocationException getError() {
       return this.error;
     }
 
-    public localAccountLogin_result setError(TInvocationException error) {
+    public localAccountLogin_result setError(@org.apache.thrift.annotation.Nullable TInvocationException error) {
       this.error = error;
       return this;
     }
@@ -6120,7 +6413,7 @@ public class MasterServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
@@ -6149,7 +6442,8 @@ public class MasterServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
         return getSuccess();
@@ -6161,13 +6455,13 @@ public class MasterServer {
         return getError();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -6178,13 +6472,11 @@ public class MasterServer {
       case ERROR:
         return isSetError();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof localAccountLogin_result)
         return this.equals((localAccountLogin_result)that);
       return false;
@@ -6193,6 +6485,8 @@ public class MasterServer {
     public boolean equals(localAccountLogin_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_success = true && this.isSetSuccess();
       boolean that_present_success = true && that.isSetSuccess();
@@ -6226,24 +6520,21 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
 
-      boolean present_failure = true && (isSetFailure());
-      list.add(present_failure);
-      if (present_failure)
-        list.add(failure);
+      hashCode = hashCode * 8191 + ((isSetFailure()) ? 131071 : 524287);
+      if (isSetFailure())
+        hashCode = hashCode * 8191 + failure.hashCode();
 
-      boolean present_error = true && (isSetError());
-      list.add(present_error);
-      if (present_error)
-        list.add(error);
+      hashCode = hashCode * 8191 + ((isSetError()) ? 131071 : 524287);
+      if (isSetError())
+        hashCode = hashCode * 8191 + error.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -6254,7 +6545,7 @@ public class MasterServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -6264,7 +6555,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure());
+      lastComparison = java.lang.Boolean.compare(isSetFailure(), other.isSetFailure());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -6274,7 +6565,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetError()).compareTo(other.isSetError());
+      lastComparison = java.lang.Boolean.compare(isSetError(), other.isSetError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -6287,21 +6578,22 @@ public class MasterServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("localAccountLogin_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("localAccountLogin_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -6347,7 +6639,7 @@ public class MasterServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -6355,13 +6647,13 @@ public class MasterServer {
       }
     }
 
-    private static class localAccountLogin_resultStandardSchemeFactory implements SchemeFactory {
+    private static class localAccountLogin_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public localAccountLogin_resultStandardScheme getScheme() {
         return new localAccountLogin_resultStandardScheme();
       }
     }
 
-    private static class localAccountLogin_resultStandardScheme extends StandardScheme<localAccountLogin_result> {
+    private static class localAccountLogin_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<localAccountLogin_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, localAccountLogin_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -6436,18 +6728,18 @@ public class MasterServer {
 
     }
 
-    private static class localAccountLogin_resultTupleSchemeFactory implements SchemeFactory {
+    private static class localAccountLogin_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public localAccountLogin_resultTupleScheme getScheme() {
         return new localAccountLogin_resultTupleScheme();
       }
     }
 
-    private static class localAccountLogin_resultTupleScheme extends TupleScheme<localAccountLogin_result> {
+    private static class localAccountLogin_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<localAccountLogin_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, localAccountLogin_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
           optionals.set(0);
         }
@@ -6471,8 +6763,8 @@ public class MasterServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, localAccountLogin_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(3);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           struct.success = new ClientSessionData();
           struct.success.read(iprot);
@@ -6491,6 +6783,9 @@ public class MasterServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class setUsedSatellite_args implements org.apache.thrift.TBase<setUsedSatellite_args, setUsedSatellite_args._Fields>, java.io.Serializable, Cloneable, Comparable<setUsedSatellite_args>   {
@@ -6499,24 +6794,21 @@ public class MasterServer {
     private static final org.apache.thrift.protocol.TField SESSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("sessionId", org.apache.thrift.protocol.TType.STRING, (short)1);
     private static final org.apache.thrift.protocol.TField SATELLITE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("satelliteName", org.apache.thrift.protocol.TType.STRING, (short)2);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new setUsedSatellite_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new setUsedSatellite_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setUsedSatellite_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setUsedSatellite_argsTupleSchemeFactory();
 
-    public String sessionId; // required
-    public String satelliteName; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String sessionId; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String satelliteName; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SESSION_ID((short)1, "sessionId"),
       SATELLITE_NAME((short)2, "satelliteName");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -6524,6 +6816,7 @@ public class MasterServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // SESSION_ID
@@ -6541,21 +6834,22 @@ public class MasterServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -6564,20 +6858,20 @@ public class MasterServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SESSION_ID, new org.apache.thrift.meta_data.FieldMetaData("sessionId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
       tmpMap.put(_Fields.SATELLITE_NAME, new org.apache.thrift.meta_data.FieldMetaData("satelliteName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setUsedSatellite_args.class, metaDataMap);
     }
 
@@ -6585,8 +6879,8 @@ public class MasterServer {
     }
 
     public setUsedSatellite_args(
-      String sessionId,
-      String satelliteName)
+      java.lang.String sessionId,
+      java.lang.String satelliteName)
     {
       this();
       this.sessionId = sessionId;
@@ -6615,11 +6909,12 @@ public class MasterServer {
       this.satelliteName = null;
     }
 
-    public String getSessionId() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getSessionId() {
       return this.sessionId;
     }
 
-    public setUsedSatellite_args setSessionId(String sessionId) {
+    public setUsedSatellite_args setSessionId(@org.apache.thrift.annotation.Nullable java.lang.String sessionId) {
       this.sessionId = sessionId;
       return this;
     }
@@ -6639,11 +6934,12 @@ public class MasterServer {
       }
     }
 
-    public String getSatelliteName() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getSatelliteName() {
       return this.satelliteName;
     }
 
-    public setUsedSatellite_args setSatelliteName(String satelliteName) {
+    public setUsedSatellite_args setSatelliteName(@org.apache.thrift.annotation.Nullable java.lang.String satelliteName) {
       this.satelliteName = satelliteName;
       return this;
     }
@@ -6663,13 +6959,13 @@ public class MasterServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SESSION_ID:
         if (value == null) {
           unsetSessionId();
         } else {
-          setSessionId((String)value);
+          setSessionId((java.lang.String)value);
         }
         break;
 
@@ -6677,14 +6973,15 @@ public class MasterServer {
         if (value == null) {
           unsetSatelliteName();
         } else {
-          setSatelliteName((String)value);
+          setSatelliteName((java.lang.String)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SESSION_ID:
         return getSessionId();
@@ -6693,13 +6990,13 @@ public class MasterServer {
         return getSatelliteName();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -6708,13 +7005,11 @@ public class MasterServer {
       case SATELLITE_NAME:
         return isSetSatelliteName();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof setUsedSatellite_args)
         return this.equals((setUsedSatellite_args)that);
       return false;
@@ -6723,6 +7018,8 @@ public class MasterServer {
     public boolean equals(setUsedSatellite_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_sessionId = true && this.isSetSessionId();
       boolean that_present_sessionId = true && that.isSetSessionId();
@@ -6747,19 +7044,17 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_sessionId = true && (isSetSessionId());
-      list.add(present_sessionId);
-      if (present_sessionId)
-        list.add(sessionId);
+      hashCode = hashCode * 8191 + ((isSetSessionId()) ? 131071 : 524287);
+      if (isSetSessionId())
+        hashCode = hashCode * 8191 + sessionId.hashCode();
 
-      boolean present_satelliteName = true && (isSetSatelliteName());
-      list.add(present_satelliteName);
-      if (present_satelliteName)
-        list.add(satelliteName);
+      hashCode = hashCode * 8191 + ((isSetSatelliteName()) ? 131071 : 524287);
+      if (isSetSatelliteName())
+        hashCode = hashCode * 8191 + satelliteName.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -6770,7 +7065,7 @@ public class MasterServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSessionId()).compareTo(other.isSetSessionId());
+      lastComparison = java.lang.Boolean.compare(isSetSessionId(), other.isSetSessionId());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -6780,7 +7075,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetSatelliteName()).compareTo(other.isSetSatelliteName());
+      lastComparison = java.lang.Boolean.compare(isSetSatelliteName(), other.isSetSatelliteName());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -6793,21 +7088,22 @@ public class MasterServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("setUsedSatellite_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("setUsedSatellite_args(");
       boolean first = true;
 
       sb.append("sessionId:");
@@ -6842,7 +7138,7 @@ public class MasterServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -6850,13 +7146,13 @@ public class MasterServer {
       }
     }
 
-    private static class setUsedSatellite_argsStandardSchemeFactory implements SchemeFactory {
+    private static class setUsedSatellite_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public setUsedSatellite_argsStandardScheme getScheme() {
         return new setUsedSatellite_argsStandardScheme();
       }
     }
 
-    private static class setUsedSatellite_argsStandardScheme extends StandardScheme<setUsedSatellite_args> {
+    private static class setUsedSatellite_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<setUsedSatellite_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, setUsedSatellite_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -6915,18 +7211,18 @@ public class MasterServer {
 
     }
 
-    private static class setUsedSatellite_argsTupleSchemeFactory implements SchemeFactory {
+    private static class setUsedSatellite_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public setUsedSatellite_argsTupleScheme getScheme() {
         return new setUsedSatellite_argsTupleScheme();
       }
     }
 
-    private static class setUsedSatellite_argsTupleScheme extends TupleScheme<setUsedSatellite_args> {
+    private static class setUsedSatellite_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<setUsedSatellite_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, setUsedSatellite_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSessionId()) {
           optionals.set(0);
         }
@@ -6944,8 +7240,8 @@ public class MasterServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, setUsedSatellite_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(2);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           struct.sessionId = iprot.readString();
           struct.setSessionIdIsSet(true);
@@ -6957,27 +7253,27 @@ public class MasterServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class setUsedSatellite_result implements org.apache.thrift.TBase<setUsedSatellite_result, setUsedSatellite_result._Fields>, java.io.Serializable, Cloneable, Comparable<setUsedSatellite_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("setUsedSatellite_result");
 
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new setUsedSatellite_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new setUsedSatellite_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setUsedSatellite_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setUsedSatellite_resultTupleSchemeFactory();
 
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
 ;
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -6985,6 +7281,7 @@ public class MasterServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           default:
@@ -6998,21 +7295,22 @@ public class MasterServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -7021,14 +7319,14 @@ public class MasterServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setUsedSatellite_result.class, metaDataMap);
     }
 
@@ -7049,32 +7347,31 @@ public class MasterServer {
     public void clear() {
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof setUsedSatellite_result)
         return this.equals((setUsedSatellite_result)that);
       return false;
@@ -7083,15 +7380,17 @@ public class MasterServer {
     public boolean equals(setUsedSatellite_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       return true;
     }
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -7105,21 +7404,22 @@ public class MasterServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("setUsedSatellite_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("setUsedSatellite_result(");
       boolean first = true;
 
       sb.append(")");
@@ -7139,7 +7439,7 @@ public class MasterServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -7147,13 +7447,13 @@ public class MasterServer {
       }
     }
 
-    private static class setUsedSatellite_resultStandardSchemeFactory implements SchemeFactory {
+    private static class setUsedSatellite_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public setUsedSatellite_resultStandardScheme getScheme() {
         return new setUsedSatellite_resultStandardScheme();
       }
     }
 
-    private static class setUsedSatellite_resultStandardScheme extends StandardScheme<setUsedSatellite_result> {
+    private static class setUsedSatellite_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<setUsedSatellite_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, setUsedSatellite_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -7186,25 +7486,28 @@ public class MasterServer {
 
     }
 
-    private static class setUsedSatellite_resultTupleSchemeFactory implements SchemeFactory {
+    private static class setUsedSatellite_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public setUsedSatellite_resultTupleScheme getScheme() {
         return new setUsedSatellite_resultTupleScheme();
       }
     }
 
-    private static class setUsedSatellite_resultTupleScheme extends TupleScheme<setUsedSatellite_result> {
+    private static class setUsedSatellite_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<setUsedSatellite_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, setUsedSatellite_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
       }
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, setUsedSatellite_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class findUser_args implements org.apache.thrift.TBase<findUser_args, findUser_args._Fields>, java.io.Serializable, Cloneable, Comparable<findUser_args>   {
@@ -7214,15 +7517,12 @@ public class MasterServer {
     private static final org.apache.thrift.protocol.TField ORGANIZATION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("organizationId", org.apache.thrift.protocol.TType.STRING, (short)2);
     private static final org.apache.thrift.protocol.TField SEARCH_TERM_FIELD_DESC = new org.apache.thrift.protocol.TField("searchTerm", org.apache.thrift.protocol.TType.STRING, (short)3);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new findUser_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new findUser_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new findUser_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new findUser_argsTupleSchemeFactory();
 
-    public String sessionId; // required
-    public String organizationId; // required
-    public String searchTerm; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String sessionId; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String organizationId; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String searchTerm; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -7230,10 +7530,10 @@ public class MasterServer {
       ORGANIZATION_ID((short)2, "organizationId"),
       SEARCH_TERM((short)3, "searchTerm");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -7241,6 +7541,7 @@ public class MasterServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // SESSION_ID
@@ -7260,21 +7561,22 @@ public class MasterServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -7283,22 +7585,22 @@ public class MasterServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SESSION_ID, new org.apache.thrift.meta_data.FieldMetaData("sessionId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
       tmpMap.put(_Fields.ORGANIZATION_ID, new org.apache.thrift.meta_data.FieldMetaData("organizationId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
       tmpMap.put(_Fields.SEARCH_TERM, new org.apache.thrift.meta_data.FieldMetaData("searchTerm", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(findUser_args.class, metaDataMap);
     }
 
@@ -7306,9 +7608,9 @@ public class MasterServer {
     }
 
     public findUser_args(
-      String sessionId,
-      String organizationId,
-      String searchTerm)
+      java.lang.String sessionId,
+      java.lang.String organizationId,
+      java.lang.String searchTerm)
     {
       this();
       this.sessionId = sessionId;
@@ -7342,11 +7644,12 @@ public class MasterServer {
       this.searchTerm = null;
     }
 
-    public String getSessionId() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getSessionId() {
       return this.sessionId;
     }
 
-    public findUser_args setSessionId(String sessionId) {
+    public findUser_args setSessionId(@org.apache.thrift.annotation.Nullable java.lang.String sessionId) {
       this.sessionId = sessionId;
       return this;
     }
@@ -7366,11 +7669,12 @@ public class MasterServer {
       }
     }
 
-    public String getOrganizationId() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getOrganizationId() {
       return this.organizationId;
     }
 
-    public findUser_args setOrganizationId(String organizationId) {
+    public findUser_args setOrganizationId(@org.apache.thrift.annotation.Nullable java.lang.String organizationId) {
       this.organizationId = organizationId;
       return this;
     }
@@ -7390,11 +7694,12 @@ public class MasterServer {
       }
     }
 
-    public String getSearchTerm() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getSearchTerm() {
       return this.searchTerm;
     }
 
-    public findUser_args setSearchTerm(String searchTerm) {
+    public findUser_args setSearchTerm(@org.apache.thrift.annotation.Nullable java.lang.String searchTerm) {
       this.searchTerm = searchTerm;
       return this;
     }
@@ -7414,13 +7719,13 @@ public class MasterServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SESSION_ID:
         if (value == null) {
           unsetSessionId();
         } else {
-          setSessionId((String)value);
+          setSessionId((java.lang.String)value);
         }
         break;
 
@@ -7428,7 +7733,7 @@ public class MasterServer {
         if (value == null) {
           unsetOrganizationId();
         } else {
-          setOrganizationId((String)value);
+          setOrganizationId((java.lang.String)value);
         }
         break;
 
@@ -7436,14 +7741,15 @@ public class MasterServer {
         if (value == null) {
           unsetSearchTerm();
         } else {
-          setSearchTerm((String)value);
+          setSearchTerm((java.lang.String)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SESSION_ID:
         return getSessionId();
@@ -7455,13 +7761,13 @@ public class MasterServer {
         return getSearchTerm();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -7472,13 +7778,11 @@ public class MasterServer {
       case SEARCH_TERM:
         return isSetSearchTerm();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof findUser_args)
         return this.equals((findUser_args)that);
       return false;
@@ -7487,6 +7791,8 @@ public class MasterServer {
     public boolean equals(findUser_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_sessionId = true && this.isSetSessionId();
       boolean that_present_sessionId = true && that.isSetSessionId();
@@ -7520,24 +7826,21 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_sessionId = true && (isSetSessionId());
-      list.add(present_sessionId);
-      if (present_sessionId)
-        list.add(sessionId);
+      hashCode = hashCode * 8191 + ((isSetSessionId()) ? 131071 : 524287);
+      if (isSetSessionId())
+        hashCode = hashCode * 8191 + sessionId.hashCode();
 
-      boolean present_organizationId = true && (isSetOrganizationId());
-      list.add(present_organizationId);
-      if (present_organizationId)
-        list.add(organizationId);
+      hashCode = hashCode * 8191 + ((isSetOrganizationId()) ? 131071 : 524287);
+      if (isSetOrganizationId())
+        hashCode = hashCode * 8191 + organizationId.hashCode();
 
-      boolean present_searchTerm = true && (isSetSearchTerm());
-      list.add(present_searchTerm);
-      if (present_searchTerm)
-        list.add(searchTerm);
+      hashCode = hashCode * 8191 + ((isSetSearchTerm()) ? 131071 : 524287);
+      if (isSetSearchTerm())
+        hashCode = hashCode * 8191 + searchTerm.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -7548,7 +7851,7 @@ public class MasterServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSessionId()).compareTo(other.isSetSessionId());
+      lastComparison = java.lang.Boolean.compare(isSetSessionId(), other.isSetSessionId());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -7558,7 +7861,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetOrganizationId()).compareTo(other.isSetOrganizationId());
+      lastComparison = java.lang.Boolean.compare(isSetOrganizationId(), other.isSetOrganizationId());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -7568,7 +7871,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetSearchTerm()).compareTo(other.isSetSearchTerm());
+      lastComparison = java.lang.Boolean.compare(isSetSearchTerm(), other.isSetSearchTerm());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -7581,21 +7884,22 @@ public class MasterServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("findUser_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("findUser_args(");
       boolean first = true;
 
       sb.append("sessionId:");
@@ -7638,7 +7942,7 @@ public class MasterServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -7646,13 +7950,13 @@ public class MasterServer {
       }
     }
 
-    private static class findUser_argsStandardSchemeFactory implements SchemeFactory {
+    private static class findUser_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public findUser_argsStandardScheme getScheme() {
         return new findUser_argsStandardScheme();
       }
     }
 
-    private static class findUser_argsStandardScheme extends StandardScheme<findUser_args> {
+    private static class findUser_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<findUser_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, findUser_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -7724,18 +8028,18 @@ public class MasterServer {
 
     }
 
-    private static class findUser_argsTupleSchemeFactory implements SchemeFactory {
+    private static class findUser_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public findUser_argsTupleScheme getScheme() {
         return new findUser_argsTupleScheme();
       }
     }
 
-    private static class findUser_argsTupleScheme extends TupleScheme<findUser_args> {
+    private static class findUser_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<findUser_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, findUser_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSessionId()) {
           optionals.set(0);
         }
@@ -7759,8 +8063,8 @@ public class MasterServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, findUser_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(3);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           struct.sessionId = iprot.readString();
           struct.setSessionIdIsSet(true);
@@ -7776,6 +8080,9 @@ public class MasterServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class findUser_result implements org.apache.thrift.TBase<findUser_result, findUser_result._Fields>, java.io.Serializable, Cloneable, Comparable<findUser_result>   {
@@ -7785,15 +8092,12 @@ public class MasterServer {
     private static final org.apache.thrift.protocol.TField FAILURE_FIELD_DESC = new org.apache.thrift.protocol.TField("failure", org.apache.thrift.protocol.TType.STRUCT, (short)1);
     private static final org.apache.thrift.protocol.TField ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("error", org.apache.thrift.protocol.TType.STRUCT, (short)2);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new findUser_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new findUser_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new findUser_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new findUser_resultTupleSchemeFactory();
 
-    public List<UserInfo> success; // required
-    public TAuthorizationException failure; // required
-    public TInvocationException error; // required
+    public @org.apache.thrift.annotation.Nullable java.util.List<UserInfo> success; // required
+    public @org.apache.thrift.annotation.Nullable TAuthorizationException failure; // required
+    public @org.apache.thrift.annotation.Nullable TInvocationException error; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -7801,10 +8105,10 @@ public class MasterServer {
       FAILURE((short)1, "failure"),
       ERROR((short)2, "error");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -7812,6 +8116,7 @@ public class MasterServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
@@ -7831,21 +8136,22 @@ public class MasterServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -7854,23 +8160,23 @@ public class MasterServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
               new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, UserInfo.class))));
       tmpMap.put(_Fields.FAILURE, new org.apache.thrift.meta_data.FieldMetaData("failure", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class)));
       tmpMap.put(_Fields.ERROR, new org.apache.thrift.meta_data.FieldMetaData("error", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(findUser_result.class, metaDataMap);
     }
 
@@ -7878,7 +8184,7 @@ public class MasterServer {
     }
 
     public findUser_result(
-      List<UserInfo> success,
+      java.util.List<UserInfo> success,
       TAuthorizationException failure,
       TInvocationException error)
     {
@@ -7893,7 +8199,7 @@ public class MasterServer {
      */
     public findUser_result(findUser_result other) {
       if (other.isSetSuccess()) {
-        List<UserInfo> __this__success = new ArrayList<UserInfo>(other.success.size());
+        java.util.List<UserInfo> __this__success = new java.util.ArrayList<UserInfo>(other.success.size());
         for (UserInfo other_element : other.success) {
           __this__success.add(new UserInfo(other_element));
         }
@@ -7922,22 +8228,24 @@ public class MasterServer {
       return (this.success == null) ? 0 : this.success.size();
     }
 
+    @org.apache.thrift.annotation.Nullable
     public java.util.Iterator<UserInfo> getSuccessIterator() {
       return (this.success == null) ? null : this.success.iterator();
     }
 
     public void addToSuccess(UserInfo elem) {
       if (this.success == null) {
-        this.success = new ArrayList<UserInfo>();
+        this.success = new java.util.ArrayList<UserInfo>();
       }
       this.success.add(elem);
     }
 
-    public List<UserInfo> getSuccess() {
+    @org.apache.thrift.annotation.Nullable
+    public java.util.List<UserInfo> getSuccess() {
       return this.success;
     }
 
-    public findUser_result setSuccess(List<UserInfo> success) {
+    public findUser_result setSuccess(@org.apache.thrift.annotation.Nullable java.util.List<UserInfo> success) {
       this.success = success;
       return this;
     }
@@ -7957,11 +8265,12 @@ public class MasterServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TAuthorizationException getFailure() {
       return this.failure;
     }
 
-    public findUser_result setFailure(TAuthorizationException failure) {
+    public findUser_result setFailure(@org.apache.thrift.annotation.Nullable TAuthorizationException failure) {
       this.failure = failure;
       return this;
     }
@@ -7981,11 +8290,12 @@ public class MasterServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvocationException getError() {
       return this.error;
     }
 
-    public findUser_result setError(TInvocationException error) {
+    public findUser_result setError(@org.apache.thrift.annotation.Nullable TInvocationException error) {
       this.error = error;
       return this;
     }
@@ -8005,13 +8315,13 @@ public class MasterServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
           unsetSuccess();
         } else {
-          setSuccess((List<UserInfo>)value);
+          setSuccess((java.util.List<UserInfo>)value);
         }
         break;
 
@@ -8034,7 +8344,8 @@ public class MasterServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
         return getSuccess();
@@ -8046,13 +8357,13 @@ public class MasterServer {
         return getError();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -8063,13 +8374,11 @@ public class MasterServer {
       case ERROR:
         return isSetError();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof findUser_result)
         return this.equals((findUser_result)that);
       return false;
@@ -8078,6 +8387,8 @@ public class MasterServer {
     public boolean equals(findUser_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_success = true && this.isSetSuccess();
       boolean that_present_success = true && that.isSetSuccess();
@@ -8111,24 +8422,21 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
 
-      boolean present_failure = true && (isSetFailure());
-      list.add(present_failure);
-      if (present_failure)
-        list.add(failure);
+      hashCode = hashCode * 8191 + ((isSetFailure()) ? 131071 : 524287);
+      if (isSetFailure())
+        hashCode = hashCode * 8191 + failure.hashCode();
 
-      boolean present_error = true && (isSetError());
-      list.add(present_error);
-      if (present_error)
-        list.add(error);
+      hashCode = hashCode * 8191 + ((isSetError()) ? 131071 : 524287);
+      if (isSetError())
+        hashCode = hashCode * 8191 + error.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -8139,7 +8447,7 @@ public class MasterServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -8149,7 +8457,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure());
+      lastComparison = java.lang.Boolean.compare(isSetFailure(), other.isSetFailure());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -8159,7 +8467,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetError()).compareTo(other.isSetError());
+      lastComparison = java.lang.Boolean.compare(isSetError(), other.isSetError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -8172,21 +8480,22 @@ public class MasterServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("findUser_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("findUser_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -8229,7 +8538,7 @@ public class MasterServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -8237,13 +8546,13 @@ public class MasterServer {
       }
     }
 
-    private static class findUser_resultStandardSchemeFactory implements SchemeFactory {
+    private static class findUser_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public findUser_resultStandardScheme getScheme() {
         return new findUser_resultStandardScheme();
       }
     }
 
-    private static class findUser_resultStandardScheme extends StandardScheme<findUser_result> {
+    private static class findUser_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<findUser_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, findUser_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -8258,14 +8567,14 @@ public class MasterServer {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list306 = iprot.readListBegin();
-                  struct.success = new ArrayList<UserInfo>(_list306.size);
-                  UserInfo _elem307;
-                  for (int _i308 = 0; _i308 < _list306.size; ++_i308)
+                  org.apache.thrift.protocol.TList _list418 = iprot.readListBegin();
+                  struct.success = new java.util.ArrayList<UserInfo>(_list418.size);
+                  @org.apache.thrift.annotation.Nullable UserInfo _elem419;
+                  for (int _i420 = 0; _i420 < _list418.size; ++_i420)
                   {
-                    _elem307 = new UserInfo();
-                    _elem307.read(iprot);
-                    struct.success.add(_elem307);
+                    _elem419 = new UserInfo();
+                    _elem419.read(iprot);
+                    struct.success.add(_elem419);
                   }
                   iprot.readListEnd();
                 }
@@ -8311,9 +8620,9 @@ public class MasterServer {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
-            for (UserInfo _iter309 : struct.success)
+            for (UserInfo _iter421 : struct.success)
             {
-              _iter309.write(oprot);
+              _iter421.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -8335,18 +8644,18 @@ public class MasterServer {
 
     }
 
-    private static class findUser_resultTupleSchemeFactory implements SchemeFactory {
+    private static class findUser_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public findUser_resultTupleScheme getScheme() {
         return new findUser_resultTupleScheme();
       }
     }
 
-    private static class findUser_resultTupleScheme extends TupleScheme<findUser_result> {
+    private static class findUser_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<findUser_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, findUser_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
           optionals.set(0);
         }
@@ -8360,9 +8669,9 @@ public class MasterServer {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (UserInfo _iter310 : struct.success)
+            for (UserInfo _iter422 : struct.success)
             {
-              _iter310.write(oprot);
+              _iter422.write(oprot);
             }
           }
         }
@@ -8376,18 +8685,18 @@ public class MasterServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, findUser_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(3);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list311 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new ArrayList<UserInfo>(_list311.size);
-            UserInfo _elem312;
-            for (int _i313 = 0; _i313 < _list311.size; ++_i313)
+            org.apache.thrift.protocol.TList _list423 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.success = new java.util.ArrayList<UserInfo>(_list423.size);
+            @org.apache.thrift.annotation.Nullable UserInfo _elem424;
+            for (int _i425 = 0; _i425 < _list423.size; ++_i425)
             {
-              _elem312 = new UserInfo();
-              _elem312.read(iprot);
-              struct.success.add(_elem312);
+              _elem424 = new UserInfo();
+              _elem424.read(iprot);
+              struct.success.add(_elem424);
             }
           }
           struct.setSuccessIsSet(true);
@@ -8405,6 +8714,9 @@ public class MasterServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getPublicImages_args implements org.apache.thrift.TBase<getPublicImages_args, getPublicImages_args._Fields>, java.io.Serializable, Cloneable, Comparable<getPublicImages_args>   {
@@ -8413,13 +8725,10 @@ public class MasterServer {
     private static final org.apache.thrift.protocol.TField SESSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("sessionId", org.apache.thrift.protocol.TType.STRING, (short)1);
     private static final org.apache.thrift.protocol.TField PAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("page", org.apache.thrift.protocol.TType.I32, (short)2);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getPublicImages_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getPublicImages_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getPublicImages_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getPublicImages_argsTupleSchemeFactory();
 
-    public String sessionId; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String sessionId; // required
     public int page; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@@ -8427,10 +8736,10 @@ public class MasterServer {
       SESSION_ID((short)1, "sessionId"),
       PAGE((short)2, "page");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -8438,6 +8747,7 @@ public class MasterServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // SESSION_ID
@@ -8455,21 +8765,22 @@ public class MasterServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -8478,7 +8789,7 @@ public class MasterServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
@@ -8486,14 +8797,14 @@ public class MasterServer {
     // isset id assignments
     private static final int __PAGE_ISSET_ID = 0;
     private byte __isset_bitfield = 0;
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SESSION_ID, new org.apache.thrift.meta_data.FieldMetaData("sessionId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
       tmpMap.put(_Fields.PAGE, new org.apache.thrift.meta_data.FieldMetaData("page", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getPublicImages_args.class, metaDataMap);
     }
 
@@ -8501,7 +8812,7 @@ public class MasterServer {
     }
 
     public getPublicImages_args(
-      String sessionId,
+      java.lang.String sessionId,
       int page)
     {
       this();
@@ -8532,11 +8843,12 @@ public class MasterServer {
       this.page = 0;
     }
 
-    public String getSessionId() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getSessionId() {
       return this.sessionId;
     }
 
-    public getPublicImages_args setSessionId(String sessionId) {
+    public getPublicImages_args setSessionId(@org.apache.thrift.annotation.Nullable java.lang.String sessionId) {
       this.sessionId = sessionId;
       return this;
     }
@@ -8567,25 +8879,25 @@ public class MasterServer {
     }
 
     public void unsetPage() {
-      __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __PAGE_ISSET_ID);
+      __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __PAGE_ISSET_ID);
     }
 
     /** Returns true if field page is set (has been assigned a value) and false otherwise */
     public boolean isSetPage() {
-      return EncodingUtils.testBit(__isset_bitfield, __PAGE_ISSET_ID);
+      return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __PAGE_ISSET_ID);
     }
 
     public void setPageIsSet(boolean value) {
-      __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __PAGE_ISSET_ID, value);
+      __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __PAGE_ISSET_ID, value);
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SESSION_ID:
         if (value == null) {
           unsetSessionId();
         } else {
-          setSessionId((String)value);
+          setSessionId((java.lang.String)value);
         }
         break;
 
@@ -8593,14 +8905,15 @@ public class MasterServer {
         if (value == null) {
           unsetPage();
         } else {
-          setPage((Integer)value);
+          setPage((java.lang.Integer)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SESSION_ID:
         return getSessionId();
@@ -8609,13 +8922,13 @@ public class MasterServer {
         return getPage();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -8624,13 +8937,11 @@ public class MasterServer {
       case PAGE:
         return isSetPage();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getPublicImages_args)
         return this.equals((getPublicImages_args)that);
       return false;
@@ -8639,6 +8950,8 @@ public class MasterServer {
     public boolean equals(getPublicImages_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_sessionId = true && this.isSetSessionId();
       boolean that_present_sessionId = true && that.isSetSessionId();
@@ -8663,19 +8976,15 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_sessionId = true && (isSetSessionId());
-      list.add(present_sessionId);
-      if (present_sessionId)
-        list.add(sessionId);
+      hashCode = hashCode * 8191 + ((isSetSessionId()) ? 131071 : 524287);
+      if (isSetSessionId())
+        hashCode = hashCode * 8191 + sessionId.hashCode();
 
-      boolean present_page = true;
-      list.add(present_page);
-      if (present_page)
-        list.add(page);
+      hashCode = hashCode * 8191 + page;
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -8686,7 +8995,7 @@ public class MasterServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSessionId()).compareTo(other.isSetSessionId());
+      lastComparison = java.lang.Boolean.compare(isSetSessionId(), other.isSetSessionId());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -8696,7 +9005,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetPage()).compareTo(other.isSetPage());
+      lastComparison = java.lang.Boolean.compare(isSetPage(), other.isSetPage());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -8709,21 +9018,22 @@ public class MasterServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getPublicImages_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getPublicImages_args(");
       boolean first = true;
 
       sb.append("sessionId:");
@@ -8754,7 +9064,7 @@ public class MasterServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
         __isset_bitfield = 0;
@@ -8764,13 +9074,13 @@ public class MasterServer {
       }
     }
 
-    private static class getPublicImages_argsStandardSchemeFactory implements SchemeFactory {
+    private static class getPublicImages_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getPublicImages_argsStandardScheme getScheme() {
         return new getPublicImages_argsStandardScheme();
       }
     }
 
-    private static class getPublicImages_argsStandardScheme extends StandardScheme<getPublicImages_args> {
+    private static class getPublicImages_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<getPublicImages_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getPublicImages_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -8827,18 +9137,18 @@ public class MasterServer {
 
     }
 
-    private static class getPublicImages_argsTupleSchemeFactory implements SchemeFactory {
+    private static class getPublicImages_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getPublicImages_argsTupleScheme getScheme() {
         return new getPublicImages_argsTupleScheme();
       }
     }
 
-    private static class getPublicImages_argsTupleScheme extends TupleScheme<getPublicImages_args> {
+    private static class getPublicImages_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<getPublicImages_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getPublicImages_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSessionId()) {
           optionals.set(0);
         }
@@ -8856,8 +9166,8 @@ public class MasterServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getPublicImages_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(2);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           struct.sessionId = iprot.readString();
           struct.setSessionIdIsSet(true);
@@ -8869,6 +9179,9 @@ public class MasterServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getPublicImages_result implements org.apache.thrift.TBase<getPublicImages_result, getPublicImages_result._Fields>, java.io.Serializable, Cloneable, Comparable<getPublicImages_result>   {
@@ -8878,15 +9191,12 @@ public class MasterServer {
     private static final org.apache.thrift.protocol.TField FAILURE_FIELD_DESC = new org.apache.thrift.protocol.TField("failure", org.apache.thrift.protocol.TType.STRUCT, (short)1);
     private static final org.apache.thrift.protocol.TField ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("error", org.apache.thrift.protocol.TType.STRUCT, (short)2);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getPublicImages_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getPublicImages_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getPublicImages_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getPublicImages_resultTupleSchemeFactory();
 
-    public List<ImageSummaryRead> success; // required
-    public TAuthorizationException failure; // required
-    public TInvocationException error; // required
+    public @org.apache.thrift.annotation.Nullable java.util.List<ImageSummaryRead> success; // required
+    public @org.apache.thrift.annotation.Nullable TAuthorizationException failure; // required
+    public @org.apache.thrift.annotation.Nullable TInvocationException error; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -8894,10 +9204,10 @@ public class MasterServer {
       FAILURE((short)1, "failure"),
       ERROR((short)2, "error");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -8905,6 +9215,7 @@ public class MasterServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
@@ -8924,21 +9235,22 @@ public class MasterServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -8947,23 +9259,23 @@ public class MasterServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
               new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ImageSummaryRead.class))));
       tmpMap.put(_Fields.FAILURE, new org.apache.thrift.meta_data.FieldMetaData("failure", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class)));
       tmpMap.put(_Fields.ERROR, new org.apache.thrift.meta_data.FieldMetaData("error", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getPublicImages_result.class, metaDataMap);
     }
 
@@ -8971,7 +9283,7 @@ public class MasterServer {
     }
 
     public getPublicImages_result(
-      List<ImageSummaryRead> success,
+      java.util.List<ImageSummaryRead> success,
       TAuthorizationException failure,
       TInvocationException error)
     {
@@ -8986,7 +9298,7 @@ public class MasterServer {
      */
     public getPublicImages_result(getPublicImages_result other) {
       if (other.isSetSuccess()) {
-        List<ImageSummaryRead> __this__success = new ArrayList<ImageSummaryRead>(other.success.size());
+        java.util.List<ImageSummaryRead> __this__success = new java.util.ArrayList<ImageSummaryRead>(other.success.size());
         for (ImageSummaryRead other_element : other.success) {
           __this__success.add(new ImageSummaryRead(other_element));
         }
@@ -9015,22 +9327,24 @@ public class MasterServer {
       return (this.success == null) ? 0 : this.success.size();
     }
 
+    @org.apache.thrift.annotation.Nullable
     public java.util.Iterator<ImageSummaryRead> getSuccessIterator() {
       return (this.success == null) ? null : this.success.iterator();
     }
 
     public void addToSuccess(ImageSummaryRead elem) {
       if (this.success == null) {
-        this.success = new ArrayList<ImageSummaryRead>();
+        this.success = new java.util.ArrayList<ImageSummaryRead>();
       }
       this.success.add(elem);
     }
 
-    public List<ImageSummaryRead> getSuccess() {
+    @org.apache.thrift.annotation.Nullable
+    public java.util.List<ImageSummaryRead> getSuccess() {
       return this.success;
     }
 
-    public getPublicImages_result setSuccess(List<ImageSummaryRead> success) {
+    public getPublicImages_result setSuccess(@org.apache.thrift.annotation.Nullable java.util.List<ImageSummaryRead> success) {
       this.success = success;
       return this;
     }
@@ -9050,11 +9364,12 @@ public class MasterServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TAuthorizationException getFailure() {
       return this.failure;
     }
 
-    public getPublicImages_result setFailure(TAuthorizationException failure) {
+    public getPublicImages_result setFailure(@org.apache.thrift.annotation.Nullable TAuthorizationException failure) {
       this.failure = failure;
       return this;
     }
@@ -9074,11 +9389,12 @@ public class MasterServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvocationException getError() {
       return this.error;
     }
 
-    public getPublicImages_result setError(TInvocationException error) {
+    public getPublicImages_result setError(@org.apache.thrift.annotation.Nullable TInvocationException error) {
       this.error = error;
       return this;
     }
@@ -9098,13 +9414,13 @@ public class MasterServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
           unsetSuccess();
         } else {
-          setSuccess((List<ImageSummaryRead>)value);
+          setSuccess((java.util.List<ImageSummaryRead>)value);
         }
         break;
 
@@ -9127,7 +9443,8 @@ public class MasterServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
         return getSuccess();
@@ -9139,13 +9456,13 @@ public class MasterServer {
         return getError();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -9156,13 +9473,11 @@ public class MasterServer {
       case ERROR:
         return isSetError();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getPublicImages_result)
         return this.equals((getPublicImages_result)that);
       return false;
@@ -9171,6 +9486,8 @@ public class MasterServer {
     public boolean equals(getPublicImages_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_success = true && this.isSetSuccess();
       boolean that_present_success = true && that.isSetSuccess();
@@ -9204,24 +9521,21 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
 
-      boolean present_failure = true && (isSetFailure());
-      list.add(present_failure);
-      if (present_failure)
-        list.add(failure);
+      hashCode = hashCode * 8191 + ((isSetFailure()) ? 131071 : 524287);
+      if (isSetFailure())
+        hashCode = hashCode * 8191 + failure.hashCode();
 
-      boolean present_error = true && (isSetError());
-      list.add(present_error);
-      if (present_error)
-        list.add(error);
+      hashCode = hashCode * 8191 + ((isSetError()) ? 131071 : 524287);
+      if (isSetError())
+        hashCode = hashCode * 8191 + error.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -9232,7 +9546,7 @@ public class MasterServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -9242,7 +9556,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure());
+      lastComparison = java.lang.Boolean.compare(isSetFailure(), other.isSetFailure());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -9252,7 +9566,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetError()).compareTo(other.isSetError());
+      lastComparison = java.lang.Boolean.compare(isSetError(), other.isSetError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -9265,21 +9579,22 @@ public class MasterServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getPublicImages_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getPublicImages_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -9322,7 +9637,7 @@ public class MasterServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -9330,13 +9645,13 @@ public class MasterServer {
       }
     }
 
-    private static class getPublicImages_resultStandardSchemeFactory implements SchemeFactory {
+    private static class getPublicImages_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getPublicImages_resultStandardScheme getScheme() {
         return new getPublicImages_resultStandardScheme();
       }
     }
 
-    private static class getPublicImages_resultStandardScheme extends StandardScheme<getPublicImages_result> {
+    private static class getPublicImages_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<getPublicImages_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getPublicImages_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -9351,14 +9666,14 @@ public class MasterServer {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list314 = iprot.readListBegin();
-                  struct.success = new ArrayList<ImageSummaryRead>(_list314.size);
-                  ImageSummaryRead _elem315;
-                  for (int _i316 = 0; _i316 < _list314.size; ++_i316)
+                  org.apache.thrift.protocol.TList _list426 = iprot.readListBegin();
+                  struct.success = new java.util.ArrayList<ImageSummaryRead>(_list426.size);
+                  @org.apache.thrift.annotation.Nullable ImageSummaryRead _elem427;
+                  for (int _i428 = 0; _i428 < _list426.size; ++_i428)
                   {
-                    _elem315 = new ImageSummaryRead();
-                    _elem315.read(iprot);
-                    struct.success.add(_elem315);
+                    _elem427 = new ImageSummaryRead();
+                    _elem427.read(iprot);
+                    struct.success.add(_elem427);
                   }
                   iprot.readListEnd();
                 }
@@ -9404,9 +9719,9 @@ public class MasterServer {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
-            for (ImageSummaryRead _iter317 : struct.success)
+            for (ImageSummaryRead _iter429 : struct.success)
             {
-              _iter317.write(oprot);
+              _iter429.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -9428,18 +9743,18 @@ public class MasterServer {
 
     }
 
-    private static class getPublicImages_resultTupleSchemeFactory implements SchemeFactory {
+    private static class getPublicImages_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getPublicImages_resultTupleScheme getScheme() {
         return new getPublicImages_resultTupleScheme();
       }
     }
 
-    private static class getPublicImages_resultTupleScheme extends TupleScheme<getPublicImages_result> {
+    private static class getPublicImages_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<getPublicImages_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getPublicImages_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
           optionals.set(0);
         }
@@ -9453,9 +9768,9 @@ public class MasterServer {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (ImageSummaryRead _iter318 : struct.success)
+            for (ImageSummaryRead _iter430 : struct.success)
             {
-              _iter318.write(oprot);
+              _iter430.write(oprot);
             }
           }
         }
@@ -9469,18 +9784,18 @@ public class MasterServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getPublicImages_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(3);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list319 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new ArrayList<ImageSummaryRead>(_list319.size);
-            ImageSummaryRead _elem320;
-            for (int _i321 = 0; _i321 < _list319.size; ++_i321)
+            org.apache.thrift.protocol.TList _list431 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.success = new java.util.ArrayList<ImageSummaryRead>(_list431.size);
+            @org.apache.thrift.annotation.Nullable ImageSummaryRead _elem432;
+            for (int _i433 = 0; _i433 < _list431.size; ++_i433)
             {
-              _elem320 = new ImageSummaryRead();
-              _elem320.read(iprot);
-              struct.success.add(_elem320);
+              _elem432 = new ImageSummaryRead();
+              _elem432.read(iprot);
+              struct.success.add(_elem432);
             }
           }
           struct.setSuccessIsSet(true);
@@ -9498,6 +9813,9 @@ public class MasterServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getImageDetails_args implements org.apache.thrift.TBase<getImageDetails_args, getImageDetails_args._Fields>, java.io.Serializable, Cloneable, Comparable<getImageDetails_args>   {
@@ -9506,24 +9824,21 @@ public class MasterServer {
     private static final org.apache.thrift.protocol.TField SESSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("sessionId", org.apache.thrift.protocol.TType.STRING, (short)1);
     private static final org.apache.thrift.protocol.TField IMAGE_BASE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("imageBaseId", org.apache.thrift.protocol.TType.STRING, (short)2);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getImageDetails_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getImageDetails_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getImageDetails_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getImageDetails_argsTupleSchemeFactory();
 
-    public String sessionId; // required
-    public String imageBaseId; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String sessionId; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String imageBaseId; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SESSION_ID((short)1, "sessionId"),
       IMAGE_BASE_ID((short)2, "imageBaseId");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -9531,6 +9846,7 @@ public class MasterServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // SESSION_ID
@@ -9548,21 +9864,22 @@ public class MasterServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -9571,20 +9888,20 @@ public class MasterServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SESSION_ID, new org.apache.thrift.meta_data.FieldMetaData("sessionId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
       tmpMap.put(_Fields.IMAGE_BASE_ID, new org.apache.thrift.meta_data.FieldMetaData("imageBaseId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "UUID")));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getImageDetails_args.class, metaDataMap);
     }
 
@@ -9592,8 +9909,8 @@ public class MasterServer {
     }
 
     public getImageDetails_args(
-      String sessionId,
-      String imageBaseId)
+      java.lang.String sessionId,
+      java.lang.String imageBaseId)
     {
       this();
       this.sessionId = sessionId;
@@ -9622,11 +9939,12 @@ public class MasterServer {
       this.imageBaseId = null;
     }
 
-    public String getSessionId() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getSessionId() {
       return this.sessionId;
     }
 
-    public getImageDetails_args setSessionId(String sessionId) {
+    public getImageDetails_args setSessionId(@org.apache.thrift.annotation.Nullable java.lang.String sessionId) {
       this.sessionId = sessionId;
       return this;
     }
@@ -9646,11 +9964,12 @@ public class MasterServer {
       }
     }
 
-    public String getImageBaseId() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getImageBaseId() {
       return this.imageBaseId;
     }
 
-    public getImageDetails_args setImageBaseId(String imageBaseId) {
+    public getImageDetails_args setImageBaseId(@org.apache.thrift.annotation.Nullable java.lang.String imageBaseId) {
       this.imageBaseId = imageBaseId;
       return this;
     }
@@ -9670,13 +9989,13 @@ public class MasterServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SESSION_ID:
         if (value == null) {
           unsetSessionId();
         } else {
-          setSessionId((String)value);
+          setSessionId((java.lang.String)value);
         }
         break;
 
@@ -9684,14 +10003,15 @@ public class MasterServer {
         if (value == null) {
           unsetImageBaseId();
         } else {
-          setImageBaseId((String)value);
+          setImageBaseId((java.lang.String)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SESSION_ID:
         return getSessionId();
@@ -9700,13 +10020,13 @@ public class MasterServer {
         return getImageBaseId();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -9715,13 +10035,11 @@ public class MasterServer {
       case IMAGE_BASE_ID:
         return isSetImageBaseId();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getImageDetails_args)
         return this.equals((getImageDetails_args)that);
       return false;
@@ -9730,6 +10048,8 @@ public class MasterServer {
     public boolean equals(getImageDetails_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_sessionId = true && this.isSetSessionId();
       boolean that_present_sessionId = true && that.isSetSessionId();
@@ -9754,19 +10074,17 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_sessionId = true && (isSetSessionId());
-      list.add(present_sessionId);
-      if (present_sessionId)
-        list.add(sessionId);
+      hashCode = hashCode * 8191 + ((isSetSessionId()) ? 131071 : 524287);
+      if (isSetSessionId())
+        hashCode = hashCode * 8191 + sessionId.hashCode();
 
-      boolean present_imageBaseId = true && (isSetImageBaseId());
-      list.add(present_imageBaseId);
-      if (present_imageBaseId)
-        list.add(imageBaseId);
+      hashCode = hashCode * 8191 + ((isSetImageBaseId()) ? 131071 : 524287);
+      if (isSetImageBaseId())
+        hashCode = hashCode * 8191 + imageBaseId.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -9777,7 +10095,7 @@ public class MasterServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSessionId()).compareTo(other.isSetSessionId());
+      lastComparison = java.lang.Boolean.compare(isSetSessionId(), other.isSetSessionId());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -9787,7 +10105,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetImageBaseId()).compareTo(other.isSetImageBaseId());
+      lastComparison = java.lang.Boolean.compare(isSetImageBaseId(), other.isSetImageBaseId());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -9800,21 +10118,22 @@ public class MasterServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getImageDetails_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getImageDetails_args(");
       boolean first = true;
 
       sb.append("sessionId:");
@@ -9849,7 +10168,7 @@ public class MasterServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -9857,13 +10176,13 @@ public class MasterServer {
       }
     }
 
-    private static class getImageDetails_argsStandardSchemeFactory implements SchemeFactory {
+    private static class getImageDetails_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getImageDetails_argsStandardScheme getScheme() {
         return new getImageDetails_argsStandardScheme();
       }
     }
 
-    private static class getImageDetails_argsStandardScheme extends StandardScheme<getImageDetails_args> {
+    private static class getImageDetails_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<getImageDetails_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getImageDetails_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -9922,18 +10241,18 @@ public class MasterServer {
 
     }
 
-    private static class getImageDetails_argsTupleSchemeFactory implements SchemeFactory {
+    private static class getImageDetails_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getImageDetails_argsTupleScheme getScheme() {
         return new getImageDetails_argsTupleScheme();
       }
     }
 
-    private static class getImageDetails_argsTupleScheme extends TupleScheme<getImageDetails_args> {
+    private static class getImageDetails_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<getImageDetails_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getImageDetails_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSessionId()) {
           optionals.set(0);
         }
@@ -9951,8 +10270,8 @@ public class MasterServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getImageDetails_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(2);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           struct.sessionId = iprot.readString();
           struct.setSessionIdIsSet(true);
@@ -9964,6 +10283,9 @@ public class MasterServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getImageDetails_result implements org.apache.thrift.TBase<getImageDetails_result, getImageDetails_result._Fields>, java.io.Serializable, Cloneable, Comparable<getImageDetails_result>   {
@@ -9974,16 +10296,13 @@ public class MasterServer {
     private static final org.apache.thrift.protocol.TField NOT_FOUND_FIELD_DESC = new org.apache.thrift.protocol.TField("notFound", org.apache.thrift.protocol.TType.STRUCT, (short)2);
     private static final org.apache.thrift.protocol.TField SERVER_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("serverError", org.apache.thrift.protocol.TType.STRUCT, (short)3);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getImageDetails_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getImageDetails_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getImageDetails_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getImageDetails_resultTupleSchemeFactory();
 
-    public ImageDetailsRead success; // required
-    public TAuthorizationException authError; // required
-    public TNotFoundException notFound; // required
-    public TInvocationException serverError; // required
+    public @org.apache.thrift.annotation.Nullable ImageDetailsRead success; // required
+    public @org.apache.thrift.annotation.Nullable TAuthorizationException authError; // required
+    public @org.apache.thrift.annotation.Nullable TNotFoundException notFound; // required
+    public @org.apache.thrift.annotation.Nullable TInvocationException serverError; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -9992,10 +10311,10 @@ public class MasterServer {
       NOT_FOUND((short)2, "notFound"),
       SERVER_ERROR((short)3, "serverError");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -10003,6 +10322,7 @@ public class MasterServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
@@ -10024,21 +10344,22 @@ public class MasterServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -10047,24 +10368,24 @@ public class MasterServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ImageDetailsRead.class)));
       tmpMap.put(_Fields.AUTH_ERROR, new org.apache.thrift.meta_data.FieldMetaData("authError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class)));
       tmpMap.put(_Fields.NOT_FOUND, new org.apache.thrift.meta_data.FieldMetaData("notFound", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TNotFoundException.class)));
       tmpMap.put(_Fields.SERVER_ERROR, new org.apache.thrift.meta_data.FieldMetaData("serverError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getImageDetails_result.class, metaDataMap);
     }
 
@@ -10114,11 +10435,12 @@ public class MasterServer {
       this.serverError = null;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public ImageDetailsRead getSuccess() {
       return this.success;
     }
 
-    public getImageDetails_result setSuccess(ImageDetailsRead success) {
+    public getImageDetails_result setSuccess(@org.apache.thrift.annotation.Nullable ImageDetailsRead success) {
       this.success = success;
       return this;
     }
@@ -10138,11 +10460,12 @@ public class MasterServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TAuthorizationException getAuthError() {
       return this.authError;
     }
 
-    public getImageDetails_result setAuthError(TAuthorizationException authError) {
+    public getImageDetails_result setAuthError(@org.apache.thrift.annotation.Nullable TAuthorizationException authError) {
       this.authError = authError;
       return this;
     }
@@ -10162,11 +10485,12 @@ public class MasterServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TNotFoundException getNotFound() {
       return this.notFound;
     }
 
-    public getImageDetails_result setNotFound(TNotFoundException notFound) {
+    public getImageDetails_result setNotFound(@org.apache.thrift.annotation.Nullable TNotFoundException notFound) {
       this.notFound = notFound;
       return this;
     }
@@ -10186,11 +10510,12 @@ public class MasterServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvocationException getServerError() {
       return this.serverError;
     }
 
-    public getImageDetails_result setServerError(TInvocationException serverError) {
+    public getImageDetails_result setServerError(@org.apache.thrift.annotation.Nullable TInvocationException serverError) {
       this.serverError = serverError;
       return this;
     }
@@ -10210,7 +10535,7 @@ public class MasterServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
@@ -10247,7 +10572,8 @@ public class MasterServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
         return getSuccess();
@@ -10262,13 +10588,13 @@ public class MasterServer {
         return getServerError();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -10281,13 +10607,11 @@ public class MasterServer {
       case SERVER_ERROR:
         return isSetServerError();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getImageDetails_result)
         return this.equals((getImageDetails_result)that);
       return false;
@@ -10296,6 +10620,8 @@ public class MasterServer {
     public boolean equals(getImageDetails_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_success = true && this.isSetSuccess();
       boolean that_present_success = true && that.isSetSuccess();
@@ -10338,29 +10664,25 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
 
-      boolean present_authError = true && (isSetAuthError());
-      list.add(present_authError);
-      if (present_authError)
-        list.add(authError);
+      hashCode = hashCode * 8191 + ((isSetAuthError()) ? 131071 : 524287);
+      if (isSetAuthError())
+        hashCode = hashCode * 8191 + authError.hashCode();
 
-      boolean present_notFound = true && (isSetNotFound());
-      list.add(present_notFound);
-      if (present_notFound)
-        list.add(notFound);
+      hashCode = hashCode * 8191 + ((isSetNotFound()) ? 131071 : 524287);
+      if (isSetNotFound())
+        hashCode = hashCode * 8191 + notFound.hashCode();
 
-      boolean present_serverError = true && (isSetServerError());
-      list.add(present_serverError);
-      if (present_serverError)
-        list.add(serverError);
+      hashCode = hashCode * 8191 + ((isSetServerError()) ? 131071 : 524287);
+      if (isSetServerError())
+        hashCode = hashCode * 8191 + serverError.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -10371,7 +10693,7 @@ public class MasterServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -10381,7 +10703,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetAuthError()).compareTo(other.isSetAuthError());
+      lastComparison = java.lang.Boolean.compare(isSetAuthError(), other.isSetAuthError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -10391,7 +10713,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetNotFound()).compareTo(other.isSetNotFound());
+      lastComparison = java.lang.Boolean.compare(isSetNotFound(), other.isSetNotFound());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -10401,7 +10723,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetServerError()).compareTo(other.isSetServerError());
+      lastComparison = java.lang.Boolean.compare(isSetServerError(), other.isSetServerError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -10414,21 +10736,22 @@ public class MasterServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getImageDetails_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getImageDetails_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -10482,7 +10805,7 @@ public class MasterServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -10490,13 +10813,13 @@ public class MasterServer {
       }
     }
 
-    private static class getImageDetails_resultStandardSchemeFactory implements SchemeFactory {
+    private static class getImageDetails_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getImageDetails_resultStandardScheme getScheme() {
         return new getImageDetails_resultStandardScheme();
       }
     }
 
-    private static class getImageDetails_resultStandardScheme extends StandardScheme<getImageDetails_result> {
+    private static class getImageDetails_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<getImageDetails_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getImageDetails_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -10585,18 +10908,18 @@ public class MasterServer {
 
     }
 
-    private static class getImageDetails_resultTupleSchemeFactory implements SchemeFactory {
+    private static class getImageDetails_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getImageDetails_resultTupleScheme getScheme() {
         return new getImageDetails_resultTupleScheme();
       }
     }
 
-    private static class getImageDetails_resultTupleScheme extends TupleScheme<getImageDetails_result> {
+    private static class getImageDetails_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<getImageDetails_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getImageDetails_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
           optionals.set(0);
         }
@@ -10626,8 +10949,8 @@ public class MasterServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getImageDetails_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(4);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(4);
         if (incoming.get(0)) {
           struct.success = new ImageDetailsRead();
           struct.success.read(iprot);
@@ -10651,6 +10974,9 @@ public class MasterServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getUser_args implements org.apache.thrift.TBase<getUser_args, getUser_args._Fields>, java.io.Serializable, Cloneable, Comparable<getUser_args>   {
@@ -10659,24 +10985,21 @@ public class MasterServer {
     private static final org.apache.thrift.protocol.TField USER_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("userToken", org.apache.thrift.protocol.TType.STRING, (short)1);
     private static final org.apache.thrift.protocol.TField USER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("userId", org.apache.thrift.protocol.TType.STRING, (short)2);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getUser_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getUser_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getUser_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getUser_argsTupleSchemeFactory();
 
-    public String userToken; // required
-    public String userId; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String userToken; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String userId; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       USER_TOKEN((short)1, "userToken"),
       USER_ID((short)2, "userId");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -10684,6 +11007,7 @@ public class MasterServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // USER_TOKEN
@@ -10701,21 +11025,22 @@ public class MasterServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -10724,20 +11049,20 @@ public class MasterServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.USER_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("userToken", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
       tmpMap.put(_Fields.USER_ID, new org.apache.thrift.meta_data.FieldMetaData("userId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "UUID")));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getUser_args.class, metaDataMap);
     }
 
@@ -10745,8 +11070,8 @@ public class MasterServer {
     }
 
     public getUser_args(
-      String userToken,
-      String userId)
+      java.lang.String userToken,
+      java.lang.String userId)
     {
       this();
       this.userToken = userToken;
@@ -10775,11 +11100,12 @@ public class MasterServer {
       this.userId = null;
     }
 
-    public String getUserToken() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getUserToken() {
       return this.userToken;
     }
 
-    public getUser_args setUserToken(String userToken) {
+    public getUser_args setUserToken(@org.apache.thrift.annotation.Nullable java.lang.String userToken) {
       this.userToken = userToken;
       return this;
     }
@@ -10799,11 +11125,12 @@ public class MasterServer {
       }
     }
 
-    public String getUserId() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getUserId() {
       return this.userId;
     }
 
-    public getUser_args setUserId(String userId) {
+    public getUser_args setUserId(@org.apache.thrift.annotation.Nullable java.lang.String userId) {
       this.userId = userId;
       return this;
     }
@@ -10823,13 +11150,13 @@ public class MasterServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case USER_TOKEN:
         if (value == null) {
           unsetUserToken();
         } else {
-          setUserToken((String)value);
+          setUserToken((java.lang.String)value);
         }
         break;
 
@@ -10837,14 +11164,15 @@ public class MasterServer {
         if (value == null) {
           unsetUserId();
         } else {
-          setUserId((String)value);
+          setUserId((java.lang.String)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case USER_TOKEN:
         return getUserToken();
@@ -10853,13 +11181,13 @@ public class MasterServer {
         return getUserId();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -10868,13 +11196,11 @@ public class MasterServer {
       case USER_ID:
         return isSetUserId();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getUser_args)
         return this.equals((getUser_args)that);
       return false;
@@ -10883,6 +11209,8 @@ public class MasterServer {
     public boolean equals(getUser_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_userToken = true && this.isSetUserToken();
       boolean that_present_userToken = true && that.isSetUserToken();
@@ -10907,19 +11235,17 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_userToken = true && (isSetUserToken());
-      list.add(present_userToken);
-      if (present_userToken)
-        list.add(userToken);
+      hashCode = hashCode * 8191 + ((isSetUserToken()) ? 131071 : 524287);
+      if (isSetUserToken())
+        hashCode = hashCode * 8191 + userToken.hashCode();
 
-      boolean present_userId = true && (isSetUserId());
-      list.add(present_userId);
-      if (present_userId)
-        list.add(userId);
+      hashCode = hashCode * 8191 + ((isSetUserId()) ? 131071 : 524287);
+      if (isSetUserId())
+        hashCode = hashCode * 8191 + userId.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -10930,7 +11256,7 @@ public class MasterServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetUserToken()).compareTo(other.isSetUserToken());
+      lastComparison = java.lang.Boolean.compare(isSetUserToken(), other.isSetUserToken());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -10940,7 +11266,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetUserId()).compareTo(other.isSetUserId());
+      lastComparison = java.lang.Boolean.compare(isSetUserId(), other.isSetUserId());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -10953,21 +11279,22 @@ public class MasterServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getUser_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getUser_args(");
       boolean first = true;
 
       sb.append("userToken:");
@@ -11002,7 +11329,7 @@ public class MasterServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -11010,13 +11337,13 @@ public class MasterServer {
       }
     }
 
-    private static class getUser_argsStandardSchemeFactory implements SchemeFactory {
+    private static class getUser_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getUser_argsStandardScheme getScheme() {
         return new getUser_argsStandardScheme();
       }
     }
 
-    private static class getUser_argsStandardScheme extends StandardScheme<getUser_args> {
+    private static class getUser_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<getUser_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getUser_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -11075,18 +11402,18 @@ public class MasterServer {
 
     }
 
-    private static class getUser_argsTupleSchemeFactory implements SchemeFactory {
+    private static class getUser_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getUser_argsTupleScheme getScheme() {
         return new getUser_argsTupleScheme();
       }
     }
 
-    private static class getUser_argsTupleScheme extends TupleScheme<getUser_args> {
+    private static class getUser_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<getUser_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getUser_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetUserToken()) {
           optionals.set(0);
         }
@@ -11104,8 +11431,8 @@ public class MasterServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getUser_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(2);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           struct.userToken = iprot.readString();
           struct.setUserTokenIsSet(true);
@@ -11117,6 +11444,9 @@ public class MasterServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getUser_result implements org.apache.thrift.TBase<getUser_result, getUser_result._Fields>, java.io.Serializable, Cloneable, Comparable<getUser_result>   {
@@ -11127,16 +11457,13 @@ public class MasterServer {
     private static final org.apache.thrift.protocol.TField NOT_FOUND_FIELD_DESC = new org.apache.thrift.protocol.TField("notFound", org.apache.thrift.protocol.TType.STRUCT, (short)2);
     private static final org.apache.thrift.protocol.TField SERVER_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("serverError", org.apache.thrift.protocol.TType.STRUCT, (short)3);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getUser_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getUser_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getUser_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getUser_resultTupleSchemeFactory();
 
-    public UserInfo success; // required
-    public TAuthorizationException authError; // required
-    public TNotFoundException notFound; // required
-    public TInvocationException serverError; // required
+    public @org.apache.thrift.annotation.Nullable UserInfo success; // required
+    public @org.apache.thrift.annotation.Nullable TAuthorizationException authError; // required
+    public @org.apache.thrift.annotation.Nullable TNotFoundException notFound; // required
+    public @org.apache.thrift.annotation.Nullable TInvocationException serverError; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -11145,10 +11472,10 @@ public class MasterServer {
       NOT_FOUND((short)2, "notFound"),
       SERVER_ERROR((short)3, "serverError");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -11156,6 +11483,7 @@ public class MasterServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
@@ -11177,21 +11505,22 @@ public class MasterServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -11200,24 +11529,24 @@ public class MasterServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, UserInfo.class)));
       tmpMap.put(_Fields.AUTH_ERROR, new org.apache.thrift.meta_data.FieldMetaData("authError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class)));
       tmpMap.put(_Fields.NOT_FOUND, new org.apache.thrift.meta_data.FieldMetaData("notFound", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TNotFoundException.class)));
       tmpMap.put(_Fields.SERVER_ERROR, new org.apache.thrift.meta_data.FieldMetaData("serverError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getUser_result.class, metaDataMap);
     }
 
@@ -11267,11 +11596,12 @@ public class MasterServer {
       this.serverError = null;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public UserInfo getSuccess() {
       return this.success;
     }
 
-    public getUser_result setSuccess(UserInfo success) {
+    public getUser_result setSuccess(@org.apache.thrift.annotation.Nullable UserInfo success) {
       this.success = success;
       return this;
     }
@@ -11291,11 +11621,12 @@ public class MasterServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TAuthorizationException getAuthError() {
       return this.authError;
     }
 
-    public getUser_result setAuthError(TAuthorizationException authError) {
+    public getUser_result setAuthError(@org.apache.thrift.annotation.Nullable TAuthorizationException authError) {
       this.authError = authError;
       return this;
     }
@@ -11315,11 +11646,12 @@ public class MasterServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TNotFoundException getNotFound() {
       return this.notFound;
     }
 
-    public getUser_result setNotFound(TNotFoundException notFound) {
+    public getUser_result setNotFound(@org.apache.thrift.annotation.Nullable TNotFoundException notFound) {
       this.notFound = notFound;
       return this;
     }
@@ -11339,11 +11671,12 @@ public class MasterServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvocationException getServerError() {
       return this.serverError;
     }
 
-    public getUser_result setServerError(TInvocationException serverError) {
+    public getUser_result setServerError(@org.apache.thrift.annotation.Nullable TInvocationException serverError) {
       this.serverError = serverError;
       return this;
     }
@@ -11363,7 +11696,7 @@ public class MasterServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
@@ -11400,7 +11733,8 @@ public class MasterServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
         return getSuccess();
@@ -11415,13 +11749,13 @@ public class MasterServer {
         return getServerError();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -11434,13 +11768,11 @@ public class MasterServer {
       case SERVER_ERROR:
         return isSetServerError();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getUser_result)
         return this.equals((getUser_result)that);
       return false;
@@ -11449,6 +11781,8 @@ public class MasterServer {
     public boolean equals(getUser_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_success = true && this.isSetSuccess();
       boolean that_present_success = true && that.isSetSuccess();
@@ -11491,29 +11825,25 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
 
-      boolean present_authError = true && (isSetAuthError());
-      list.add(present_authError);
-      if (present_authError)
-        list.add(authError);
+      hashCode = hashCode * 8191 + ((isSetAuthError()) ? 131071 : 524287);
+      if (isSetAuthError())
+        hashCode = hashCode * 8191 + authError.hashCode();
 
-      boolean present_notFound = true && (isSetNotFound());
-      list.add(present_notFound);
-      if (present_notFound)
-        list.add(notFound);
+      hashCode = hashCode * 8191 + ((isSetNotFound()) ? 131071 : 524287);
+      if (isSetNotFound())
+        hashCode = hashCode * 8191 + notFound.hashCode();
 
-      boolean present_serverError = true && (isSetServerError());
-      list.add(present_serverError);
-      if (present_serverError)
-        list.add(serverError);
+      hashCode = hashCode * 8191 + ((isSetServerError()) ? 131071 : 524287);
+      if (isSetServerError())
+        hashCode = hashCode * 8191 + serverError.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -11524,7 +11854,7 @@ public class MasterServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -11534,7 +11864,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetAuthError()).compareTo(other.isSetAuthError());
+      lastComparison = java.lang.Boolean.compare(isSetAuthError(), other.isSetAuthError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -11544,7 +11874,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetNotFound()).compareTo(other.isSetNotFound());
+      lastComparison = java.lang.Boolean.compare(isSetNotFound(), other.isSetNotFound());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -11554,7 +11884,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetServerError()).compareTo(other.isSetServerError());
+      lastComparison = java.lang.Boolean.compare(isSetServerError(), other.isSetServerError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -11567,21 +11897,22 @@ public class MasterServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getUser_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getUser_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -11635,7 +11966,7 @@ public class MasterServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -11643,13 +11974,13 @@ public class MasterServer {
       }
     }
 
-    private static class getUser_resultStandardSchemeFactory implements SchemeFactory {
+    private static class getUser_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getUser_resultStandardScheme getScheme() {
         return new getUser_resultStandardScheme();
       }
     }
 
-    private static class getUser_resultStandardScheme extends StandardScheme<getUser_result> {
+    private static class getUser_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<getUser_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getUser_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -11738,18 +12069,18 @@ public class MasterServer {
 
     }
 
-    private static class getUser_resultTupleSchemeFactory implements SchemeFactory {
+    private static class getUser_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getUser_resultTupleScheme getScheme() {
         return new getUser_resultTupleScheme();
       }
     }
 
-    private static class getUser_resultTupleScheme extends TupleScheme<getUser_result> {
+    private static class getUser_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<getUser_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getUser_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
           optionals.set(0);
         }
@@ -11779,8 +12110,8 @@ public class MasterServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getUser_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(4);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(4);
         if (incoming.get(0)) {
           struct.success = new UserInfo();
           struct.success.read(iprot);
@@ -11804,6 +12135,9 @@ public class MasterServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class invalidateSession_args implements org.apache.thrift.TBase<invalidateSession_args, invalidateSession_args._Fields>, java.io.Serializable, Cloneable, Comparable<invalidateSession_args>   {
@@ -11811,22 +12145,19 @@ public class MasterServer {
 
     private static final org.apache.thrift.protocol.TField SESSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("sessionId", org.apache.thrift.protocol.TType.STRING, (short)1);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new invalidateSession_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new invalidateSession_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new invalidateSession_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new invalidateSession_argsTupleSchemeFactory();
 
-    public String sessionId; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String sessionId; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SESSION_ID((short)1, "sessionId");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -11834,6 +12165,7 @@ public class MasterServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // SESSION_ID
@@ -11849,21 +12181,22 @@ public class MasterServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -11872,18 +12205,18 @@ public class MasterServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SESSION_ID, new org.apache.thrift.meta_data.FieldMetaData("sessionId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(invalidateSession_args.class, metaDataMap);
     }
 
@@ -11891,7 +12224,7 @@ public class MasterServer {
     }
 
     public invalidateSession_args(
-      String sessionId)
+      java.lang.String sessionId)
     {
       this();
       this.sessionId = sessionId;
@@ -11915,11 +12248,12 @@ public class MasterServer {
       this.sessionId = null;
     }
 
-    public String getSessionId() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getSessionId() {
       return this.sessionId;
     }
 
-    public invalidateSession_args setSessionId(String sessionId) {
+    public invalidateSession_args setSessionId(@org.apache.thrift.annotation.Nullable java.lang.String sessionId) {
       this.sessionId = sessionId;
       return this;
     }
@@ -11939,45 +12273,44 @@ public class MasterServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SESSION_ID:
         if (value == null) {
           unsetSessionId();
         } else {
-          setSessionId((String)value);
+          setSessionId((java.lang.String)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SESSION_ID:
         return getSessionId();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
       case SESSION_ID:
         return isSetSessionId();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof invalidateSession_args)
         return this.equals((invalidateSession_args)that);
       return false;
@@ -11986,6 +12319,8 @@ public class MasterServer {
     public boolean equals(invalidateSession_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_sessionId = true && this.isSetSessionId();
       boolean that_present_sessionId = true && that.isSetSessionId();
@@ -12001,14 +12336,13 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_sessionId = true && (isSetSessionId());
-      list.add(present_sessionId);
-      if (present_sessionId)
-        list.add(sessionId);
+      hashCode = hashCode * 8191 + ((isSetSessionId()) ? 131071 : 524287);
+      if (isSetSessionId())
+        hashCode = hashCode * 8191 + sessionId.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -12019,7 +12353,7 @@ public class MasterServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSessionId()).compareTo(other.isSetSessionId());
+      lastComparison = java.lang.Boolean.compare(isSetSessionId(), other.isSetSessionId());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -12032,21 +12366,22 @@ public class MasterServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("invalidateSession_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("invalidateSession_args(");
       boolean first = true;
 
       sb.append("sessionId:");
@@ -12073,7 +12408,7 @@ public class MasterServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -12081,13 +12416,13 @@ public class MasterServer {
       }
     }
 
-    private static class invalidateSession_argsStandardSchemeFactory implements SchemeFactory {
+    private static class invalidateSession_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public invalidateSession_argsStandardScheme getScheme() {
         return new invalidateSession_argsStandardScheme();
       }
     }
 
-    private static class invalidateSession_argsStandardScheme extends StandardScheme<invalidateSession_args> {
+    private static class invalidateSession_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<invalidateSession_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, invalidateSession_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -12133,18 +12468,18 @@ public class MasterServer {
 
     }
 
-    private static class invalidateSession_argsTupleSchemeFactory implements SchemeFactory {
+    private static class invalidateSession_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public invalidateSession_argsTupleScheme getScheme() {
         return new invalidateSession_argsTupleScheme();
       }
     }
 
-    private static class invalidateSession_argsTupleScheme extends TupleScheme<invalidateSession_args> {
+    private static class invalidateSession_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<invalidateSession_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, invalidateSession_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSessionId()) {
           optionals.set(0);
         }
@@ -12156,8 +12491,8 @@ public class MasterServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, invalidateSession_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(1);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
           struct.sessionId = iprot.readString();
           struct.setSessionIdIsSet(true);
@@ -12165,6 +12500,9 @@ public class MasterServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class invalidateSession_result implements org.apache.thrift.TBase<invalidateSession_result, invalidateSession_result._Fields>, java.io.Serializable, Cloneable, Comparable<invalidateSession_result>   {
@@ -12172,22 +12510,19 @@ public class MasterServer {
 
     private static final org.apache.thrift.protocol.TField EX_FIELD_DESC = new org.apache.thrift.protocol.TField("ex", org.apache.thrift.protocol.TType.STRUCT, (short)1);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new invalidateSession_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new invalidateSession_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new invalidateSession_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new invalidateSession_resultTupleSchemeFactory();
 
-    public TInvalidTokenException ex; // required
+    public @org.apache.thrift.annotation.Nullable TInvalidTokenException ex; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       EX((short)1, "ex");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -12195,6 +12530,7 @@ public class MasterServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // EX
@@ -12210,21 +12546,22 @@ public class MasterServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -12233,18 +12570,18 @@ public class MasterServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.EX, new org.apache.thrift.meta_data.FieldMetaData("ex", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvalidTokenException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(invalidateSession_result.class, metaDataMap);
     }
 
@@ -12276,11 +12613,12 @@ public class MasterServer {
       this.ex = null;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvalidTokenException getEx() {
       return this.ex;
     }
 
-    public invalidateSession_result setEx(TInvalidTokenException ex) {
+    public invalidateSession_result setEx(@org.apache.thrift.annotation.Nullable TInvalidTokenException ex) {
       this.ex = ex;
       return this;
     }
@@ -12300,7 +12638,7 @@ public class MasterServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case EX:
         if (value == null) {
@@ -12313,32 +12651,31 @@ public class MasterServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case EX:
         return getEx();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
       case EX:
         return isSetEx();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof invalidateSession_result)
         return this.equals((invalidateSession_result)that);
       return false;
@@ -12347,6 +12684,8 @@ public class MasterServer {
     public boolean equals(invalidateSession_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_ex = true && this.isSetEx();
       boolean that_present_ex = true && that.isSetEx();
@@ -12362,14 +12701,13 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_ex = true && (isSetEx());
-      list.add(present_ex);
-      if (present_ex)
-        list.add(ex);
+      hashCode = hashCode * 8191 + ((isSetEx()) ? 131071 : 524287);
+      if (isSetEx())
+        hashCode = hashCode * 8191 + ex.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -12380,7 +12718,7 @@ public class MasterServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetEx()).compareTo(other.isSetEx());
+      lastComparison = java.lang.Boolean.compare(isSetEx(), other.isSetEx());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -12393,21 +12731,22 @@ public class MasterServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("invalidateSession_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("invalidateSession_result(");
       boolean first = true;
 
       sb.append("ex:");
@@ -12434,7 +12773,7 @@ public class MasterServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -12442,13 +12781,13 @@ public class MasterServer {
       }
     }
 
-    private static class invalidateSession_resultStandardSchemeFactory implements SchemeFactory {
+    private static class invalidateSession_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public invalidateSession_resultStandardScheme getScheme() {
         return new invalidateSession_resultStandardScheme();
       }
     }
 
-    private static class invalidateSession_resultStandardScheme extends StandardScheme<invalidateSession_result> {
+    private static class invalidateSession_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<invalidateSession_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, invalidateSession_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -12495,18 +12834,18 @@ public class MasterServer {
 
     }
 
-    private static class invalidateSession_resultTupleSchemeFactory implements SchemeFactory {
+    private static class invalidateSession_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public invalidateSession_resultTupleScheme getScheme() {
         return new invalidateSession_resultTupleScheme();
       }
     }
 
-    private static class invalidateSession_resultTupleScheme extends TupleScheme<invalidateSession_result> {
+    private static class invalidateSession_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<invalidateSession_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, invalidateSession_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetEx()) {
           optionals.set(0);
         }
@@ -12518,8 +12857,8 @@ public class MasterServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, invalidateSession_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(1);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
           struct.ex = new TInvalidTokenException();
           struct.ex.read(iprot);
@@ -12528,6 +12867,9 @@ public class MasterServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getUserFromToken_args implements org.apache.thrift.TBase<getUserFromToken_args, getUserFromToken_args._Fields>, java.io.Serializable, Cloneable, Comparable<getUserFromToken_args>   {
@@ -12535,22 +12877,19 @@ public class MasterServer {
 
     private static final org.apache.thrift.protocol.TField TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)1);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getUserFromToken_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getUserFromToken_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getUserFromToken_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getUserFromToken_argsTupleSchemeFactory();
 
-    public String token; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String token; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       TOKEN((short)1, "token");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -12558,6 +12897,7 @@ public class MasterServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // TOKEN
@@ -12573,21 +12913,22 @@ public class MasterServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -12596,18 +12937,18 @@ public class MasterServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getUserFromToken_args.class, metaDataMap);
     }
 
@@ -12615,7 +12956,7 @@ public class MasterServer {
     }
 
     public getUserFromToken_args(
-      String token)
+      java.lang.String token)
     {
       this();
       this.token = token;
@@ -12639,11 +12980,12 @@ public class MasterServer {
       this.token = null;
     }
 
-    public String getToken() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getToken() {
       return this.token;
     }
 
-    public getUserFromToken_args setToken(String token) {
+    public getUserFromToken_args setToken(@org.apache.thrift.annotation.Nullable java.lang.String token) {
       this.token = token;
       return this;
     }
@@ -12663,45 +13005,44 @@ public class MasterServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case TOKEN:
         if (value == null) {
           unsetToken();
         } else {
-          setToken((String)value);
+          setToken((java.lang.String)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case TOKEN:
         return getToken();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
       case TOKEN:
         return isSetToken();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getUserFromToken_args)
         return this.equals((getUserFromToken_args)that);
       return false;
@@ -12710,6 +13051,8 @@ public class MasterServer {
     public boolean equals(getUserFromToken_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_token = true && this.isSetToken();
       boolean that_present_token = true && that.isSetToken();
@@ -12725,14 +13068,13 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_token = true && (isSetToken());
-      list.add(present_token);
-      if (present_token)
-        list.add(token);
+      hashCode = hashCode * 8191 + ((isSetToken()) ? 131071 : 524287);
+      if (isSetToken())
+        hashCode = hashCode * 8191 + token.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -12743,7 +13085,7 @@ public class MasterServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken());
+      lastComparison = java.lang.Boolean.compare(isSetToken(), other.isSetToken());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -12756,21 +13098,22 @@ public class MasterServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getUserFromToken_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getUserFromToken_args(");
       boolean first = true;
 
       sb.append("token:");
@@ -12797,7 +13140,7 @@ public class MasterServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -12805,13 +13148,13 @@ public class MasterServer {
       }
     }
 
-    private static class getUserFromToken_argsStandardSchemeFactory implements SchemeFactory {
+    private static class getUserFromToken_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getUserFromToken_argsStandardScheme getScheme() {
         return new getUserFromToken_argsStandardScheme();
       }
     }
 
-    private static class getUserFromToken_argsStandardScheme extends StandardScheme<getUserFromToken_args> {
+    private static class getUserFromToken_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<getUserFromToken_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getUserFromToken_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -12857,18 +13200,18 @@ public class MasterServer {
 
     }
 
-    private static class getUserFromToken_argsTupleSchemeFactory implements SchemeFactory {
+    private static class getUserFromToken_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getUserFromToken_argsTupleScheme getScheme() {
         return new getUserFromToken_argsTupleScheme();
       }
     }
 
-    private static class getUserFromToken_argsTupleScheme extends TupleScheme<getUserFromToken_args> {
+    private static class getUserFromToken_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<getUserFromToken_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getUserFromToken_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetToken()) {
           optionals.set(0);
         }
@@ -12880,8 +13223,8 @@ public class MasterServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getUserFromToken_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(1);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
           struct.token = iprot.readString();
           struct.setTokenIsSet(true);
@@ -12889,6 +13232,9 @@ public class MasterServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getUserFromToken_result implements org.apache.thrift.TBase<getUserFromToken_result, getUserFromToken_result._Fields>, java.io.Serializable, Cloneable, Comparable<getUserFromToken_result>   {
@@ -12897,24 +13243,21 @@ public class MasterServer {
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0);
     private static final org.apache.thrift.protocol.TField FAILURE_FIELD_DESC = new org.apache.thrift.protocol.TField("failure", org.apache.thrift.protocol.TType.STRUCT, (short)1);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getUserFromToken_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getUserFromToken_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getUserFromToken_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getUserFromToken_resultTupleSchemeFactory();
 
-    public UserInfo success; // required
-    public TInvalidTokenException failure; // required
+    public @org.apache.thrift.annotation.Nullable UserInfo success; // required
+    public @org.apache.thrift.annotation.Nullable TInvalidTokenException failure; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SUCCESS((short)0, "success"),
       FAILURE((short)1, "failure");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -12922,6 +13265,7 @@ public class MasterServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
@@ -12939,21 +13283,22 @@ public class MasterServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -12962,20 +13307,20 @@ public class MasterServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, UserInfo.class)));
       tmpMap.put(_Fields.FAILURE, new org.apache.thrift.meta_data.FieldMetaData("failure", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvalidTokenException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getUserFromToken_result.class, metaDataMap);
     }
 
@@ -13013,11 +13358,12 @@ public class MasterServer {
       this.failure = null;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public UserInfo getSuccess() {
       return this.success;
     }
 
-    public getUserFromToken_result setSuccess(UserInfo success) {
+    public getUserFromToken_result setSuccess(@org.apache.thrift.annotation.Nullable UserInfo success) {
       this.success = success;
       return this;
     }
@@ -13037,11 +13383,12 @@ public class MasterServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvalidTokenException getFailure() {
       return this.failure;
     }
 
-    public getUserFromToken_result setFailure(TInvalidTokenException failure) {
+    public getUserFromToken_result setFailure(@org.apache.thrift.annotation.Nullable TInvalidTokenException failure) {
       this.failure = failure;
       return this;
     }
@@ -13061,7 +13408,7 @@ public class MasterServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
@@ -13082,7 +13429,8 @@ public class MasterServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
         return getSuccess();
@@ -13091,13 +13439,13 @@ public class MasterServer {
         return getFailure();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -13106,13 +13454,11 @@ public class MasterServer {
       case FAILURE:
         return isSetFailure();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getUserFromToken_result)
         return this.equals((getUserFromToken_result)that);
       return false;
@@ -13121,6 +13467,8 @@ public class MasterServer {
     public boolean equals(getUserFromToken_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_success = true && this.isSetSuccess();
       boolean that_present_success = true && that.isSetSuccess();
@@ -13145,19 +13493,17 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
 
-      boolean present_failure = true && (isSetFailure());
-      list.add(present_failure);
-      if (present_failure)
-        list.add(failure);
+      hashCode = hashCode * 8191 + ((isSetFailure()) ? 131071 : 524287);
+      if (isSetFailure())
+        hashCode = hashCode * 8191 + failure.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -13168,7 +13514,7 @@ public class MasterServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -13178,7 +13524,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure());
+      lastComparison = java.lang.Boolean.compare(isSetFailure(), other.isSetFailure());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -13191,21 +13537,22 @@ public class MasterServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getUserFromToken_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getUserFromToken_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -13243,7 +13590,7 @@ public class MasterServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -13251,13 +13598,13 @@ public class MasterServer {
       }
     }
 
-    private static class getUserFromToken_resultStandardSchemeFactory implements SchemeFactory {
+    private static class getUserFromToken_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getUserFromToken_resultStandardScheme getScheme() {
         return new getUserFromToken_resultStandardScheme();
       }
     }
 
-    private static class getUserFromToken_resultStandardScheme extends StandardScheme<getUserFromToken_result> {
+    private static class getUserFromToken_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<getUserFromToken_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getUserFromToken_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -13318,18 +13665,18 @@ public class MasterServer {
 
     }
 
-    private static class getUserFromToken_resultTupleSchemeFactory implements SchemeFactory {
+    private static class getUserFromToken_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getUserFromToken_resultTupleScheme getScheme() {
         return new getUserFromToken_resultTupleScheme();
       }
     }
 
-    private static class getUserFromToken_resultTupleScheme extends TupleScheme<getUserFromToken_result> {
+    private static class getUserFromToken_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<getUserFromToken_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getUserFromToken_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
           optionals.set(0);
         }
@@ -13347,8 +13694,8 @@ public class MasterServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getUserFromToken_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(2);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           struct.success = new UserInfo();
           struct.success.read(iprot);
@@ -13362,6 +13709,9 @@ public class MasterServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class isServerAuthenticated_args implements org.apache.thrift.TBase<isServerAuthenticated_args, isServerAuthenticated_args._Fields>, java.io.Serializable, Cloneable, Comparable<isServerAuthenticated_args>   {
@@ -13369,22 +13719,19 @@ public class MasterServer {
 
     private static final org.apache.thrift.protocol.TField SERVER_SESSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("serverSessionId", org.apache.thrift.protocol.TType.STRING, (short)1);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new isServerAuthenticated_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new isServerAuthenticated_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new isServerAuthenticated_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new isServerAuthenticated_argsTupleSchemeFactory();
 
-    public String serverSessionId; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String serverSessionId; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SERVER_SESSION_ID((short)1, "serverSessionId");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -13392,6 +13739,7 @@ public class MasterServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // SERVER_SESSION_ID
@@ -13407,21 +13755,22 @@ public class MasterServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -13430,18 +13779,18 @@ public class MasterServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SERVER_SESSION_ID, new org.apache.thrift.meta_data.FieldMetaData("serverSessionId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(isServerAuthenticated_args.class, metaDataMap);
     }
 
@@ -13449,7 +13798,7 @@ public class MasterServer {
     }
 
     public isServerAuthenticated_args(
-      String serverSessionId)
+      java.lang.String serverSessionId)
     {
       this();
       this.serverSessionId = serverSessionId;
@@ -13473,11 +13822,12 @@ public class MasterServer {
       this.serverSessionId = null;
     }
 
-    public String getServerSessionId() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getServerSessionId() {
       return this.serverSessionId;
     }
 
-    public isServerAuthenticated_args setServerSessionId(String serverSessionId) {
+    public isServerAuthenticated_args setServerSessionId(@org.apache.thrift.annotation.Nullable java.lang.String serverSessionId) {
       this.serverSessionId = serverSessionId;
       return this;
     }
@@ -13497,45 +13847,44 @@ public class MasterServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SERVER_SESSION_ID:
         if (value == null) {
           unsetServerSessionId();
         } else {
-          setServerSessionId((String)value);
+          setServerSessionId((java.lang.String)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SERVER_SESSION_ID:
         return getServerSessionId();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
       case SERVER_SESSION_ID:
         return isSetServerSessionId();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof isServerAuthenticated_args)
         return this.equals((isServerAuthenticated_args)that);
       return false;
@@ -13544,6 +13893,8 @@ public class MasterServer {
     public boolean equals(isServerAuthenticated_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_serverSessionId = true && this.isSetServerSessionId();
       boolean that_present_serverSessionId = true && that.isSetServerSessionId();
@@ -13559,14 +13910,13 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_serverSessionId = true && (isSetServerSessionId());
-      list.add(present_serverSessionId);
-      if (present_serverSessionId)
-        list.add(serverSessionId);
+      hashCode = hashCode * 8191 + ((isSetServerSessionId()) ? 131071 : 524287);
+      if (isSetServerSessionId())
+        hashCode = hashCode * 8191 + serverSessionId.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -13577,7 +13927,7 @@ public class MasterServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetServerSessionId()).compareTo(other.isSetServerSessionId());
+      lastComparison = java.lang.Boolean.compare(isSetServerSessionId(), other.isSetServerSessionId());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -13590,21 +13940,22 @@ public class MasterServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("isServerAuthenticated_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("isServerAuthenticated_args(");
       boolean first = true;
 
       sb.append("serverSessionId:");
@@ -13631,7 +13982,7 @@ public class MasterServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -13639,13 +13990,13 @@ public class MasterServer {
       }
     }
 
-    private static class isServerAuthenticated_argsStandardSchemeFactory implements SchemeFactory {
+    private static class isServerAuthenticated_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public isServerAuthenticated_argsStandardScheme getScheme() {
         return new isServerAuthenticated_argsStandardScheme();
       }
     }
 
-    private static class isServerAuthenticated_argsStandardScheme extends StandardScheme<isServerAuthenticated_args> {
+    private static class isServerAuthenticated_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<isServerAuthenticated_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, isServerAuthenticated_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -13691,18 +14042,18 @@ public class MasterServer {
 
     }
 
-    private static class isServerAuthenticated_argsTupleSchemeFactory implements SchemeFactory {
+    private static class isServerAuthenticated_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public isServerAuthenticated_argsTupleScheme getScheme() {
         return new isServerAuthenticated_argsTupleScheme();
       }
     }
 
-    private static class isServerAuthenticated_argsTupleScheme extends TupleScheme<isServerAuthenticated_args> {
+    private static class isServerAuthenticated_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<isServerAuthenticated_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, isServerAuthenticated_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetServerSessionId()) {
           optionals.set(0);
         }
@@ -13714,8 +14065,8 @@ public class MasterServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, isServerAuthenticated_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(1);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
           struct.serverSessionId = iprot.readString();
           struct.setServerSessionIdIsSet(true);
@@ -13723,6 +14074,9 @@ public class MasterServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class isServerAuthenticated_result implements org.apache.thrift.TBase<isServerAuthenticated_result, isServerAuthenticated_result._Fields>, java.io.Serializable, Cloneable, Comparable<isServerAuthenticated_result>   {
@@ -13730,11 +14084,8 @@ public class MasterServer {
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.BOOL, (short)0);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new isServerAuthenticated_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new isServerAuthenticated_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new isServerAuthenticated_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new isServerAuthenticated_resultTupleSchemeFactory();
 
     public boolean success; // required
 
@@ -13742,10 +14093,10 @@ public class MasterServer {
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SUCCESS((short)0, "success");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -13753,6 +14104,7 @@ public class MasterServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
@@ -13768,21 +14120,22 @@ public class MasterServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -13791,7 +14144,7 @@ public class MasterServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
@@ -13799,12 +14152,12 @@ public class MasterServer {
     // isset id assignments
     private static final int __SUCCESS_ISSET_ID = 0;
     private byte __isset_bitfield = 0;
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(isServerAuthenticated_result.class, metaDataMap);
     }
 
@@ -13848,57 +14201,56 @@ public class MasterServer {
     }
 
     public void unsetSuccess() {
-      __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID);
+      __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID);
     }
 
     /** Returns true if field success is set (has been assigned a value) and false otherwise */
     public boolean isSetSuccess() {
-      return EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID);
+      return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID);
     }
 
     public void setSuccessIsSet(boolean value) {
-      __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value);
+      __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value);
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
           unsetSuccess();
         } else {
-          setSuccess((Boolean)value);
+          setSuccess((java.lang.Boolean)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
         return isSuccess();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
       case SUCCESS:
         return isSetSuccess();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof isServerAuthenticated_result)
         return this.equals((isServerAuthenticated_result)that);
       return false;
@@ -13907,6 +14259,8 @@ public class MasterServer {
     public boolean equals(isServerAuthenticated_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_success = true;
       boolean that_present_success = true;
@@ -13922,14 +14276,11 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_success = true;
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
+      hashCode = hashCode * 8191 + ((success) ? 131071 : 524287);
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -13940,7 +14291,7 @@ public class MasterServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -13953,21 +14304,22 @@ public class MasterServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("isServerAuthenticated_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("isServerAuthenticated_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -13990,7 +14342,7 @@ public class MasterServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
         __isset_bitfield = 0;
@@ -14000,13 +14352,13 @@ public class MasterServer {
       }
     }
 
-    private static class isServerAuthenticated_resultStandardSchemeFactory implements SchemeFactory {
+    private static class isServerAuthenticated_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public isServerAuthenticated_resultStandardScheme getScheme() {
         return new isServerAuthenticated_resultStandardScheme();
       }
     }
 
-    private static class isServerAuthenticated_resultStandardScheme extends StandardScheme<isServerAuthenticated_result> {
+    private static class isServerAuthenticated_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<isServerAuthenticated_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, isServerAuthenticated_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -14052,18 +14404,18 @@ public class MasterServer {
 
     }
 
-    private static class isServerAuthenticated_resultTupleSchemeFactory implements SchemeFactory {
+    private static class isServerAuthenticated_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public isServerAuthenticated_resultTupleScheme getScheme() {
         return new isServerAuthenticated_resultTupleScheme();
       }
     }
 
-    private static class isServerAuthenticated_resultTupleScheme extends TupleScheme<isServerAuthenticated_result> {
+    private static class isServerAuthenticated_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<isServerAuthenticated_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, isServerAuthenticated_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
           optionals.set(0);
         }
@@ -14075,8 +14427,8 @@ public class MasterServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, isServerAuthenticated_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(1);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
           struct.success = iprot.readBool();
           struct.setSuccessIsSet(true);
@@ -14084,6 +14436,9 @@ public class MasterServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class startServerAuthentication_args implements org.apache.thrift.TBase<startServerAuthentication_args, startServerAuthentication_args._Fields>, java.io.Serializable, Cloneable, Comparable<startServerAuthentication_args>   {
@@ -14091,11 +14446,8 @@ public class MasterServer {
 
     private static final org.apache.thrift.protocol.TField SATELLITE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("satelliteId", org.apache.thrift.protocol.TType.I32, (short)1);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new startServerAuthentication_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new startServerAuthentication_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new startServerAuthentication_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new startServerAuthentication_argsTupleSchemeFactory();
 
     public int satelliteId; // required
 
@@ -14103,10 +14455,10 @@ public class MasterServer {
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SATELLITE_ID((short)1, "satelliteId");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -14114,6 +14466,7 @@ public class MasterServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // SATELLITE_ID
@@ -14129,21 +14482,22 @@ public class MasterServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -14152,7 +14506,7 @@ public class MasterServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
@@ -14160,12 +14514,12 @@ public class MasterServer {
     // isset id assignments
     private static final int __SATELLITEID_ISSET_ID = 0;
     private byte __isset_bitfield = 0;
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SATELLITE_ID, new org.apache.thrift.meta_data.FieldMetaData("satelliteId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(startServerAuthentication_args.class, metaDataMap);
     }
 
@@ -14209,57 +14563,56 @@ public class MasterServer {
     }
 
     public void unsetSatelliteId() {
-      __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SATELLITEID_ISSET_ID);
+      __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SATELLITEID_ISSET_ID);
     }
 
     /** Returns true if field satelliteId is set (has been assigned a value) and false otherwise */
     public boolean isSetSatelliteId() {
-      return EncodingUtils.testBit(__isset_bitfield, __SATELLITEID_ISSET_ID);
+      return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SATELLITEID_ISSET_ID);
     }
 
     public void setSatelliteIdIsSet(boolean value) {
-      __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SATELLITEID_ISSET_ID, value);
+      __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SATELLITEID_ISSET_ID, value);
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SATELLITE_ID:
         if (value == null) {
           unsetSatelliteId();
         } else {
-          setSatelliteId((Integer)value);
+          setSatelliteId((java.lang.Integer)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SATELLITE_ID:
         return getSatelliteId();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
       case SATELLITE_ID:
         return isSetSatelliteId();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof startServerAuthentication_args)
         return this.equals((startServerAuthentication_args)that);
       return false;
@@ -14268,6 +14621,8 @@ public class MasterServer {
     public boolean equals(startServerAuthentication_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_satelliteId = true;
       boolean that_present_satelliteId = true;
@@ -14283,14 +14638,11 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_satelliteId = true;
-      list.add(present_satelliteId);
-      if (present_satelliteId)
-        list.add(satelliteId);
+      hashCode = hashCode * 8191 + satelliteId;
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -14301,7 +14653,7 @@ public class MasterServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSatelliteId()).compareTo(other.isSetSatelliteId());
+      lastComparison = java.lang.Boolean.compare(isSetSatelliteId(), other.isSetSatelliteId());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -14314,21 +14666,22 @@ public class MasterServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("startServerAuthentication_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("startServerAuthentication_args(");
       boolean first = true;
 
       sb.append("satelliteId:");
@@ -14351,7 +14704,7 @@ public class MasterServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
         __isset_bitfield = 0;
@@ -14361,13 +14714,13 @@ public class MasterServer {
       }
     }
 
-    private static class startServerAuthentication_argsStandardSchemeFactory implements SchemeFactory {
+    private static class startServerAuthentication_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public startServerAuthentication_argsStandardScheme getScheme() {
         return new startServerAuthentication_argsStandardScheme();
       }
     }
 
-    private static class startServerAuthentication_argsStandardScheme extends StandardScheme<startServerAuthentication_args> {
+    private static class startServerAuthentication_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<startServerAuthentication_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, startServerAuthentication_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -14411,18 +14764,18 @@ public class MasterServer {
 
     }
 
-    private static class startServerAuthentication_argsTupleSchemeFactory implements SchemeFactory {
+    private static class startServerAuthentication_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public startServerAuthentication_argsTupleScheme getScheme() {
         return new startServerAuthentication_argsTupleScheme();
       }
     }
 
-    private static class startServerAuthentication_argsTupleScheme extends TupleScheme<startServerAuthentication_args> {
+    private static class startServerAuthentication_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<startServerAuthentication_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, startServerAuthentication_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSatelliteId()) {
           optionals.set(0);
         }
@@ -14434,8 +14787,8 @@ public class MasterServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, startServerAuthentication_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(1);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
           struct.satelliteId = iprot.readI32();
           struct.setSatelliteIdIsSet(true);
@@ -14443,6 +14796,9 @@ public class MasterServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class startServerAuthentication_result implements org.apache.thrift.TBase<startServerAuthentication_result, startServerAuthentication_result._Fields>, java.io.Serializable, Cloneable, Comparable<startServerAuthentication_result>   {
@@ -14452,15 +14808,12 @@ public class MasterServer {
     private static final org.apache.thrift.protocol.TField FAILURE_FIELD_DESC = new org.apache.thrift.protocol.TField("failure", org.apache.thrift.protocol.TType.STRUCT, (short)1);
     private static final org.apache.thrift.protocol.TField ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("error", org.apache.thrift.protocol.TType.STRUCT, (short)2);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new startServerAuthentication_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new startServerAuthentication_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new startServerAuthentication_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new startServerAuthentication_resultTupleSchemeFactory();
 
-    public ByteBuffer success; // required
-    public TAuthorizationException failure; // required
-    public TInvocationException error; // required
+    public @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer success; // required
+    public @org.apache.thrift.annotation.Nullable TAuthorizationException failure; // required
+    public @org.apache.thrift.annotation.Nullable TInvocationException error; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -14468,10 +14821,10 @@ public class MasterServer {
       FAILURE((short)1, "failure"),
       ERROR((short)2, "error");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -14479,6 +14832,7 @@ public class MasterServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
@@ -14498,21 +14852,22 @@ public class MasterServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -14521,22 +14876,22 @@ public class MasterServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , true)));
       tmpMap.put(_Fields.FAILURE, new org.apache.thrift.meta_data.FieldMetaData("failure", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class)));
       tmpMap.put(_Fields.ERROR, new org.apache.thrift.meta_data.FieldMetaData("error", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(startServerAuthentication_result.class, metaDataMap);
     }
 
@@ -14544,7 +14899,7 @@ public class MasterServer {
     }
 
     public startServerAuthentication_result(
-      ByteBuffer success,
+      java.nio.ByteBuffer success,
       TAuthorizationException failure,
       TInvocationException error)
     {
@@ -14585,16 +14940,16 @@ public class MasterServer {
       return success == null ? null : success.array();
     }
 
-    public ByteBuffer bufferForSuccess() {
+    public java.nio.ByteBuffer bufferForSuccess() {
       return org.apache.thrift.TBaseHelper.copyBinary(success);
     }
 
     public startServerAuthentication_result setSuccess(byte[] success) {
-      this.success = success == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(success, success.length));
+      this.success = success == null ? (java.nio.ByteBuffer)null     : java.nio.ByteBuffer.wrap(success.clone());
       return this;
     }
 
-    public startServerAuthentication_result setSuccess(ByteBuffer success) {
+    public startServerAuthentication_result setSuccess(@org.apache.thrift.annotation.Nullable java.nio.ByteBuffer success) {
       this.success = org.apache.thrift.TBaseHelper.copyBinary(success);
       return this;
     }
@@ -14614,11 +14969,12 @@ public class MasterServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TAuthorizationException getFailure() {
       return this.failure;
     }
 
-    public startServerAuthentication_result setFailure(TAuthorizationException failure) {
+    public startServerAuthentication_result setFailure(@org.apache.thrift.annotation.Nullable TAuthorizationException failure) {
       this.failure = failure;
       return this;
     }
@@ -14638,11 +14994,12 @@ public class MasterServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvocationException getError() {
       return this.error;
     }
 
-    public startServerAuthentication_result setError(TInvocationException error) {
+    public startServerAuthentication_result setError(@org.apache.thrift.annotation.Nullable TInvocationException error) {
       this.error = error;
       return this;
     }
@@ -14662,13 +15019,17 @@ public class MasterServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
           unsetSuccess();
         } else {
-          setSuccess((ByteBuffer)value);
+          if (value instanceof byte[]) {
+            setSuccess((byte[])value);
+          } else {
+            setSuccess((java.nio.ByteBuffer)value);
+          }
         }
         break;
 
@@ -14691,7 +15052,8 @@ public class MasterServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
         return getSuccess();
@@ -14703,13 +15065,13 @@ public class MasterServer {
         return getError();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -14720,13 +15082,11 @@ public class MasterServer {
       case ERROR:
         return isSetError();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof startServerAuthentication_result)
         return this.equals((startServerAuthentication_result)that);
       return false;
@@ -14735,6 +15095,8 @@ public class MasterServer {
     public boolean equals(startServerAuthentication_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_success = true && this.isSetSuccess();
       boolean that_present_success = true && that.isSetSuccess();
@@ -14768,24 +15130,21 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
 
-      boolean present_failure = true && (isSetFailure());
-      list.add(present_failure);
-      if (present_failure)
-        list.add(failure);
+      hashCode = hashCode * 8191 + ((isSetFailure()) ? 131071 : 524287);
+      if (isSetFailure())
+        hashCode = hashCode * 8191 + failure.hashCode();
 
-      boolean present_error = true && (isSetError());
-      list.add(present_error);
-      if (present_error)
-        list.add(error);
+      hashCode = hashCode * 8191 + ((isSetError()) ? 131071 : 524287);
+      if (isSetError())
+        hashCode = hashCode * 8191 + error.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -14796,7 +15155,7 @@ public class MasterServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -14806,7 +15165,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure());
+      lastComparison = java.lang.Boolean.compare(isSetFailure(), other.isSetFailure());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -14816,7 +15175,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetError()).compareTo(other.isSetError());
+      lastComparison = java.lang.Boolean.compare(isSetError(), other.isSetError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -14829,21 +15188,22 @@ public class MasterServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("startServerAuthentication_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("startServerAuthentication_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -14886,7 +15246,7 @@ public class MasterServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -14894,13 +15254,13 @@ public class MasterServer {
       }
     }
 
-    private static class startServerAuthentication_resultStandardSchemeFactory implements SchemeFactory {
+    private static class startServerAuthentication_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public startServerAuthentication_resultStandardScheme getScheme() {
         return new startServerAuthentication_resultStandardScheme();
       }
     }
 
-    private static class startServerAuthentication_resultStandardScheme extends StandardScheme<startServerAuthentication_result> {
+    private static class startServerAuthentication_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<startServerAuthentication_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, startServerAuthentication_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -14974,18 +15334,18 @@ public class MasterServer {
 
     }
 
-    private static class startServerAuthentication_resultTupleSchemeFactory implements SchemeFactory {
+    private static class startServerAuthentication_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public startServerAuthentication_resultTupleScheme getScheme() {
         return new startServerAuthentication_resultTupleScheme();
       }
     }
 
-    private static class startServerAuthentication_resultTupleScheme extends TupleScheme<startServerAuthentication_result> {
+    private static class startServerAuthentication_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<startServerAuthentication_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, startServerAuthentication_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
           optionals.set(0);
         }
@@ -15009,8 +15369,8 @@ public class MasterServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, startServerAuthentication_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(3);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           struct.success = iprot.readBinary();
           struct.setSuccessIsSet(true);
@@ -15028,6 +15388,9 @@ public class MasterServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class serverAuthenticate_args implements org.apache.thrift.TBase<serverAuthenticate_args, serverAuthenticate_args._Fields>, java.io.Serializable, Cloneable, Comparable<serverAuthenticate_args>   {
@@ -15036,24 +15399,21 @@ public class MasterServer {
     private static final org.apache.thrift.protocol.TField SATELLITE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("satelliteId", org.apache.thrift.protocol.TType.I32, (short)1);
     private static final org.apache.thrift.protocol.TField CHALLENGE_RESPONSE_FIELD_DESC = new org.apache.thrift.protocol.TField("challengeResponse", org.apache.thrift.protocol.TType.STRING, (short)2);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new serverAuthenticate_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new serverAuthenticate_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new serverAuthenticate_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new serverAuthenticate_argsTupleSchemeFactory();
 
     public int satelliteId; // required
-    public ByteBuffer challengeResponse; // required
+    public @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer challengeResponse; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SATELLITE_ID((short)1, "satelliteId"),
       CHALLENGE_RESPONSE((short)2, "challengeResponse");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -15061,6 +15421,7 @@ public class MasterServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // SATELLITE_ID
@@ -15078,21 +15439,22 @@ public class MasterServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -15101,7 +15463,7 @@ public class MasterServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
@@ -15109,14 +15471,14 @@ public class MasterServer {
     // isset id assignments
     private static final int __SATELLITEID_ISSET_ID = 0;
     private byte __isset_bitfield = 0;
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SATELLITE_ID, new org.apache.thrift.meta_data.FieldMetaData("satelliteId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
       tmpMap.put(_Fields.CHALLENGE_RESPONSE, new org.apache.thrift.meta_data.FieldMetaData("challengeResponse", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , true)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(serverAuthenticate_args.class, metaDataMap);
     }
 
@@ -15125,7 +15487,7 @@ public class MasterServer {
 
     public serverAuthenticate_args(
       int satelliteId,
-      ByteBuffer challengeResponse)
+      java.nio.ByteBuffer challengeResponse)
     {
       this();
       this.satelliteId = satelliteId;
@@ -15166,16 +15528,16 @@ public class MasterServer {
     }
 
     public void unsetSatelliteId() {
-      __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SATELLITEID_ISSET_ID);
+      __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SATELLITEID_ISSET_ID);
     }
 
     /** Returns true if field satelliteId is set (has been assigned a value) and false otherwise */
     public boolean isSetSatelliteId() {
-      return EncodingUtils.testBit(__isset_bitfield, __SATELLITEID_ISSET_ID);
+      return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SATELLITEID_ISSET_ID);
     }
 
     public void setSatelliteIdIsSet(boolean value) {
-      __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SATELLITEID_ISSET_ID, value);
+      __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SATELLITEID_ISSET_ID, value);
     }
 
     public byte[] getChallengeResponse() {
@@ -15183,16 +15545,16 @@ public class MasterServer {
       return challengeResponse == null ? null : challengeResponse.array();
     }
 
-    public ByteBuffer bufferForChallengeResponse() {
+    public java.nio.ByteBuffer bufferForChallengeResponse() {
       return org.apache.thrift.TBaseHelper.copyBinary(challengeResponse);
     }
 
     public serverAuthenticate_args setChallengeResponse(byte[] challengeResponse) {
-      this.challengeResponse = challengeResponse == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(challengeResponse, challengeResponse.length));
+      this.challengeResponse = challengeResponse == null ? (java.nio.ByteBuffer)null     : java.nio.ByteBuffer.wrap(challengeResponse.clone());
       return this;
     }
 
-    public serverAuthenticate_args setChallengeResponse(ByteBuffer challengeResponse) {
+    public serverAuthenticate_args setChallengeResponse(@org.apache.thrift.annotation.Nullable java.nio.ByteBuffer challengeResponse) {
       this.challengeResponse = org.apache.thrift.TBaseHelper.copyBinary(challengeResponse);
       return this;
     }
@@ -15212,13 +15574,13 @@ public class MasterServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SATELLITE_ID:
         if (value == null) {
           unsetSatelliteId();
         } else {
-          setSatelliteId((Integer)value);
+          setSatelliteId((java.lang.Integer)value);
         }
         break;
 
@@ -15226,14 +15588,19 @@ public class MasterServer {
         if (value == null) {
           unsetChallengeResponse();
         } else {
-          setChallengeResponse((ByteBuffer)value);
+          if (value instanceof byte[]) {
+            setChallengeResponse((byte[])value);
+          } else {
+            setChallengeResponse((java.nio.ByteBuffer)value);
+          }
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SATELLITE_ID:
         return getSatelliteId();
@@ -15242,13 +15609,13 @@ public class MasterServer {
         return getChallengeResponse();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -15257,13 +15624,11 @@ public class MasterServer {
       case CHALLENGE_RESPONSE:
         return isSetChallengeResponse();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof serverAuthenticate_args)
         return this.equals((serverAuthenticate_args)that);
       return false;
@@ -15272,6 +15637,8 @@ public class MasterServer {
     public boolean equals(serverAuthenticate_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_satelliteId = true;
       boolean that_present_satelliteId = true;
@@ -15296,19 +15663,15 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_satelliteId = true;
-      list.add(present_satelliteId);
-      if (present_satelliteId)
-        list.add(satelliteId);
+      hashCode = hashCode * 8191 + satelliteId;
 
-      boolean present_challengeResponse = true && (isSetChallengeResponse());
-      list.add(present_challengeResponse);
-      if (present_challengeResponse)
-        list.add(challengeResponse);
+      hashCode = hashCode * 8191 + ((isSetChallengeResponse()) ? 131071 : 524287);
+      if (isSetChallengeResponse())
+        hashCode = hashCode * 8191 + challengeResponse.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -15319,7 +15682,7 @@ public class MasterServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSatelliteId()).compareTo(other.isSetSatelliteId());
+      lastComparison = java.lang.Boolean.compare(isSetSatelliteId(), other.isSetSatelliteId());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -15329,7 +15692,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetChallengeResponse()).compareTo(other.isSetChallengeResponse());
+      lastComparison = java.lang.Boolean.compare(isSetChallengeResponse(), other.isSetChallengeResponse());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -15342,21 +15705,22 @@ public class MasterServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("serverAuthenticate_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("serverAuthenticate_args(");
       boolean first = true;
 
       sb.append("satelliteId:");
@@ -15387,7 +15751,7 @@ public class MasterServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
         __isset_bitfield = 0;
@@ -15397,13 +15761,13 @@ public class MasterServer {
       }
     }
 
-    private static class serverAuthenticate_argsStandardSchemeFactory implements SchemeFactory {
+    private static class serverAuthenticate_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public serverAuthenticate_argsStandardScheme getScheme() {
         return new serverAuthenticate_argsStandardScheme();
       }
     }
 
-    private static class serverAuthenticate_argsStandardScheme extends StandardScheme<serverAuthenticate_args> {
+    private static class serverAuthenticate_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<serverAuthenticate_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, serverAuthenticate_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -15460,18 +15824,18 @@ public class MasterServer {
 
     }
 
-    private static class serverAuthenticate_argsTupleSchemeFactory implements SchemeFactory {
+    private static class serverAuthenticate_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public serverAuthenticate_argsTupleScheme getScheme() {
         return new serverAuthenticate_argsTupleScheme();
       }
     }
 
-    private static class serverAuthenticate_argsTupleScheme extends TupleScheme<serverAuthenticate_args> {
+    private static class serverAuthenticate_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<serverAuthenticate_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, serverAuthenticate_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSatelliteId()) {
           optionals.set(0);
         }
@@ -15489,8 +15853,8 @@ public class MasterServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, serverAuthenticate_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(2);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           struct.satelliteId = iprot.readI32();
           struct.setSatelliteIdIsSet(true);
@@ -15502,6 +15866,9 @@ public class MasterServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class serverAuthenticate_result implements org.apache.thrift.TBase<serverAuthenticate_result, serverAuthenticate_result._Fields>, java.io.Serializable, Cloneable, Comparable<serverAuthenticate_result>   {
@@ -15511,15 +15878,12 @@ public class MasterServer {
     private static final org.apache.thrift.protocol.TField FAILURE_FIELD_DESC = new org.apache.thrift.protocol.TField("failure", org.apache.thrift.protocol.TType.STRUCT, (short)1);
     private static final org.apache.thrift.protocol.TField ERRR_FIELD_DESC = new org.apache.thrift.protocol.TField("errr", org.apache.thrift.protocol.TType.STRUCT, (short)2);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new serverAuthenticate_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new serverAuthenticate_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new serverAuthenticate_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new serverAuthenticate_resultTupleSchemeFactory();
 
-    public ServerSessionData success; // required
-    public TAuthorizationException failure; // required
-    public TInvocationException errr; // required
+    public @org.apache.thrift.annotation.Nullable ServerSessionData success; // required
+    public @org.apache.thrift.annotation.Nullable TAuthorizationException failure; // required
+    public @org.apache.thrift.annotation.Nullable TInvocationException errr; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -15527,10 +15891,10 @@ public class MasterServer {
       FAILURE((short)1, "failure"),
       ERRR((short)2, "errr");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -15538,6 +15902,7 @@ public class MasterServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
@@ -15557,21 +15922,22 @@ public class MasterServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -15580,22 +15946,22 @@ public class MasterServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ServerSessionData.class)));
       tmpMap.put(_Fields.FAILURE, new org.apache.thrift.meta_data.FieldMetaData("failure", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class)));
       tmpMap.put(_Fields.ERRR, new org.apache.thrift.meta_data.FieldMetaData("errr", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(serverAuthenticate_result.class, metaDataMap);
     }
 
@@ -15639,11 +16005,12 @@ public class MasterServer {
       this.errr = null;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public ServerSessionData getSuccess() {
       return this.success;
     }
 
-    public serverAuthenticate_result setSuccess(ServerSessionData success) {
+    public serverAuthenticate_result setSuccess(@org.apache.thrift.annotation.Nullable ServerSessionData success) {
       this.success = success;
       return this;
     }
@@ -15663,11 +16030,12 @@ public class MasterServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TAuthorizationException getFailure() {
       return this.failure;
     }
 
-    public serverAuthenticate_result setFailure(TAuthorizationException failure) {
+    public serverAuthenticate_result setFailure(@org.apache.thrift.annotation.Nullable TAuthorizationException failure) {
       this.failure = failure;
       return this;
     }
@@ -15687,11 +16055,12 @@ public class MasterServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvocationException getErrr() {
       return this.errr;
     }
 
-    public serverAuthenticate_result setErrr(TInvocationException errr) {
+    public serverAuthenticate_result setErrr(@org.apache.thrift.annotation.Nullable TInvocationException errr) {
       this.errr = errr;
       return this;
     }
@@ -15711,7 +16080,7 @@ public class MasterServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
@@ -15740,7 +16109,8 @@ public class MasterServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
         return getSuccess();
@@ -15752,13 +16122,13 @@ public class MasterServer {
         return getErrr();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -15769,13 +16139,11 @@ public class MasterServer {
       case ERRR:
         return isSetErrr();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof serverAuthenticate_result)
         return this.equals((serverAuthenticate_result)that);
       return false;
@@ -15784,6 +16152,8 @@ public class MasterServer {
     public boolean equals(serverAuthenticate_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_success = true && this.isSetSuccess();
       boolean that_present_success = true && that.isSetSuccess();
@@ -15817,24 +16187,21 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
 
-      boolean present_failure = true && (isSetFailure());
-      list.add(present_failure);
-      if (present_failure)
-        list.add(failure);
+      hashCode = hashCode * 8191 + ((isSetFailure()) ? 131071 : 524287);
+      if (isSetFailure())
+        hashCode = hashCode * 8191 + failure.hashCode();
 
-      boolean present_errr = true && (isSetErrr());
-      list.add(present_errr);
-      if (present_errr)
-        list.add(errr);
+      hashCode = hashCode * 8191 + ((isSetErrr()) ? 131071 : 524287);
+      if (isSetErrr())
+        hashCode = hashCode * 8191 + errr.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -15845,7 +16212,7 @@ public class MasterServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -15855,7 +16222,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure());
+      lastComparison = java.lang.Boolean.compare(isSetFailure(), other.isSetFailure());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -15865,7 +16232,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetErrr()).compareTo(other.isSetErrr());
+      lastComparison = java.lang.Boolean.compare(isSetErrr(), other.isSetErrr());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -15878,21 +16245,22 @@ public class MasterServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("serverAuthenticate_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("serverAuthenticate_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -15938,7 +16306,7 @@ public class MasterServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -15946,13 +16314,13 @@ public class MasterServer {
       }
     }
 
-    private static class serverAuthenticate_resultStandardSchemeFactory implements SchemeFactory {
+    private static class serverAuthenticate_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public serverAuthenticate_resultStandardScheme getScheme() {
         return new serverAuthenticate_resultStandardScheme();
       }
     }
 
-    private static class serverAuthenticate_resultStandardScheme extends StandardScheme<serverAuthenticate_result> {
+    private static class serverAuthenticate_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<serverAuthenticate_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, serverAuthenticate_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -16027,18 +16395,18 @@ public class MasterServer {
 
     }
 
-    private static class serverAuthenticate_resultTupleSchemeFactory implements SchemeFactory {
+    private static class serverAuthenticate_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public serverAuthenticate_resultTupleScheme getScheme() {
         return new serverAuthenticate_resultTupleScheme();
       }
     }
 
-    private static class serverAuthenticate_resultTupleScheme extends TupleScheme<serverAuthenticate_result> {
+    private static class serverAuthenticate_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<serverAuthenticate_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, serverAuthenticate_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
           optionals.set(0);
         }
@@ -16062,8 +16430,8 @@ public class MasterServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, serverAuthenticate_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(3);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           struct.success = new ServerSessionData();
           struct.success.read(iprot);
@@ -16082,6 +16450,9 @@ public class MasterServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getImageData_args implements org.apache.thrift.TBase<getImageData_args, getImageData_args._Fields>, java.io.Serializable, Cloneable, Comparable<getImageData_args>   {
@@ -16090,24 +16461,21 @@ public class MasterServer {
     private static final org.apache.thrift.protocol.TField SERVER_SESSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("serverSessionId", org.apache.thrift.protocol.TType.STRING, (short)1);
     private static final org.apache.thrift.protocol.TField IMAGE_VERSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("imageVersionId", org.apache.thrift.protocol.TType.STRING, (short)2);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getImageData_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getImageData_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getImageData_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getImageData_argsTupleSchemeFactory();
 
-    public String serverSessionId; // required
-    public String imageVersionId; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String serverSessionId; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String imageVersionId; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SERVER_SESSION_ID((short)1, "serverSessionId"),
       IMAGE_VERSION_ID((short)2, "imageVersionId");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -16115,6 +16483,7 @@ public class MasterServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // SERVER_SESSION_ID
@@ -16132,21 +16501,22 @@ public class MasterServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -16155,20 +16525,20 @@ public class MasterServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SERVER_SESSION_ID, new org.apache.thrift.meta_data.FieldMetaData("serverSessionId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
       tmpMap.put(_Fields.IMAGE_VERSION_ID, new org.apache.thrift.meta_data.FieldMetaData("imageVersionId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "UUID")));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getImageData_args.class, metaDataMap);
     }
 
@@ -16176,8 +16546,8 @@ public class MasterServer {
     }
 
     public getImageData_args(
-      String serverSessionId,
-      String imageVersionId)
+      java.lang.String serverSessionId,
+      java.lang.String imageVersionId)
     {
       this();
       this.serverSessionId = serverSessionId;
@@ -16206,11 +16576,12 @@ public class MasterServer {
       this.imageVersionId = null;
     }
 
-    public String getServerSessionId() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getServerSessionId() {
       return this.serverSessionId;
     }
 
-    public getImageData_args setServerSessionId(String serverSessionId) {
+    public getImageData_args setServerSessionId(@org.apache.thrift.annotation.Nullable java.lang.String serverSessionId) {
       this.serverSessionId = serverSessionId;
       return this;
     }
@@ -16230,11 +16601,12 @@ public class MasterServer {
       }
     }
 
-    public String getImageVersionId() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getImageVersionId() {
       return this.imageVersionId;
     }
 
-    public getImageData_args setImageVersionId(String imageVersionId) {
+    public getImageData_args setImageVersionId(@org.apache.thrift.annotation.Nullable java.lang.String imageVersionId) {
       this.imageVersionId = imageVersionId;
       return this;
     }
@@ -16254,13 +16626,13 @@ public class MasterServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SERVER_SESSION_ID:
         if (value == null) {
           unsetServerSessionId();
         } else {
-          setServerSessionId((String)value);
+          setServerSessionId((java.lang.String)value);
         }
         break;
 
@@ -16268,14 +16640,15 @@ public class MasterServer {
         if (value == null) {
           unsetImageVersionId();
         } else {
-          setImageVersionId((String)value);
+          setImageVersionId((java.lang.String)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SERVER_SESSION_ID:
         return getServerSessionId();
@@ -16284,13 +16657,13 @@ public class MasterServer {
         return getImageVersionId();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -16299,13 +16672,11 @@ public class MasterServer {
       case IMAGE_VERSION_ID:
         return isSetImageVersionId();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getImageData_args)
         return this.equals((getImageData_args)that);
       return false;
@@ -16314,6 +16685,8 @@ public class MasterServer {
     public boolean equals(getImageData_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_serverSessionId = true && this.isSetServerSessionId();
       boolean that_present_serverSessionId = true && that.isSetServerSessionId();
@@ -16338,19 +16711,17 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_serverSessionId = true && (isSetServerSessionId());
-      list.add(present_serverSessionId);
-      if (present_serverSessionId)
-        list.add(serverSessionId);
+      hashCode = hashCode * 8191 + ((isSetServerSessionId()) ? 131071 : 524287);
+      if (isSetServerSessionId())
+        hashCode = hashCode * 8191 + serverSessionId.hashCode();
 
-      boolean present_imageVersionId = true && (isSetImageVersionId());
-      list.add(present_imageVersionId);
-      if (present_imageVersionId)
-        list.add(imageVersionId);
+      hashCode = hashCode * 8191 + ((isSetImageVersionId()) ? 131071 : 524287);
+      if (isSetImageVersionId())
+        hashCode = hashCode * 8191 + imageVersionId.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -16361,7 +16732,7 @@ public class MasterServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetServerSessionId()).compareTo(other.isSetServerSessionId());
+      lastComparison = java.lang.Boolean.compare(isSetServerSessionId(), other.isSetServerSessionId());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -16371,7 +16742,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetImageVersionId()).compareTo(other.isSetImageVersionId());
+      lastComparison = java.lang.Boolean.compare(isSetImageVersionId(), other.isSetImageVersionId());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -16384,21 +16755,22 @@ public class MasterServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getImageData_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getImageData_args(");
       boolean first = true;
 
       sb.append("serverSessionId:");
@@ -16433,7 +16805,7 @@ public class MasterServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -16441,13 +16813,13 @@ public class MasterServer {
       }
     }
 
-    private static class getImageData_argsStandardSchemeFactory implements SchemeFactory {
+    private static class getImageData_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getImageData_argsStandardScheme getScheme() {
         return new getImageData_argsStandardScheme();
       }
     }
 
-    private static class getImageData_argsStandardScheme extends StandardScheme<getImageData_args> {
+    private static class getImageData_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<getImageData_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getImageData_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -16506,18 +16878,18 @@ public class MasterServer {
 
     }
 
-    private static class getImageData_argsTupleSchemeFactory implements SchemeFactory {
+    private static class getImageData_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getImageData_argsTupleScheme getScheme() {
         return new getImageData_argsTupleScheme();
       }
     }
 
-    private static class getImageData_argsTupleScheme extends TupleScheme<getImageData_args> {
+    private static class getImageData_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<getImageData_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getImageData_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetServerSessionId()) {
           optionals.set(0);
         }
@@ -16535,8 +16907,8 @@ public class MasterServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getImageData_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(2);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           struct.serverSessionId = iprot.readString();
           struct.setServerSessionIdIsSet(true);
@@ -16548,6 +16920,9 @@ public class MasterServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getImageData_result implements org.apache.thrift.TBase<getImageData_result, getImageData_result._Fields>, java.io.Serializable, Cloneable, Comparable<getImageData_result>   {
@@ -16558,16 +16933,13 @@ public class MasterServer {
     private static final org.apache.thrift.protocol.TField FAILURE2_FIELD_DESC = new org.apache.thrift.protocol.TField("failure2", org.apache.thrift.protocol.TType.STRUCT, (short)2);
     private static final org.apache.thrift.protocol.TField F3_FIELD_DESC = new org.apache.thrift.protocol.TField("f3", org.apache.thrift.protocol.TType.STRUCT, (short)3);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getImageData_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getImageData_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getImageData_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getImageData_resultTupleSchemeFactory();
 
-    public ImagePublishData success; // required
-    public TAuthorizationException failure; // required
-    public TInvocationException failure2; // required
-    public TNotFoundException f3; // required
+    public @org.apache.thrift.annotation.Nullable ImagePublishData success; // required
+    public @org.apache.thrift.annotation.Nullable TAuthorizationException failure; // required
+    public @org.apache.thrift.annotation.Nullable TInvocationException failure2; // required
+    public @org.apache.thrift.annotation.Nullable TNotFoundException f3; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -16576,10 +16948,10 @@ public class MasterServer {
       FAILURE2((short)2, "failure2"),
       F3((short)3, "f3");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -16587,6 +16959,7 @@ public class MasterServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
@@ -16608,21 +16981,22 @@ public class MasterServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -16631,24 +17005,24 @@ public class MasterServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ImagePublishData.class)));
       tmpMap.put(_Fields.FAILURE, new org.apache.thrift.meta_data.FieldMetaData("failure", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class)));
       tmpMap.put(_Fields.FAILURE2, new org.apache.thrift.meta_data.FieldMetaData("failure2", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class)));
       tmpMap.put(_Fields.F3, new org.apache.thrift.meta_data.FieldMetaData("f3", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TNotFoundException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getImageData_result.class, metaDataMap);
     }
 
@@ -16698,11 +17072,12 @@ public class MasterServer {
       this.f3 = null;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public ImagePublishData getSuccess() {
       return this.success;
     }
 
-    public getImageData_result setSuccess(ImagePublishData success) {
+    public getImageData_result setSuccess(@org.apache.thrift.annotation.Nullable ImagePublishData success) {
       this.success = success;
       return this;
     }
@@ -16722,11 +17097,12 @@ public class MasterServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TAuthorizationException getFailure() {
       return this.failure;
     }
 
-    public getImageData_result setFailure(TAuthorizationException failure) {
+    public getImageData_result setFailure(@org.apache.thrift.annotation.Nullable TAuthorizationException failure) {
       this.failure = failure;
       return this;
     }
@@ -16746,11 +17122,12 @@ public class MasterServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvocationException getFailure2() {
       return this.failure2;
     }
 
-    public getImageData_result setFailure2(TInvocationException failure2) {
+    public getImageData_result setFailure2(@org.apache.thrift.annotation.Nullable TInvocationException failure2) {
       this.failure2 = failure2;
       return this;
     }
@@ -16770,11 +17147,12 @@ public class MasterServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TNotFoundException getF3() {
       return this.f3;
     }
 
-    public getImageData_result setF3(TNotFoundException f3) {
+    public getImageData_result setF3(@org.apache.thrift.annotation.Nullable TNotFoundException f3) {
       this.f3 = f3;
       return this;
     }
@@ -16794,7 +17172,7 @@ public class MasterServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
@@ -16831,7 +17209,8 @@ public class MasterServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
         return getSuccess();
@@ -16846,13 +17225,13 @@ public class MasterServer {
         return getF3();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -16865,13 +17244,11 @@ public class MasterServer {
       case F3:
         return isSetF3();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getImageData_result)
         return this.equals((getImageData_result)that);
       return false;
@@ -16880,6 +17257,8 @@ public class MasterServer {
     public boolean equals(getImageData_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_success = true && this.isSetSuccess();
       boolean that_present_success = true && that.isSetSuccess();
@@ -16922,29 +17301,25 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
 
-      boolean present_failure = true && (isSetFailure());
-      list.add(present_failure);
-      if (present_failure)
-        list.add(failure);
+      hashCode = hashCode * 8191 + ((isSetFailure()) ? 131071 : 524287);
+      if (isSetFailure())
+        hashCode = hashCode * 8191 + failure.hashCode();
 
-      boolean present_failure2 = true && (isSetFailure2());
-      list.add(present_failure2);
-      if (present_failure2)
-        list.add(failure2);
+      hashCode = hashCode * 8191 + ((isSetFailure2()) ? 131071 : 524287);
+      if (isSetFailure2())
+        hashCode = hashCode * 8191 + failure2.hashCode();
 
-      boolean present_f3 = true && (isSetF3());
-      list.add(present_f3);
-      if (present_f3)
-        list.add(f3);
+      hashCode = hashCode * 8191 + ((isSetF3()) ? 131071 : 524287);
+      if (isSetF3())
+        hashCode = hashCode * 8191 + f3.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -16955,7 +17330,7 @@ public class MasterServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -16965,7 +17340,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure());
+      lastComparison = java.lang.Boolean.compare(isSetFailure(), other.isSetFailure());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -16975,7 +17350,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFailure2()).compareTo(other.isSetFailure2());
+      lastComparison = java.lang.Boolean.compare(isSetFailure2(), other.isSetFailure2());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -16985,7 +17360,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetF3()).compareTo(other.isSetF3());
+      lastComparison = java.lang.Boolean.compare(isSetF3(), other.isSetF3());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -16998,21 +17373,22 @@ public class MasterServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getImageData_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getImageData_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -17066,7 +17442,7 @@ public class MasterServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -17074,13 +17450,13 @@ public class MasterServer {
       }
     }
 
-    private static class getImageData_resultStandardSchemeFactory implements SchemeFactory {
+    private static class getImageData_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getImageData_resultStandardScheme getScheme() {
         return new getImageData_resultStandardScheme();
       }
     }
 
-    private static class getImageData_resultStandardScheme extends StandardScheme<getImageData_result> {
+    private static class getImageData_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<getImageData_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getImageData_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -17169,18 +17545,18 @@ public class MasterServer {
 
     }
 
-    private static class getImageData_resultTupleSchemeFactory implements SchemeFactory {
+    private static class getImageData_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getImageData_resultTupleScheme getScheme() {
         return new getImageData_resultTupleScheme();
       }
     }
 
-    private static class getImageData_resultTupleScheme extends TupleScheme<getImageData_result> {
+    private static class getImageData_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<getImageData_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getImageData_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
           optionals.set(0);
         }
@@ -17210,8 +17586,8 @@ public class MasterServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getImageData_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(4);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(4);
         if (incoming.get(0)) {
           struct.success = new ImagePublishData();
           struct.success.read(iprot);
@@ -17235,6 +17611,9 @@ public class MasterServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class submitImage_args implements org.apache.thrift.TBase<submitImage_args, submitImage_args._Fields>, java.io.Serializable, Cloneable, Comparable<submitImage_args>   {
@@ -17244,15 +17623,12 @@ public class MasterServer {
     private static final org.apache.thrift.protocol.TField IMAGE_DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("imageDescription", org.apache.thrift.protocol.TType.STRUCT, (short)2);
     private static final org.apache.thrift.protocol.TField BLOCK_HASHES_FIELD_DESC = new org.apache.thrift.protocol.TField("blockHashes", org.apache.thrift.protocol.TType.LIST, (short)3);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new submitImage_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new submitImage_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new submitImage_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new submitImage_argsTupleSchemeFactory();
 
-    public String userToken; // required
-    public ImagePublishData imageDescription; // required
-    public List<ByteBuffer> blockHashes; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String userToken; // required
+    public @org.apache.thrift.annotation.Nullable ImagePublishData imageDescription; // required
+    public @org.apache.thrift.annotation.Nullable java.util.List<java.nio.ByteBuffer> blockHashes; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -17260,10 +17636,10 @@ public class MasterServer {
       IMAGE_DESCRIPTION((short)2, "imageDescription"),
       BLOCK_HASHES((short)3, "blockHashes");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -17271,6 +17647,7 @@ public class MasterServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // USER_TOKEN
@@ -17290,21 +17667,22 @@ public class MasterServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -17313,15 +17691,15 @@ public class MasterServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.USER_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("userToken", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
       tmpMap.put(_Fields.IMAGE_DESCRIPTION, new org.apache.thrift.meta_data.FieldMetaData("imageDescription", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -17329,7 +17707,7 @@ public class MasterServer {
       tmpMap.put(_Fields.BLOCK_HASHES, new org.apache.thrift.meta_data.FieldMetaData("blockHashes", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
               new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING              , true))));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(submitImage_args.class, metaDataMap);
     }
 
@@ -17337,9 +17715,9 @@ public class MasterServer {
     }
 
     public submitImage_args(
-      String userToken,
+      java.lang.String userToken,
       ImagePublishData imageDescription,
-      List<ByteBuffer> blockHashes)
+      java.util.List<java.nio.ByteBuffer> blockHashes)
     {
       this();
       this.userToken = userToken;
@@ -17358,7 +17736,7 @@ public class MasterServer {
         this.imageDescription = new ImagePublishData(other.imageDescription);
       }
       if (other.isSetBlockHashes()) {
-        List<ByteBuffer> __this__blockHashes = new ArrayList<ByteBuffer>(other.blockHashes);
+        java.util.List<java.nio.ByteBuffer> __this__blockHashes = new java.util.ArrayList<java.nio.ByteBuffer>(other.blockHashes);
         this.blockHashes = __this__blockHashes;
       }
     }
@@ -17374,11 +17752,12 @@ public class MasterServer {
       this.blockHashes = null;
     }
 
-    public String getUserToken() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getUserToken() {
       return this.userToken;
     }
 
-    public submitImage_args setUserToken(String userToken) {
+    public submitImage_args setUserToken(@org.apache.thrift.annotation.Nullable java.lang.String userToken) {
       this.userToken = userToken;
       return this;
     }
@@ -17398,11 +17777,12 @@ public class MasterServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public ImagePublishData getImageDescription() {
       return this.imageDescription;
     }
 
-    public submitImage_args setImageDescription(ImagePublishData imageDescription) {
+    public submitImage_args setImageDescription(@org.apache.thrift.annotation.Nullable ImagePublishData imageDescription) {
       this.imageDescription = imageDescription;
       return this;
     }
@@ -17426,22 +17806,24 @@ public class MasterServer {
       return (this.blockHashes == null) ? 0 : this.blockHashes.size();
     }
 
-    public java.util.Iterator<ByteBuffer> getBlockHashesIterator() {
+    @org.apache.thrift.annotation.Nullable
+    public java.util.Iterator<java.nio.ByteBuffer> getBlockHashesIterator() {
       return (this.blockHashes == null) ? null : this.blockHashes.iterator();
     }
 
-    public void addToBlockHashes(ByteBuffer elem) {
+    public void addToBlockHashes(java.nio.ByteBuffer elem) {
       if (this.blockHashes == null) {
-        this.blockHashes = new ArrayList<ByteBuffer>();
+        this.blockHashes = new java.util.ArrayList<java.nio.ByteBuffer>();
       }
       this.blockHashes.add(elem);
     }
 
-    public List<ByteBuffer> getBlockHashes() {
+    @org.apache.thrift.annotation.Nullable
+    public java.util.List<java.nio.ByteBuffer> getBlockHashes() {
       return this.blockHashes;
     }
 
-    public submitImage_args setBlockHashes(List<ByteBuffer> blockHashes) {
+    public submitImage_args setBlockHashes(@org.apache.thrift.annotation.Nullable java.util.List<java.nio.ByteBuffer> blockHashes) {
       this.blockHashes = blockHashes;
       return this;
     }
@@ -17461,13 +17843,13 @@ public class MasterServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case USER_TOKEN:
         if (value == null) {
           unsetUserToken();
         } else {
-          setUserToken((String)value);
+          setUserToken((java.lang.String)value);
         }
         break;
 
@@ -17483,14 +17865,15 @@ public class MasterServer {
         if (value == null) {
           unsetBlockHashes();
         } else {
-          setBlockHashes((List<ByteBuffer>)value);
+          setBlockHashes((java.util.List<java.nio.ByteBuffer>)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case USER_TOKEN:
         return getUserToken();
@@ -17502,13 +17885,13 @@ public class MasterServer {
         return getBlockHashes();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -17519,13 +17902,11 @@ public class MasterServer {
       case BLOCK_HASHES:
         return isSetBlockHashes();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof submitImage_args)
         return this.equals((submitImage_args)that);
       return false;
@@ -17534,6 +17915,8 @@ public class MasterServer {
     public boolean equals(submitImage_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_userToken = true && this.isSetUserToken();
       boolean that_present_userToken = true && that.isSetUserToken();
@@ -17567,24 +17950,21 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_userToken = true && (isSetUserToken());
-      list.add(present_userToken);
-      if (present_userToken)
-        list.add(userToken);
+      hashCode = hashCode * 8191 + ((isSetUserToken()) ? 131071 : 524287);
+      if (isSetUserToken())
+        hashCode = hashCode * 8191 + userToken.hashCode();
 
-      boolean present_imageDescription = true && (isSetImageDescription());
-      list.add(present_imageDescription);
-      if (present_imageDescription)
-        list.add(imageDescription);
+      hashCode = hashCode * 8191 + ((isSetImageDescription()) ? 131071 : 524287);
+      if (isSetImageDescription())
+        hashCode = hashCode * 8191 + imageDescription.hashCode();
 
-      boolean present_blockHashes = true && (isSetBlockHashes());
-      list.add(present_blockHashes);
-      if (present_blockHashes)
-        list.add(blockHashes);
+      hashCode = hashCode * 8191 + ((isSetBlockHashes()) ? 131071 : 524287);
+      if (isSetBlockHashes())
+        hashCode = hashCode * 8191 + blockHashes.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -17595,7 +17975,7 @@ public class MasterServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetUserToken()).compareTo(other.isSetUserToken());
+      lastComparison = java.lang.Boolean.compare(isSetUserToken(), other.isSetUserToken());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -17605,7 +17985,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetImageDescription()).compareTo(other.isSetImageDescription());
+      lastComparison = java.lang.Boolean.compare(isSetImageDescription(), other.isSetImageDescription());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -17615,7 +17995,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetBlockHashes()).compareTo(other.isSetBlockHashes());
+      lastComparison = java.lang.Boolean.compare(isSetBlockHashes(), other.isSetBlockHashes());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -17628,21 +18008,22 @@ public class MasterServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("submitImage_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("submitImage_args(");
       boolean first = true;
 
       sb.append("userToken:");
@@ -17688,7 +18069,7 @@ public class MasterServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -17696,13 +18077,13 @@ public class MasterServer {
       }
     }
 
-    private static class submitImage_argsStandardSchemeFactory implements SchemeFactory {
+    private static class submitImage_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public submitImage_argsStandardScheme getScheme() {
         return new submitImage_argsStandardScheme();
       }
     }
 
-    private static class submitImage_argsStandardScheme extends StandardScheme<submitImage_args> {
+    private static class submitImage_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<submitImage_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, submitImage_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -17734,13 +18115,13 @@ public class MasterServer {
             case 3: // BLOCK_HASHES
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list322 = iprot.readListBegin();
-                  struct.blockHashes = new ArrayList<ByteBuffer>(_list322.size);
-                  ByteBuffer _elem323;
-                  for (int _i324 = 0; _i324 < _list322.size; ++_i324)
+                  org.apache.thrift.protocol.TList _list434 = iprot.readListBegin();
+                  struct.blockHashes = new java.util.ArrayList<java.nio.ByteBuffer>(_list434.size);
+                  @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer _elem435;
+                  for (int _i436 = 0; _i436 < _list434.size; ++_i436)
                   {
-                    _elem323 = iprot.readBinary();
-                    struct.blockHashes.add(_elem323);
+                    _elem435 = iprot.readBinary();
+                    struct.blockHashes.add(_elem435);
                   }
                   iprot.readListEnd();
                 }
@@ -17778,9 +18159,9 @@ public class MasterServer {
           oprot.writeFieldBegin(BLOCK_HASHES_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.blockHashes.size()));
-            for (ByteBuffer _iter325 : struct.blockHashes)
+            for (java.nio.ByteBuffer _iter437 : struct.blockHashes)
             {
-              oprot.writeBinary(_iter325);
+              oprot.writeBinary(_iter437);
             }
             oprot.writeListEnd();
           }
@@ -17792,18 +18173,18 @@ public class MasterServer {
 
     }
 
-    private static class submitImage_argsTupleSchemeFactory implements SchemeFactory {
+    private static class submitImage_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public submitImage_argsTupleScheme getScheme() {
         return new submitImage_argsTupleScheme();
       }
     }
 
-    private static class submitImage_argsTupleScheme extends TupleScheme<submitImage_args> {
+    private static class submitImage_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<submitImage_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, submitImage_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetUserToken()) {
           optionals.set(0);
         }
@@ -17823,9 +18204,9 @@ public class MasterServer {
         if (struct.isSetBlockHashes()) {
           {
             oprot.writeI32(struct.blockHashes.size());
-            for (ByteBuffer _iter326 : struct.blockHashes)
+            for (java.nio.ByteBuffer _iter438 : struct.blockHashes)
             {
-              oprot.writeBinary(_iter326);
+              oprot.writeBinary(_iter438);
             }
           }
         }
@@ -17833,8 +18214,8 @@ public class MasterServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, submitImage_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(3);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           struct.userToken = iprot.readString();
           struct.setUserTokenIsSet(true);
@@ -17846,13 +18227,13 @@ public class MasterServer {
         }
         if (incoming.get(2)) {
           {
-            org.apache.thrift.protocol.TList _list327 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-            struct.blockHashes = new ArrayList<ByteBuffer>(_list327.size);
-            ByteBuffer _elem328;
-            for (int _i329 = 0; _i329 < _list327.size; ++_i329)
+            org.apache.thrift.protocol.TList _list439 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.blockHashes = new java.util.ArrayList<java.nio.ByteBuffer>(_list439.size);
+            @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer _elem440;
+            for (int _i441 = 0; _i441 < _list439.size; ++_i441)
             {
-              _elem328 = iprot.readBinary();
-              struct.blockHashes.add(_elem328);
+              _elem440 = iprot.readBinary();
+              struct.blockHashes.add(_elem440);
             }
           }
           struct.setBlockHashesIsSet(true);
@@ -17860,6 +18241,9 @@ public class MasterServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class submitImage_result implements org.apache.thrift.TBase<submitImage_result, submitImage_result._Fields>, java.io.Serializable, Cloneable, Comparable<submitImage_result>   {
@@ -17870,16 +18254,13 @@ public class MasterServer {
     private static final org.apache.thrift.protocol.TField FAILURE2_FIELD_DESC = new org.apache.thrift.protocol.TField("failure2", org.apache.thrift.protocol.TType.STRUCT, (short)2);
     private static final org.apache.thrift.protocol.TField FAILURE3_FIELD_DESC = new org.apache.thrift.protocol.TField("failure3", org.apache.thrift.protocol.TType.STRUCT, (short)3);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new submitImage_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new submitImage_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new submitImage_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new submitImage_resultTupleSchemeFactory();
 
-    public TransferInformation success; // required
-    public TAuthorizationException failure; // required
-    public TInvocationException failure2; // required
-    public TTransferRejectedException failure3; // required
+    public @org.apache.thrift.annotation.Nullable TransferInformation success; // required
+    public @org.apache.thrift.annotation.Nullable TAuthorizationException failure; // required
+    public @org.apache.thrift.annotation.Nullable TInvocationException failure2; // required
+    public @org.apache.thrift.annotation.Nullable TTransferRejectedException failure3; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -17888,10 +18269,10 @@ public class MasterServer {
       FAILURE2((short)2, "failure2"),
       FAILURE3((short)3, "failure3");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -17899,6 +18280,7 @@ public class MasterServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
@@ -17920,21 +18302,22 @@ public class MasterServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -17943,24 +18326,24 @@ public class MasterServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TransferInformation.class)));
       tmpMap.put(_Fields.FAILURE, new org.apache.thrift.meta_data.FieldMetaData("failure", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class)));
       tmpMap.put(_Fields.FAILURE2, new org.apache.thrift.meta_data.FieldMetaData("failure2", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class)));
       tmpMap.put(_Fields.FAILURE3, new org.apache.thrift.meta_data.FieldMetaData("failure3", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TTransferRejectedException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(submitImage_result.class, metaDataMap);
     }
 
@@ -18010,11 +18393,12 @@ public class MasterServer {
       this.failure3 = null;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TransferInformation getSuccess() {
       return this.success;
     }
 
-    public submitImage_result setSuccess(TransferInformation success) {
+    public submitImage_result setSuccess(@org.apache.thrift.annotation.Nullable TransferInformation success) {
       this.success = success;
       return this;
     }
@@ -18034,11 +18418,12 @@ public class MasterServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TAuthorizationException getFailure() {
       return this.failure;
     }
 
-    public submitImage_result setFailure(TAuthorizationException failure) {
+    public submitImage_result setFailure(@org.apache.thrift.annotation.Nullable TAuthorizationException failure) {
       this.failure = failure;
       return this;
     }
@@ -18058,11 +18443,12 @@ public class MasterServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvocationException getFailure2() {
       return this.failure2;
     }
 
-    public submitImage_result setFailure2(TInvocationException failure2) {
+    public submitImage_result setFailure2(@org.apache.thrift.annotation.Nullable TInvocationException failure2) {
       this.failure2 = failure2;
       return this;
     }
@@ -18082,11 +18468,12 @@ public class MasterServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TTransferRejectedException getFailure3() {
       return this.failure3;
     }
 
-    public submitImage_result setFailure3(TTransferRejectedException failure3) {
+    public submitImage_result setFailure3(@org.apache.thrift.annotation.Nullable TTransferRejectedException failure3) {
       this.failure3 = failure3;
       return this;
     }
@@ -18106,7 +18493,7 @@ public class MasterServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
@@ -18143,7 +18530,8 @@ public class MasterServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
         return getSuccess();
@@ -18158,13 +18546,13 @@ public class MasterServer {
         return getFailure3();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -18177,13 +18565,11 @@ public class MasterServer {
       case FAILURE3:
         return isSetFailure3();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof submitImage_result)
         return this.equals((submitImage_result)that);
       return false;
@@ -18192,6 +18578,8 @@ public class MasterServer {
     public boolean equals(submitImage_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_success = true && this.isSetSuccess();
       boolean that_present_success = true && that.isSetSuccess();
@@ -18234,29 +18622,25 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
 
-      boolean present_failure = true && (isSetFailure());
-      list.add(present_failure);
-      if (present_failure)
-        list.add(failure);
+      hashCode = hashCode * 8191 + ((isSetFailure()) ? 131071 : 524287);
+      if (isSetFailure())
+        hashCode = hashCode * 8191 + failure.hashCode();
 
-      boolean present_failure2 = true && (isSetFailure2());
-      list.add(present_failure2);
-      if (present_failure2)
-        list.add(failure2);
+      hashCode = hashCode * 8191 + ((isSetFailure2()) ? 131071 : 524287);
+      if (isSetFailure2())
+        hashCode = hashCode * 8191 + failure2.hashCode();
 
-      boolean present_failure3 = true && (isSetFailure3());
-      list.add(present_failure3);
-      if (present_failure3)
-        list.add(failure3);
+      hashCode = hashCode * 8191 + ((isSetFailure3()) ? 131071 : 524287);
+      if (isSetFailure3())
+        hashCode = hashCode * 8191 + failure3.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -18267,7 +18651,7 @@ public class MasterServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -18277,7 +18661,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure());
+      lastComparison = java.lang.Boolean.compare(isSetFailure(), other.isSetFailure());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -18287,7 +18671,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFailure2()).compareTo(other.isSetFailure2());
+      lastComparison = java.lang.Boolean.compare(isSetFailure2(), other.isSetFailure2());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -18297,7 +18681,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFailure3()).compareTo(other.isSetFailure3());
+      lastComparison = java.lang.Boolean.compare(isSetFailure3(), other.isSetFailure3());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -18310,21 +18694,22 @@ public class MasterServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("submitImage_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("submitImage_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -18378,7 +18763,7 @@ public class MasterServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -18386,13 +18771,13 @@ public class MasterServer {
       }
     }
 
-    private static class submitImage_resultStandardSchemeFactory implements SchemeFactory {
+    private static class submitImage_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public submitImage_resultStandardScheme getScheme() {
         return new submitImage_resultStandardScheme();
       }
     }
 
-    private static class submitImage_resultStandardScheme extends StandardScheme<submitImage_result> {
+    private static class submitImage_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<submitImage_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, submitImage_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -18481,18 +18866,18 @@ public class MasterServer {
 
     }
 
-    private static class submitImage_resultTupleSchemeFactory implements SchemeFactory {
+    private static class submitImage_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public submitImage_resultTupleScheme getScheme() {
         return new submitImage_resultTupleScheme();
       }
     }
 
-    private static class submitImage_resultTupleScheme extends TupleScheme<submitImage_result> {
+    private static class submitImage_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<submitImage_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, submitImage_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
           optionals.set(0);
         }
@@ -18522,8 +18907,8 @@ public class MasterServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, submitImage_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(4);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(4);
         if (incoming.get(0)) {
           struct.success = new TransferInformation();
           struct.success.read(iprot);
@@ -18547,6 +18932,9 @@ public class MasterServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class registerSatellite_args implements org.apache.thrift.TBase<registerSatellite_args, registerSatellite_args._Fields>, java.io.Serializable, Cloneable, Comparable<registerSatellite_args>   {
@@ -18559,18 +18947,15 @@ public class MasterServer {
     private static final org.apache.thrift.protocol.TField EXPONENT_FIELD_DESC = new org.apache.thrift.protocol.TField("exponent", org.apache.thrift.protocol.TType.STRING, (short)4);
     private static final org.apache.thrift.protocol.TField CERTSHA256_FIELD_DESC = new org.apache.thrift.protocol.TField("certsha256", org.apache.thrift.protocol.TType.STRING, (short)1);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new registerSatellite_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new registerSatellite_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new registerSatellite_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new registerSatellite_argsTupleSchemeFactory();
 
-    public String userToken; // required
-    public String displayName; // required
-    public List<String> addresses; // required
-    public String modulus; // required
-    public String exponent; // required
-    public ByteBuffer certsha256; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String userToken; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String displayName; // required
+    public @org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> addresses; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String modulus; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String exponent; // required
+    public @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer certsha256; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -18581,10 +18966,10 @@ public class MasterServer {
       EXPONENT((short)4, "exponent"),
       CERTSHA256((short)1, "certsha256");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -18592,6 +18977,7 @@ public class MasterServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 6: // USER_TOKEN
@@ -18617,21 +19003,22 @@ public class MasterServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -18640,15 +19027,15 @@ public class MasterServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.USER_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("userToken", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
       tmpMap.put(_Fields.DISPLAY_NAME, new org.apache.thrift.meta_data.FieldMetaData("displayName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -18662,7 +19049,7 @@ public class MasterServer {
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
       tmpMap.put(_Fields.CERTSHA256, new org.apache.thrift.meta_data.FieldMetaData("certsha256", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , true)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(registerSatellite_args.class, metaDataMap);
     }
 
@@ -18670,12 +19057,12 @@ public class MasterServer {
     }
 
     public registerSatellite_args(
-      String userToken,
-      String displayName,
-      List<String> addresses,
-      String modulus,
-      String exponent,
-      ByteBuffer certsha256)
+      java.lang.String userToken,
+      java.lang.String displayName,
+      java.util.List<java.lang.String> addresses,
+      java.lang.String modulus,
+      java.lang.String exponent,
+      java.nio.ByteBuffer certsha256)
     {
       this();
       this.userToken = userToken;
@@ -18697,7 +19084,7 @@ public class MasterServer {
         this.displayName = other.displayName;
       }
       if (other.isSetAddresses()) {
-        List<String> __this__addresses = new ArrayList<String>(other.addresses);
+        java.util.List<java.lang.String> __this__addresses = new java.util.ArrayList<java.lang.String>(other.addresses);
         this.addresses = __this__addresses;
       }
       if (other.isSetModulus()) {
@@ -18725,11 +19112,12 @@ public class MasterServer {
       this.certsha256 = null;
     }
 
-    public String getUserToken() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getUserToken() {
       return this.userToken;
     }
 
-    public registerSatellite_args setUserToken(String userToken) {
+    public registerSatellite_args setUserToken(@org.apache.thrift.annotation.Nullable java.lang.String userToken) {
       this.userToken = userToken;
       return this;
     }
@@ -18749,11 +19137,12 @@ public class MasterServer {
       }
     }
 
-    public String getDisplayName() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getDisplayName() {
       return this.displayName;
     }
 
-    public registerSatellite_args setDisplayName(String displayName) {
+    public registerSatellite_args setDisplayName(@org.apache.thrift.annotation.Nullable java.lang.String displayName) {
       this.displayName = displayName;
       return this;
     }
@@ -18777,22 +19166,24 @@ public class MasterServer {
       return (this.addresses == null) ? 0 : this.addresses.size();
     }
 
-    public java.util.Iterator<String> getAddressesIterator() {
+    @org.apache.thrift.annotation.Nullable
+    public java.util.Iterator<java.lang.String> getAddressesIterator() {
       return (this.addresses == null) ? null : this.addresses.iterator();
     }
 
-    public void addToAddresses(String elem) {
+    public void addToAddresses(java.lang.String elem) {
       if (this.addresses == null) {
-        this.addresses = new ArrayList<String>();
+        this.addresses = new java.util.ArrayList<java.lang.String>();
       }
       this.addresses.add(elem);
     }
 
-    public List<String> getAddresses() {
+    @org.apache.thrift.annotation.Nullable
+    public java.util.List<java.lang.String> getAddresses() {
       return this.addresses;
     }
 
-    public registerSatellite_args setAddresses(List<String> addresses) {
+    public registerSatellite_args setAddresses(@org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> addresses) {
       this.addresses = addresses;
       return this;
     }
@@ -18812,11 +19203,12 @@ public class MasterServer {
       }
     }
 
-    public String getModulus() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getModulus() {
       return this.modulus;
     }
 
-    public registerSatellite_args setModulus(String modulus) {
+    public registerSatellite_args setModulus(@org.apache.thrift.annotation.Nullable java.lang.String modulus) {
       this.modulus = modulus;
       return this;
     }
@@ -18836,11 +19228,12 @@ public class MasterServer {
       }
     }
 
-    public String getExponent() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getExponent() {
       return this.exponent;
     }
 
-    public registerSatellite_args setExponent(String exponent) {
+    public registerSatellite_args setExponent(@org.apache.thrift.annotation.Nullable java.lang.String exponent) {
       this.exponent = exponent;
       return this;
     }
@@ -18865,16 +19258,16 @@ public class MasterServer {
       return certsha256 == null ? null : certsha256.array();
     }
 
-    public ByteBuffer bufferForCertsha256() {
+    public java.nio.ByteBuffer bufferForCertsha256() {
       return org.apache.thrift.TBaseHelper.copyBinary(certsha256);
     }
 
     public registerSatellite_args setCertsha256(byte[] certsha256) {
-      this.certsha256 = certsha256 == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(certsha256, certsha256.length));
+      this.certsha256 = certsha256 == null ? (java.nio.ByteBuffer)null     : java.nio.ByteBuffer.wrap(certsha256.clone());
       return this;
     }
 
-    public registerSatellite_args setCertsha256(ByteBuffer certsha256) {
+    public registerSatellite_args setCertsha256(@org.apache.thrift.annotation.Nullable java.nio.ByteBuffer certsha256) {
       this.certsha256 = org.apache.thrift.TBaseHelper.copyBinary(certsha256);
       return this;
     }
@@ -18894,13 +19287,13 @@ public class MasterServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case USER_TOKEN:
         if (value == null) {
           unsetUserToken();
         } else {
-          setUserToken((String)value);
+          setUserToken((java.lang.String)value);
         }
         break;
 
@@ -18908,7 +19301,7 @@ public class MasterServer {
         if (value == null) {
           unsetDisplayName();
         } else {
-          setDisplayName((String)value);
+          setDisplayName((java.lang.String)value);
         }
         break;
 
@@ -18916,7 +19309,7 @@ public class MasterServer {
         if (value == null) {
           unsetAddresses();
         } else {
-          setAddresses((List<String>)value);
+          setAddresses((java.util.List<java.lang.String>)value);
         }
         break;
 
@@ -18924,7 +19317,7 @@ public class MasterServer {
         if (value == null) {
           unsetModulus();
         } else {
-          setModulus((String)value);
+          setModulus((java.lang.String)value);
         }
         break;
 
@@ -18932,7 +19325,7 @@ public class MasterServer {
         if (value == null) {
           unsetExponent();
         } else {
-          setExponent((String)value);
+          setExponent((java.lang.String)value);
         }
         break;
 
@@ -18940,14 +19333,19 @@ public class MasterServer {
         if (value == null) {
           unsetCertsha256();
         } else {
-          setCertsha256((ByteBuffer)value);
+          if (value instanceof byte[]) {
+            setCertsha256((byte[])value);
+          } else {
+            setCertsha256((java.nio.ByteBuffer)value);
+          }
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case USER_TOKEN:
         return getUserToken();
@@ -18968,13 +19366,13 @@ public class MasterServer {
         return getCertsha256();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -18991,13 +19389,11 @@ public class MasterServer {
       case CERTSHA256:
         return isSetCertsha256();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof registerSatellite_args)
         return this.equals((registerSatellite_args)that);
       return false;
@@ -19006,6 +19402,8 @@ public class MasterServer {
     public boolean equals(registerSatellite_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_userToken = true && this.isSetUserToken();
       boolean that_present_userToken = true && that.isSetUserToken();
@@ -19066,39 +19464,33 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_userToken = true && (isSetUserToken());
-      list.add(present_userToken);
-      if (present_userToken)
-        list.add(userToken);
+      hashCode = hashCode * 8191 + ((isSetUserToken()) ? 131071 : 524287);
+      if (isSetUserToken())
+        hashCode = hashCode * 8191 + userToken.hashCode();
 
-      boolean present_displayName = true && (isSetDisplayName());
-      list.add(present_displayName);
-      if (present_displayName)
-        list.add(displayName);
+      hashCode = hashCode * 8191 + ((isSetDisplayName()) ? 131071 : 524287);
+      if (isSetDisplayName())
+        hashCode = hashCode * 8191 + displayName.hashCode();
 
-      boolean present_addresses = true && (isSetAddresses());
-      list.add(present_addresses);
-      if (present_addresses)
-        list.add(addresses);
+      hashCode = hashCode * 8191 + ((isSetAddresses()) ? 131071 : 524287);
+      if (isSetAddresses())
+        hashCode = hashCode * 8191 + addresses.hashCode();
 
-      boolean present_modulus = true && (isSetModulus());
-      list.add(present_modulus);
-      if (present_modulus)
-        list.add(modulus);
+      hashCode = hashCode * 8191 + ((isSetModulus()) ? 131071 : 524287);
+      if (isSetModulus())
+        hashCode = hashCode * 8191 + modulus.hashCode();
 
-      boolean present_exponent = true && (isSetExponent());
-      list.add(present_exponent);
-      if (present_exponent)
-        list.add(exponent);
+      hashCode = hashCode * 8191 + ((isSetExponent()) ? 131071 : 524287);
+      if (isSetExponent())
+        hashCode = hashCode * 8191 + exponent.hashCode();
 
-      boolean present_certsha256 = true && (isSetCertsha256());
-      list.add(present_certsha256);
-      if (present_certsha256)
-        list.add(certsha256);
+      hashCode = hashCode * 8191 + ((isSetCertsha256()) ? 131071 : 524287);
+      if (isSetCertsha256())
+        hashCode = hashCode * 8191 + certsha256.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -19109,7 +19501,7 @@ public class MasterServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetUserToken()).compareTo(other.isSetUserToken());
+      lastComparison = java.lang.Boolean.compare(isSetUserToken(), other.isSetUserToken());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -19119,7 +19511,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetDisplayName()).compareTo(other.isSetDisplayName());
+      lastComparison = java.lang.Boolean.compare(isSetDisplayName(), other.isSetDisplayName());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -19129,7 +19521,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetAddresses()).compareTo(other.isSetAddresses());
+      lastComparison = java.lang.Boolean.compare(isSetAddresses(), other.isSetAddresses());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -19139,7 +19531,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetModulus()).compareTo(other.isSetModulus());
+      lastComparison = java.lang.Boolean.compare(isSetModulus(), other.isSetModulus());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -19149,7 +19541,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetExponent()).compareTo(other.isSetExponent());
+      lastComparison = java.lang.Boolean.compare(isSetExponent(), other.isSetExponent());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -19159,7 +19551,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetCertsha256()).compareTo(other.isSetCertsha256());
+      lastComparison = java.lang.Boolean.compare(isSetCertsha256(), other.isSetCertsha256());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -19172,21 +19564,22 @@ public class MasterServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("registerSatellite_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("registerSatellite_args(");
       boolean first = true;
 
       sb.append("userToken:");
@@ -19253,7 +19646,7 @@ public class MasterServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -19261,13 +19654,13 @@ public class MasterServer {
       }
     }
 
-    private static class registerSatellite_argsStandardSchemeFactory implements SchemeFactory {
+    private static class registerSatellite_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public registerSatellite_argsStandardScheme getScheme() {
         return new registerSatellite_argsStandardScheme();
       }
     }
 
-    private static class registerSatellite_argsStandardScheme extends StandardScheme<registerSatellite_args> {
+    private static class registerSatellite_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<registerSatellite_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, registerSatellite_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -19298,13 +19691,13 @@ public class MasterServer {
             case 2: // ADDRESSES
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list330 = iprot.readListBegin();
-                  struct.addresses = new ArrayList<String>(_list330.size);
-                  String _elem331;
-                  for (int _i332 = 0; _i332 < _list330.size; ++_i332)
+                  org.apache.thrift.protocol.TList _list442 = iprot.readListBegin();
+                  struct.addresses = new java.util.ArrayList<java.lang.String>(_list442.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem443;
+                  for (int _i444 = 0; _i444 < _list442.size; ++_i444)
                   {
-                    _elem331 = iprot.readString();
-                    struct.addresses.add(_elem331);
+                    _elem443 = iprot.readString();
+                    struct.addresses.add(_elem443);
                   }
                   iprot.readListEnd();
                 }
@@ -19361,9 +19754,9 @@ public class MasterServer {
           oprot.writeFieldBegin(ADDRESSES_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.addresses.size()));
-            for (String _iter333 : struct.addresses)
+            for (java.lang.String _iter445 : struct.addresses)
             {
-              oprot.writeString(_iter333);
+              oprot.writeString(_iter445);
             }
             oprot.writeListEnd();
           }
@@ -19395,18 +19788,18 @@ public class MasterServer {
 
     }
 
-    private static class registerSatellite_argsTupleSchemeFactory implements SchemeFactory {
+    private static class registerSatellite_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public registerSatellite_argsTupleScheme getScheme() {
         return new registerSatellite_argsTupleScheme();
       }
     }
 
-    private static class registerSatellite_argsTupleScheme extends TupleScheme<registerSatellite_args> {
+    private static class registerSatellite_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<registerSatellite_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, registerSatellite_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetUserToken()) {
           optionals.set(0);
         }
@@ -19435,9 +19828,9 @@ public class MasterServer {
         if (struct.isSetAddresses()) {
           {
             oprot.writeI32(struct.addresses.size());
-            for (String _iter334 : struct.addresses)
+            for (java.lang.String _iter446 : struct.addresses)
             {
-              oprot.writeString(_iter334);
+              oprot.writeString(_iter446);
             }
           }
         }
@@ -19454,8 +19847,8 @@ public class MasterServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, registerSatellite_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(6);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(6);
         if (incoming.get(0)) {
           struct.userToken = iprot.readString();
           struct.setUserTokenIsSet(true);
@@ -19466,13 +19859,13 @@ public class MasterServer {
         }
         if (incoming.get(2)) {
           {
-            org.apache.thrift.protocol.TList _list335 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-            struct.addresses = new ArrayList<String>(_list335.size);
-            String _elem336;
-            for (int _i337 = 0; _i337 < _list335.size; ++_i337)
+            org.apache.thrift.protocol.TList _list447 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.addresses = new java.util.ArrayList<java.lang.String>(_list447.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem448;
+            for (int _i449 = 0; _i449 < _list447.size; ++_i449)
             {
-              _elem336 = iprot.readString();
-              struct.addresses.add(_elem336);
+              _elem448 = iprot.readString();
+              struct.addresses.add(_elem448);
             }
           }
           struct.setAddressesIsSet(true);
@@ -19492,6 +19885,9 @@ public class MasterServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class registerSatellite_result implements org.apache.thrift.TBase<registerSatellite_result, registerSatellite_result._Fields>, java.io.Serializable, Cloneable, Comparable<registerSatellite_result>   {
@@ -19500,24 +19896,21 @@ public class MasterServer {
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.I32, (short)0);
     private static final org.apache.thrift.protocol.TField ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("error", org.apache.thrift.protocol.TType.STRUCT, (short)1);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new registerSatellite_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new registerSatellite_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new registerSatellite_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new registerSatellite_resultTupleSchemeFactory();
 
     public int success; // required
-    public TInvocationException error; // required
+    public @org.apache.thrift.annotation.Nullable TInvocationException error; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SUCCESS((short)0, "success"),
       ERROR((short)1, "error");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -19525,6 +19918,7 @@ public class MasterServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
@@ -19542,21 +19936,22 @@ public class MasterServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -19565,7 +19960,7 @@ public class MasterServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
@@ -19573,14 +19968,14 @@ public class MasterServer {
     // isset id assignments
     private static final int __SUCCESS_ISSET_ID = 0;
     private byte __isset_bitfield = 0;
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
       tmpMap.put(_Fields.ERROR, new org.apache.thrift.meta_data.FieldMetaData("error", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(registerSatellite_result.class, metaDataMap);
     }
 
@@ -19630,23 +20025,24 @@ public class MasterServer {
     }
 
     public void unsetSuccess() {
-      __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID);
+      __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID);
     }
 
     /** Returns true if field success is set (has been assigned a value) and false otherwise */
     public boolean isSetSuccess() {
-      return EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID);
+      return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID);
     }
 
     public void setSuccessIsSet(boolean value) {
-      __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value);
+      __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value);
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvocationException getError() {
       return this.error;
     }
 
-    public registerSatellite_result setError(TInvocationException error) {
+    public registerSatellite_result setError(@org.apache.thrift.annotation.Nullable TInvocationException error) {
       this.error = error;
       return this;
     }
@@ -19666,13 +20062,13 @@ public class MasterServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
           unsetSuccess();
         } else {
-          setSuccess((Integer)value);
+          setSuccess((java.lang.Integer)value);
         }
         break;
 
@@ -19687,7 +20083,8 @@ public class MasterServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
         return getSuccess();
@@ -19696,13 +20093,13 @@ public class MasterServer {
         return getError();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -19711,13 +20108,11 @@ public class MasterServer {
       case ERROR:
         return isSetError();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof registerSatellite_result)
         return this.equals((registerSatellite_result)that);
       return false;
@@ -19726,6 +20121,8 @@ public class MasterServer {
     public boolean equals(registerSatellite_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_success = true;
       boolean that_present_success = true;
@@ -19750,19 +20147,15 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_success = true;
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
+      hashCode = hashCode * 8191 + success;
 
-      boolean present_error = true && (isSetError());
-      list.add(present_error);
-      if (present_error)
-        list.add(error);
+      hashCode = hashCode * 8191 + ((isSetError()) ? 131071 : 524287);
+      if (isSetError())
+        hashCode = hashCode * 8191 + error.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -19773,7 +20166,7 @@ public class MasterServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -19783,7 +20176,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetError()).compareTo(other.isSetError());
+      lastComparison = java.lang.Boolean.compare(isSetError(), other.isSetError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -19796,21 +20189,22 @@ public class MasterServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("registerSatellite_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("registerSatellite_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -19841,7 +20235,7 @@ public class MasterServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
         __isset_bitfield = 0;
@@ -19851,13 +20245,13 @@ public class MasterServer {
       }
     }
 
-    private static class registerSatellite_resultStandardSchemeFactory implements SchemeFactory {
+    private static class registerSatellite_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public registerSatellite_resultStandardScheme getScheme() {
         return new registerSatellite_resultStandardScheme();
       }
     }
 
-    private static class registerSatellite_resultStandardScheme extends StandardScheme<registerSatellite_result> {
+    private static class registerSatellite_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<registerSatellite_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, registerSatellite_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -19917,18 +20311,18 @@ public class MasterServer {
 
     }
 
-    private static class registerSatellite_resultTupleSchemeFactory implements SchemeFactory {
+    private static class registerSatellite_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public registerSatellite_resultTupleScheme getScheme() {
         return new registerSatellite_resultTupleScheme();
       }
     }
 
-    private static class registerSatellite_resultTupleScheme extends TupleScheme<registerSatellite_result> {
+    private static class registerSatellite_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<registerSatellite_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, registerSatellite_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
           optionals.set(0);
         }
@@ -19946,8 +20340,8 @@ public class MasterServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, registerSatellite_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(2);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           struct.success = iprot.readI32();
           struct.setSuccessIsSet(true);
@@ -19960,6 +20354,9 @@ public class MasterServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class updateSatellite_args implements org.apache.thrift.TBase<updateSatellite_args, updateSatellite_args._Fields>, java.io.Serializable, Cloneable, Comparable<updateSatellite_args>   {
@@ -19969,15 +20366,12 @@ public class MasterServer {
     private static final org.apache.thrift.protocol.TField DISPLAY_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("displayName", org.apache.thrift.protocol.TType.STRING, (short)2);
     private static final org.apache.thrift.protocol.TField ADDRESSES_FIELD_DESC = new org.apache.thrift.protocol.TField("addresses", org.apache.thrift.protocol.TType.LIST, (short)3);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new updateSatellite_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new updateSatellite_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new updateSatellite_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new updateSatellite_argsTupleSchemeFactory();
 
-    public String serverSessionId; // required
-    public String displayName; // required
-    public List<String> addresses; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String serverSessionId; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String displayName; // required
+    public @org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> addresses; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -19985,10 +20379,10 @@ public class MasterServer {
       DISPLAY_NAME((short)2, "displayName"),
       ADDRESSES((short)3, "addresses");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -19996,6 +20390,7 @@ public class MasterServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // SERVER_SESSION_ID
@@ -20015,21 +20410,22 @@ public class MasterServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -20038,15 +20434,15 @@ public class MasterServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SERVER_SESSION_ID, new org.apache.thrift.meta_data.FieldMetaData("serverSessionId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
       tmpMap.put(_Fields.DISPLAY_NAME, new org.apache.thrift.meta_data.FieldMetaData("displayName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -20054,7 +20450,7 @@ public class MasterServer {
       tmpMap.put(_Fields.ADDRESSES, new org.apache.thrift.meta_data.FieldMetaData("addresses", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
               new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(updateSatellite_args.class, metaDataMap);
     }
 
@@ -20062,9 +20458,9 @@ public class MasterServer {
     }
 
     public updateSatellite_args(
-      String serverSessionId,
-      String displayName,
-      List<String> addresses)
+      java.lang.String serverSessionId,
+      java.lang.String displayName,
+      java.util.List<java.lang.String> addresses)
     {
       this();
       this.serverSessionId = serverSessionId;
@@ -20083,7 +20479,7 @@ public class MasterServer {
         this.displayName = other.displayName;
       }
       if (other.isSetAddresses()) {
-        List<String> __this__addresses = new ArrayList<String>(other.addresses);
+        java.util.List<java.lang.String> __this__addresses = new java.util.ArrayList<java.lang.String>(other.addresses);
         this.addresses = __this__addresses;
       }
     }
@@ -20099,11 +20495,12 @@ public class MasterServer {
       this.addresses = null;
     }
 
-    public String getServerSessionId() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getServerSessionId() {
       return this.serverSessionId;
     }
 
-    public updateSatellite_args setServerSessionId(String serverSessionId) {
+    public updateSatellite_args setServerSessionId(@org.apache.thrift.annotation.Nullable java.lang.String serverSessionId) {
       this.serverSessionId = serverSessionId;
       return this;
     }
@@ -20123,11 +20520,12 @@ public class MasterServer {
       }
     }
 
-    public String getDisplayName() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getDisplayName() {
       return this.displayName;
     }
 
-    public updateSatellite_args setDisplayName(String displayName) {
+    public updateSatellite_args setDisplayName(@org.apache.thrift.annotation.Nullable java.lang.String displayName) {
       this.displayName = displayName;
       return this;
     }
@@ -20151,22 +20549,24 @@ public class MasterServer {
       return (this.addresses == null) ? 0 : this.addresses.size();
     }
 
-    public java.util.Iterator<String> getAddressesIterator() {
+    @org.apache.thrift.annotation.Nullable
+    public java.util.Iterator<java.lang.String> getAddressesIterator() {
       return (this.addresses == null) ? null : this.addresses.iterator();
     }
 
-    public void addToAddresses(String elem) {
+    public void addToAddresses(java.lang.String elem) {
       if (this.addresses == null) {
-        this.addresses = new ArrayList<String>();
+        this.addresses = new java.util.ArrayList<java.lang.String>();
       }
       this.addresses.add(elem);
     }
 
-    public List<String> getAddresses() {
+    @org.apache.thrift.annotation.Nullable
+    public java.util.List<java.lang.String> getAddresses() {
       return this.addresses;
     }
 
-    public updateSatellite_args setAddresses(List<String> addresses) {
+    public updateSatellite_args setAddresses(@org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> addresses) {
       this.addresses = addresses;
       return this;
     }
@@ -20186,13 +20586,13 @@ public class MasterServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SERVER_SESSION_ID:
         if (value == null) {
           unsetServerSessionId();
         } else {
-          setServerSessionId((String)value);
+          setServerSessionId((java.lang.String)value);
         }
         break;
 
@@ -20200,7 +20600,7 @@ public class MasterServer {
         if (value == null) {
           unsetDisplayName();
         } else {
-          setDisplayName((String)value);
+          setDisplayName((java.lang.String)value);
         }
         break;
 
@@ -20208,14 +20608,15 @@ public class MasterServer {
         if (value == null) {
           unsetAddresses();
         } else {
-          setAddresses((List<String>)value);
+          setAddresses((java.util.List<java.lang.String>)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SERVER_SESSION_ID:
         return getServerSessionId();
@@ -20227,13 +20628,13 @@ public class MasterServer {
         return getAddresses();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -20244,13 +20645,11 @@ public class MasterServer {
       case ADDRESSES:
         return isSetAddresses();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof updateSatellite_args)
         return this.equals((updateSatellite_args)that);
       return false;
@@ -20259,6 +20658,8 @@ public class MasterServer {
     public boolean equals(updateSatellite_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_serverSessionId = true && this.isSetServerSessionId();
       boolean that_present_serverSessionId = true && that.isSetServerSessionId();
@@ -20292,24 +20693,21 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_serverSessionId = true && (isSetServerSessionId());
-      list.add(present_serverSessionId);
-      if (present_serverSessionId)
-        list.add(serverSessionId);
+      hashCode = hashCode * 8191 + ((isSetServerSessionId()) ? 131071 : 524287);
+      if (isSetServerSessionId())
+        hashCode = hashCode * 8191 + serverSessionId.hashCode();
 
-      boolean present_displayName = true && (isSetDisplayName());
-      list.add(present_displayName);
-      if (present_displayName)
-        list.add(displayName);
+      hashCode = hashCode * 8191 + ((isSetDisplayName()) ? 131071 : 524287);
+      if (isSetDisplayName())
+        hashCode = hashCode * 8191 + displayName.hashCode();
 
-      boolean present_addresses = true && (isSetAddresses());
-      list.add(present_addresses);
-      if (present_addresses)
-        list.add(addresses);
+      hashCode = hashCode * 8191 + ((isSetAddresses()) ? 131071 : 524287);
+      if (isSetAddresses())
+        hashCode = hashCode * 8191 + addresses.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -20320,7 +20718,7 @@ public class MasterServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetServerSessionId()).compareTo(other.isSetServerSessionId());
+      lastComparison = java.lang.Boolean.compare(isSetServerSessionId(), other.isSetServerSessionId());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -20330,7 +20728,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetDisplayName()).compareTo(other.isSetDisplayName());
+      lastComparison = java.lang.Boolean.compare(isSetDisplayName(), other.isSetDisplayName());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -20340,7 +20738,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetAddresses()).compareTo(other.isSetAddresses());
+      lastComparison = java.lang.Boolean.compare(isSetAddresses(), other.isSetAddresses());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -20353,21 +20751,22 @@ public class MasterServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("updateSatellite_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("updateSatellite_args(");
       boolean first = true;
 
       sb.append("serverSessionId:");
@@ -20410,7 +20809,7 @@ public class MasterServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -20418,13 +20817,13 @@ public class MasterServer {
       }
     }
 
-    private static class updateSatellite_argsStandardSchemeFactory implements SchemeFactory {
+    private static class updateSatellite_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public updateSatellite_argsStandardScheme getScheme() {
         return new updateSatellite_argsStandardScheme();
       }
     }
 
-    private static class updateSatellite_argsStandardScheme extends StandardScheme<updateSatellite_args> {
+    private static class updateSatellite_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<updateSatellite_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, updateSatellite_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -20455,13 +20854,13 @@ public class MasterServer {
             case 3: // ADDRESSES
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list338 = iprot.readListBegin();
-                  struct.addresses = new ArrayList<String>(_list338.size);
-                  String _elem339;
-                  for (int _i340 = 0; _i340 < _list338.size; ++_i340)
+                  org.apache.thrift.protocol.TList _list450 = iprot.readListBegin();
+                  struct.addresses = new java.util.ArrayList<java.lang.String>(_list450.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem451;
+                  for (int _i452 = 0; _i452 < _list450.size; ++_i452)
                   {
-                    _elem339 = iprot.readString();
-                    struct.addresses.add(_elem339);
+                    _elem451 = iprot.readString();
+                    struct.addresses.add(_elem451);
                   }
                   iprot.readListEnd();
                 }
@@ -20499,9 +20898,9 @@ public class MasterServer {
           oprot.writeFieldBegin(ADDRESSES_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.addresses.size()));
-            for (String _iter341 : struct.addresses)
+            for (java.lang.String _iter453 : struct.addresses)
             {
-              oprot.writeString(_iter341);
+              oprot.writeString(_iter453);
             }
             oprot.writeListEnd();
           }
@@ -20513,18 +20912,18 @@ public class MasterServer {
 
     }
 
-    private static class updateSatellite_argsTupleSchemeFactory implements SchemeFactory {
+    private static class updateSatellite_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public updateSatellite_argsTupleScheme getScheme() {
         return new updateSatellite_argsTupleScheme();
       }
     }
 
-    private static class updateSatellite_argsTupleScheme extends TupleScheme<updateSatellite_args> {
+    private static class updateSatellite_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<updateSatellite_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, updateSatellite_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetServerSessionId()) {
           optionals.set(0);
         }
@@ -20544,9 +20943,9 @@ public class MasterServer {
         if (struct.isSetAddresses()) {
           {
             oprot.writeI32(struct.addresses.size());
-            for (String _iter342 : struct.addresses)
+            for (java.lang.String _iter454 : struct.addresses)
             {
-              oprot.writeString(_iter342);
+              oprot.writeString(_iter454);
             }
           }
         }
@@ -20554,8 +20953,8 @@ public class MasterServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, updateSatellite_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(3);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           struct.serverSessionId = iprot.readString();
           struct.setServerSessionIdIsSet(true);
@@ -20566,13 +20965,13 @@ public class MasterServer {
         }
         if (incoming.get(2)) {
           {
-            org.apache.thrift.protocol.TList _list343 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-            struct.addresses = new ArrayList<String>(_list343.size);
-            String _elem344;
-            for (int _i345 = 0; _i345 < _list343.size; ++_i345)
+            org.apache.thrift.protocol.TList _list455 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.addresses = new java.util.ArrayList<java.lang.String>(_list455.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem456;
+            for (int _i457 = 0; _i457 < _list455.size; ++_i457)
             {
-              _elem344 = iprot.readString();
-              struct.addresses.add(_elem344);
+              _elem456 = iprot.readString();
+              struct.addresses.add(_elem456);
             }
           }
           struct.setAddressesIsSet(true);
@@ -20580,6 +20979,9 @@ public class MasterServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class updateSatellite_result implements org.apache.thrift.TBase<updateSatellite_result, updateSatellite_result._Fields>, java.io.Serializable, Cloneable, Comparable<updateSatellite_result>   {
@@ -20589,15 +20991,12 @@ public class MasterServer {
     private static final org.apache.thrift.protocol.TField FAILURE_FIELD_DESC = new org.apache.thrift.protocol.TField("failure", org.apache.thrift.protocol.TType.STRUCT, (short)1);
     private static final org.apache.thrift.protocol.TField ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("error", org.apache.thrift.protocol.TType.STRUCT, (short)2);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new updateSatellite_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new updateSatellite_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new updateSatellite_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new updateSatellite_resultTupleSchemeFactory();
 
     public boolean success; // required
-    public TAuthorizationException failure; // required
-    public TInvocationException error; // required
+    public @org.apache.thrift.annotation.Nullable TAuthorizationException failure; // required
+    public @org.apache.thrift.annotation.Nullable TInvocationException error; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -20605,10 +21004,10 @@ public class MasterServer {
       FAILURE((short)1, "failure"),
       ERROR((short)2, "error");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -20616,6 +21015,7 @@ public class MasterServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
@@ -20635,21 +21035,22 @@ public class MasterServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -20658,7 +21059,7 @@ public class MasterServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
@@ -20666,16 +21067,16 @@ public class MasterServer {
     // isset id assignments
     private static final int __SUCCESS_ISSET_ID = 0;
     private byte __isset_bitfield = 0;
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
       tmpMap.put(_Fields.FAILURE, new org.apache.thrift.meta_data.FieldMetaData("failure", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class)));
       tmpMap.put(_Fields.ERROR, new org.apache.thrift.meta_data.FieldMetaData("error", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(updateSatellite_result.class, metaDataMap);
     }
 
@@ -20731,23 +21132,24 @@ public class MasterServer {
     }
 
     public void unsetSuccess() {
-      __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID);
+      __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID);
     }
 
     /** Returns true if field success is set (has been assigned a value) and false otherwise */
     public boolean isSetSuccess() {
-      return EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID);
+      return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID);
     }
 
     public void setSuccessIsSet(boolean value) {
-      __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value);
+      __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value);
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TAuthorizationException getFailure() {
       return this.failure;
     }
 
-    public updateSatellite_result setFailure(TAuthorizationException failure) {
+    public updateSatellite_result setFailure(@org.apache.thrift.annotation.Nullable TAuthorizationException failure) {
       this.failure = failure;
       return this;
     }
@@ -20767,11 +21169,12 @@ public class MasterServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvocationException getError() {
       return this.error;
     }
 
-    public updateSatellite_result setError(TInvocationException error) {
+    public updateSatellite_result setError(@org.apache.thrift.annotation.Nullable TInvocationException error) {
       this.error = error;
       return this;
     }
@@ -20791,13 +21194,13 @@ public class MasterServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
           unsetSuccess();
         } else {
-          setSuccess((Boolean)value);
+          setSuccess((java.lang.Boolean)value);
         }
         break;
 
@@ -20820,7 +21223,8 @@ public class MasterServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
         return isSuccess();
@@ -20832,13 +21236,13 @@ public class MasterServer {
         return getError();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -20849,13 +21253,11 @@ public class MasterServer {
       case ERROR:
         return isSetError();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof updateSatellite_result)
         return this.equals((updateSatellite_result)that);
       return false;
@@ -20864,6 +21266,8 @@ public class MasterServer {
     public boolean equals(updateSatellite_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_success = true;
       boolean that_present_success = true;
@@ -20897,24 +21301,19 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_success = true;
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
+      hashCode = hashCode * 8191 + ((success) ? 131071 : 524287);
 
-      boolean present_failure = true && (isSetFailure());
-      list.add(present_failure);
-      if (present_failure)
-        list.add(failure);
+      hashCode = hashCode * 8191 + ((isSetFailure()) ? 131071 : 524287);
+      if (isSetFailure())
+        hashCode = hashCode * 8191 + failure.hashCode();
 
-      boolean present_error = true && (isSetError());
-      list.add(present_error);
-      if (present_error)
-        list.add(error);
+      hashCode = hashCode * 8191 + ((isSetError()) ? 131071 : 524287);
+      if (isSetError())
+        hashCode = hashCode * 8191 + error.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -20925,7 +21324,7 @@ public class MasterServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -20935,7 +21334,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure());
+      lastComparison = java.lang.Boolean.compare(isSetFailure(), other.isSetFailure());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -20945,7 +21344,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetError()).compareTo(other.isSetError());
+      lastComparison = java.lang.Boolean.compare(isSetError(), other.isSetError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -20958,21 +21357,22 @@ public class MasterServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("updateSatellite_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("updateSatellite_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -21011,7 +21411,7 @@ public class MasterServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
         __isset_bitfield = 0;
@@ -21021,13 +21421,13 @@ public class MasterServer {
       }
     }
 
-    private static class updateSatellite_resultStandardSchemeFactory implements SchemeFactory {
+    private static class updateSatellite_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public updateSatellite_resultStandardScheme getScheme() {
         return new updateSatellite_resultStandardScheme();
       }
     }
 
-    private static class updateSatellite_resultStandardScheme extends StandardScheme<updateSatellite_result> {
+    private static class updateSatellite_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<updateSatellite_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, updateSatellite_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -21101,18 +21501,18 @@ public class MasterServer {
 
     }
 
-    private static class updateSatellite_resultTupleSchemeFactory implements SchemeFactory {
+    private static class updateSatellite_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public updateSatellite_resultTupleScheme getScheme() {
         return new updateSatellite_resultTupleScheme();
       }
     }
 
-    private static class updateSatellite_resultTupleScheme extends TupleScheme<updateSatellite_result> {
+    private static class updateSatellite_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<updateSatellite_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, updateSatellite_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
           optionals.set(0);
         }
@@ -21136,8 +21536,8 @@ public class MasterServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, updateSatellite_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(3);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           struct.success = iprot.readBool();
           struct.setSuccessIsSet(true);
@@ -21155,6 +21555,9 @@ public class MasterServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class downloadImage_args implements org.apache.thrift.TBase<downloadImage_args, downloadImage_args._Fields>, java.io.Serializable, Cloneable, Comparable<downloadImage_args>   {
@@ -21163,24 +21566,21 @@ public class MasterServer {
     private static final org.apache.thrift.protocol.TField SESSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("sessionId", org.apache.thrift.protocol.TType.STRING, (short)2);
     private static final org.apache.thrift.protocol.TField IMAGE_VERSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("imageVersionId", org.apache.thrift.protocol.TType.STRING, (short)1);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new downloadImage_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new downloadImage_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new downloadImage_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new downloadImage_argsTupleSchemeFactory();
 
-    public String sessionId; // required
-    public String imageVersionId; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String sessionId; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String imageVersionId; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SESSION_ID((short)2, "sessionId"),
       IMAGE_VERSION_ID((short)1, "imageVersionId");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -21188,6 +21588,7 @@ public class MasterServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 2: // SESSION_ID
@@ -21205,21 +21606,22 @@ public class MasterServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -21228,20 +21630,20 @@ public class MasterServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SESSION_ID, new org.apache.thrift.meta_data.FieldMetaData("sessionId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
       tmpMap.put(_Fields.IMAGE_VERSION_ID, new org.apache.thrift.meta_data.FieldMetaData("imageVersionId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "UUID")));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(downloadImage_args.class, metaDataMap);
     }
 
@@ -21249,8 +21651,8 @@ public class MasterServer {
     }
 
     public downloadImage_args(
-      String sessionId,
-      String imageVersionId)
+      java.lang.String sessionId,
+      java.lang.String imageVersionId)
     {
       this();
       this.sessionId = sessionId;
@@ -21279,11 +21681,12 @@ public class MasterServer {
       this.imageVersionId = null;
     }
 
-    public String getSessionId() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getSessionId() {
       return this.sessionId;
     }
 
-    public downloadImage_args setSessionId(String sessionId) {
+    public downloadImage_args setSessionId(@org.apache.thrift.annotation.Nullable java.lang.String sessionId) {
       this.sessionId = sessionId;
       return this;
     }
@@ -21303,11 +21706,12 @@ public class MasterServer {
       }
     }
 
-    public String getImageVersionId() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getImageVersionId() {
       return this.imageVersionId;
     }
 
-    public downloadImage_args setImageVersionId(String imageVersionId) {
+    public downloadImage_args setImageVersionId(@org.apache.thrift.annotation.Nullable java.lang.String imageVersionId) {
       this.imageVersionId = imageVersionId;
       return this;
     }
@@ -21327,13 +21731,13 @@ public class MasterServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SESSION_ID:
         if (value == null) {
           unsetSessionId();
         } else {
-          setSessionId((String)value);
+          setSessionId((java.lang.String)value);
         }
         break;
 
@@ -21341,14 +21745,15 @@ public class MasterServer {
         if (value == null) {
           unsetImageVersionId();
         } else {
-          setImageVersionId((String)value);
+          setImageVersionId((java.lang.String)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SESSION_ID:
         return getSessionId();
@@ -21357,13 +21762,13 @@ public class MasterServer {
         return getImageVersionId();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -21372,13 +21777,11 @@ public class MasterServer {
       case IMAGE_VERSION_ID:
         return isSetImageVersionId();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof downloadImage_args)
         return this.equals((downloadImage_args)that);
       return false;
@@ -21387,6 +21790,8 @@ public class MasterServer {
     public boolean equals(downloadImage_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_sessionId = true && this.isSetSessionId();
       boolean that_present_sessionId = true && that.isSetSessionId();
@@ -21411,19 +21816,17 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_sessionId = true && (isSetSessionId());
-      list.add(present_sessionId);
-      if (present_sessionId)
-        list.add(sessionId);
+      hashCode = hashCode * 8191 + ((isSetSessionId()) ? 131071 : 524287);
+      if (isSetSessionId())
+        hashCode = hashCode * 8191 + sessionId.hashCode();
 
-      boolean present_imageVersionId = true && (isSetImageVersionId());
-      list.add(present_imageVersionId);
-      if (present_imageVersionId)
-        list.add(imageVersionId);
+      hashCode = hashCode * 8191 + ((isSetImageVersionId()) ? 131071 : 524287);
+      if (isSetImageVersionId())
+        hashCode = hashCode * 8191 + imageVersionId.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -21434,7 +21837,7 @@ public class MasterServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSessionId()).compareTo(other.isSetSessionId());
+      lastComparison = java.lang.Boolean.compare(isSetSessionId(), other.isSetSessionId());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -21444,7 +21847,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetImageVersionId()).compareTo(other.isSetImageVersionId());
+      lastComparison = java.lang.Boolean.compare(isSetImageVersionId(), other.isSetImageVersionId());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -21457,21 +21860,22 @@ public class MasterServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("downloadImage_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("downloadImage_args(");
       boolean first = true;
 
       sb.append("sessionId:");
@@ -21506,7 +21910,7 @@ public class MasterServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -21514,13 +21918,13 @@ public class MasterServer {
       }
     }
 
-    private static class downloadImage_argsStandardSchemeFactory implements SchemeFactory {
+    private static class downloadImage_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public downloadImage_argsStandardScheme getScheme() {
         return new downloadImage_argsStandardScheme();
       }
     }
 
-    private static class downloadImage_argsStandardScheme extends StandardScheme<downloadImage_args> {
+    private static class downloadImage_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<downloadImage_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, downloadImage_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -21579,18 +21983,18 @@ public class MasterServer {
 
     }
 
-    private static class downloadImage_argsTupleSchemeFactory implements SchemeFactory {
+    private static class downloadImage_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public downloadImage_argsTupleScheme getScheme() {
         return new downloadImage_argsTupleScheme();
       }
     }
 
-    private static class downloadImage_argsTupleScheme extends TupleScheme<downloadImage_args> {
+    private static class downloadImage_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<downloadImage_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, downloadImage_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSessionId()) {
           optionals.set(0);
         }
@@ -21608,8 +22012,8 @@ public class MasterServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, downloadImage_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(2);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           struct.sessionId = iprot.readString();
           struct.setSessionIdIsSet(true);
@@ -21621,6 +22025,9 @@ public class MasterServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class downloadImage_result implements org.apache.thrift.TBase<downloadImage_result, downloadImage_result._Fields>, java.io.Serializable, Cloneable, Comparable<downloadImage_result>   {
@@ -21631,16 +22038,13 @@ public class MasterServer {
     private static final org.apache.thrift.protocol.TField FAILURE2_FIELD_DESC = new org.apache.thrift.protocol.TField("failure2", org.apache.thrift.protocol.TType.STRUCT, (short)2);
     private static final org.apache.thrift.protocol.TField F3_FIELD_DESC = new org.apache.thrift.protocol.TField("f3", org.apache.thrift.protocol.TType.STRUCT, (short)3);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new downloadImage_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new downloadImage_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new downloadImage_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new downloadImage_resultTupleSchemeFactory();
 
-    public TransferInformation success; // required
-    public TAuthorizationException failure; // required
-    public TInvocationException failure2; // required
-    public TNotFoundException f3; // required
+    public @org.apache.thrift.annotation.Nullable TransferInformation success; // required
+    public @org.apache.thrift.annotation.Nullable TAuthorizationException failure; // required
+    public @org.apache.thrift.annotation.Nullable TInvocationException failure2; // required
+    public @org.apache.thrift.annotation.Nullable TNotFoundException f3; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -21649,10 +22053,10 @@ public class MasterServer {
       FAILURE2((short)2, "failure2"),
       F3((short)3, "f3");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -21660,6 +22064,7 @@ public class MasterServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
@@ -21681,21 +22086,22 @@ public class MasterServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -21704,24 +22110,24 @@ public class MasterServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TransferInformation.class)));
       tmpMap.put(_Fields.FAILURE, new org.apache.thrift.meta_data.FieldMetaData("failure", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class)));
       tmpMap.put(_Fields.FAILURE2, new org.apache.thrift.meta_data.FieldMetaData("failure2", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class)));
       tmpMap.put(_Fields.F3, new org.apache.thrift.meta_data.FieldMetaData("f3", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TNotFoundException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(downloadImage_result.class, metaDataMap);
     }
 
@@ -21771,11 +22177,12 @@ public class MasterServer {
       this.f3 = null;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TransferInformation getSuccess() {
       return this.success;
     }
 
-    public downloadImage_result setSuccess(TransferInformation success) {
+    public downloadImage_result setSuccess(@org.apache.thrift.annotation.Nullable TransferInformation success) {
       this.success = success;
       return this;
     }
@@ -21795,11 +22202,12 @@ public class MasterServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TAuthorizationException getFailure() {
       return this.failure;
     }
 
-    public downloadImage_result setFailure(TAuthorizationException failure) {
+    public downloadImage_result setFailure(@org.apache.thrift.annotation.Nullable TAuthorizationException failure) {
       this.failure = failure;
       return this;
     }
@@ -21819,11 +22227,12 @@ public class MasterServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvocationException getFailure2() {
       return this.failure2;
     }
 
-    public downloadImage_result setFailure2(TInvocationException failure2) {
+    public downloadImage_result setFailure2(@org.apache.thrift.annotation.Nullable TInvocationException failure2) {
       this.failure2 = failure2;
       return this;
     }
@@ -21843,11 +22252,12 @@ public class MasterServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TNotFoundException getF3() {
       return this.f3;
     }
 
-    public downloadImage_result setF3(TNotFoundException f3) {
+    public downloadImage_result setF3(@org.apache.thrift.annotation.Nullable TNotFoundException f3) {
       this.f3 = f3;
       return this;
     }
@@ -21867,7 +22277,7 @@ public class MasterServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
@@ -21904,7 +22314,8 @@ public class MasterServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
         return getSuccess();
@@ -21919,13 +22330,13 @@ public class MasterServer {
         return getF3();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -21938,13 +22349,11 @@ public class MasterServer {
       case F3:
         return isSetF3();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof downloadImage_result)
         return this.equals((downloadImage_result)that);
       return false;
@@ -21953,6 +22362,8 @@ public class MasterServer {
     public boolean equals(downloadImage_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_success = true && this.isSetSuccess();
       boolean that_present_success = true && that.isSetSuccess();
@@ -21995,29 +22406,25 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
 
-      boolean present_failure = true && (isSetFailure());
-      list.add(present_failure);
-      if (present_failure)
-        list.add(failure);
+      hashCode = hashCode * 8191 + ((isSetFailure()) ? 131071 : 524287);
+      if (isSetFailure())
+        hashCode = hashCode * 8191 + failure.hashCode();
 
-      boolean present_failure2 = true && (isSetFailure2());
-      list.add(present_failure2);
-      if (present_failure2)
-        list.add(failure2);
+      hashCode = hashCode * 8191 + ((isSetFailure2()) ? 131071 : 524287);
+      if (isSetFailure2())
+        hashCode = hashCode * 8191 + failure2.hashCode();
 
-      boolean present_f3 = true && (isSetF3());
-      list.add(present_f3);
-      if (present_f3)
-        list.add(f3);
+      hashCode = hashCode * 8191 + ((isSetF3()) ? 131071 : 524287);
+      if (isSetF3())
+        hashCode = hashCode * 8191 + f3.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -22028,7 +22435,7 @@ public class MasterServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -22038,7 +22445,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure());
+      lastComparison = java.lang.Boolean.compare(isSetFailure(), other.isSetFailure());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -22048,7 +22455,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFailure2()).compareTo(other.isSetFailure2());
+      lastComparison = java.lang.Boolean.compare(isSetFailure2(), other.isSetFailure2());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -22058,7 +22465,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetF3()).compareTo(other.isSetF3());
+      lastComparison = java.lang.Boolean.compare(isSetF3(), other.isSetF3());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -22071,21 +22478,22 @@ public class MasterServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("downloadImage_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("downloadImage_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -22139,7 +22547,7 @@ public class MasterServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -22147,13 +22555,13 @@ public class MasterServer {
       }
     }
 
-    private static class downloadImage_resultStandardSchemeFactory implements SchemeFactory {
+    private static class downloadImage_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public downloadImage_resultStandardScheme getScheme() {
         return new downloadImage_resultStandardScheme();
       }
     }
 
-    private static class downloadImage_resultStandardScheme extends StandardScheme<downloadImage_result> {
+    private static class downloadImage_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<downloadImage_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, downloadImage_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -22242,18 +22650,18 @@ public class MasterServer {
 
     }
 
-    private static class downloadImage_resultTupleSchemeFactory implements SchemeFactory {
+    private static class downloadImage_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public downloadImage_resultTupleScheme getScheme() {
         return new downloadImage_resultTupleScheme();
       }
     }
 
-    private static class downloadImage_resultTupleScheme extends TupleScheme<downloadImage_result> {
+    private static class downloadImage_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<downloadImage_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, downloadImage_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
           optionals.set(0);
         }
@@ -22283,8 +22691,8 @@ public class MasterServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, downloadImage_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(4);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(4);
         if (incoming.get(0)) {
           struct.success = new TransferInformation();
           struct.success.read(iprot);
@@ -22308,27 +22716,27 @@ public class MasterServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getOrganizations_args implements org.apache.thrift.TBase<getOrganizations_args, getOrganizations_args._Fields>, java.io.Serializable, Cloneable, Comparable<getOrganizations_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getOrganizations_args");
 
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getOrganizations_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getOrganizations_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getOrganizations_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getOrganizations_argsTupleSchemeFactory();
 
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
 ;
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -22336,6 +22744,7 @@ public class MasterServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           default:
@@ -22349,21 +22758,22 @@ public class MasterServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -22372,14 +22782,14 @@ public class MasterServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getOrganizations_args.class, metaDataMap);
     }
 
@@ -22400,32 +22810,31 @@ public class MasterServer {
     public void clear() {
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getOrganizations_args)
         return this.equals((getOrganizations_args)that);
       return false;
@@ -22434,15 +22843,17 @@ public class MasterServer {
     public boolean equals(getOrganizations_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       return true;
     }
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -22456,21 +22867,22 @@ public class MasterServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getOrganizations_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getOrganizations_args(");
       boolean first = true;
 
       sb.append(")");
@@ -22490,7 +22902,7 @@ public class MasterServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -22498,13 +22910,13 @@ public class MasterServer {
       }
     }
 
-    private static class getOrganizations_argsStandardSchemeFactory implements SchemeFactory {
+    private static class getOrganizations_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getOrganizations_argsStandardScheme getScheme() {
         return new getOrganizations_argsStandardScheme();
       }
     }
 
-    private static class getOrganizations_argsStandardScheme extends StandardScheme<getOrganizations_args> {
+    private static class getOrganizations_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<getOrganizations_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getOrganizations_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -22537,25 +22949,28 @@ public class MasterServer {
 
     }
 
-    private static class getOrganizations_argsTupleSchemeFactory implements SchemeFactory {
+    private static class getOrganizations_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getOrganizations_argsTupleScheme getScheme() {
         return new getOrganizations_argsTupleScheme();
       }
     }
 
-    private static class getOrganizations_argsTupleScheme extends TupleScheme<getOrganizations_args> {
+    private static class getOrganizations_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<getOrganizations_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getOrganizations_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
       }
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getOrganizations_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getOrganizations_result implements org.apache.thrift.TBase<getOrganizations_result, getOrganizations_result._Fields>, java.io.Serializable, Cloneable, Comparable<getOrganizations_result>   {
@@ -22564,24 +22979,21 @@ public class MasterServer {
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0);
     private static final org.apache.thrift.protocol.TField SERVER_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("serverError", org.apache.thrift.protocol.TType.STRUCT, (short)1);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getOrganizations_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getOrganizations_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getOrganizations_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getOrganizations_resultTupleSchemeFactory();
 
-    public List<Organization> success; // required
-    public TInvocationException serverError; // required
+    public @org.apache.thrift.annotation.Nullable java.util.List<Organization> success; // required
+    public @org.apache.thrift.annotation.Nullable TInvocationException serverError; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SUCCESS((short)0, "success"),
       SERVER_ERROR((short)1, "serverError");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -22589,6 +23001,7 @@ public class MasterServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
@@ -22606,21 +23019,22 @@ public class MasterServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -22629,21 +23043,21 @@ public class MasterServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
               new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Organization.class))));
       tmpMap.put(_Fields.SERVER_ERROR, new org.apache.thrift.meta_data.FieldMetaData("serverError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getOrganizations_result.class, metaDataMap);
     }
 
@@ -22651,7 +23065,7 @@ public class MasterServer {
     }
 
     public getOrganizations_result(
-      List<Organization> success,
+      java.util.List<Organization> success,
       TInvocationException serverError)
     {
       this();
@@ -22664,7 +23078,7 @@ public class MasterServer {
      */
     public getOrganizations_result(getOrganizations_result other) {
       if (other.isSetSuccess()) {
-        List<Organization> __this__success = new ArrayList<Organization>(other.success.size());
+        java.util.List<Organization> __this__success = new java.util.ArrayList<Organization>(other.success.size());
         for (Organization other_element : other.success) {
           __this__success.add(new Organization(other_element));
         }
@@ -22689,22 +23103,24 @@ public class MasterServer {
       return (this.success == null) ? 0 : this.success.size();
     }
 
+    @org.apache.thrift.annotation.Nullable
     public java.util.Iterator<Organization> getSuccessIterator() {
       return (this.success == null) ? null : this.success.iterator();
     }
 
     public void addToSuccess(Organization elem) {
       if (this.success == null) {
-        this.success = new ArrayList<Organization>();
+        this.success = new java.util.ArrayList<Organization>();
       }
       this.success.add(elem);
     }
 
-    public List<Organization> getSuccess() {
+    @org.apache.thrift.annotation.Nullable
+    public java.util.List<Organization> getSuccess() {
       return this.success;
     }
 
-    public getOrganizations_result setSuccess(List<Organization> success) {
+    public getOrganizations_result setSuccess(@org.apache.thrift.annotation.Nullable java.util.List<Organization> success) {
       this.success = success;
       return this;
     }
@@ -22724,11 +23140,12 @@ public class MasterServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvocationException getServerError() {
       return this.serverError;
     }
 
-    public getOrganizations_result setServerError(TInvocationException serverError) {
+    public getOrganizations_result setServerError(@org.apache.thrift.annotation.Nullable TInvocationException serverError) {
       this.serverError = serverError;
       return this;
     }
@@ -22748,13 +23165,13 @@ public class MasterServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
           unsetSuccess();
         } else {
-          setSuccess((List<Organization>)value);
+          setSuccess((java.util.List<Organization>)value);
         }
         break;
 
@@ -22769,7 +23186,8 @@ public class MasterServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
         return getSuccess();
@@ -22778,13 +23196,13 @@ public class MasterServer {
         return getServerError();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -22793,13 +23211,11 @@ public class MasterServer {
       case SERVER_ERROR:
         return isSetServerError();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getOrganizations_result)
         return this.equals((getOrganizations_result)that);
       return false;
@@ -22808,6 +23224,8 @@ public class MasterServer {
     public boolean equals(getOrganizations_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_success = true && this.isSetSuccess();
       boolean that_present_success = true && that.isSetSuccess();
@@ -22832,19 +23250,17 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
 
-      boolean present_serverError = true && (isSetServerError());
-      list.add(present_serverError);
-      if (present_serverError)
-        list.add(serverError);
+      hashCode = hashCode * 8191 + ((isSetServerError()) ? 131071 : 524287);
+      if (isSetServerError())
+        hashCode = hashCode * 8191 + serverError.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -22855,7 +23271,7 @@ public class MasterServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -22865,7 +23281,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetServerError()).compareTo(other.isSetServerError());
+      lastComparison = java.lang.Boolean.compare(isSetServerError(), other.isSetServerError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -22878,21 +23294,22 @@ public class MasterServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getOrganizations_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getOrganizations_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -22927,7 +23344,7 @@ public class MasterServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -22935,13 +23352,13 @@ public class MasterServer {
       }
     }
 
-    private static class getOrganizations_resultStandardSchemeFactory implements SchemeFactory {
+    private static class getOrganizations_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getOrganizations_resultStandardScheme getScheme() {
         return new getOrganizations_resultStandardScheme();
       }
     }
 
-    private static class getOrganizations_resultStandardScheme extends StandardScheme<getOrganizations_result> {
+    private static class getOrganizations_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<getOrganizations_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getOrganizations_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -22956,14 +23373,14 @@ public class MasterServer {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list346 = iprot.readListBegin();
-                  struct.success = new ArrayList<Organization>(_list346.size);
-                  Organization _elem347;
-                  for (int _i348 = 0; _i348 < _list346.size; ++_i348)
+                  org.apache.thrift.protocol.TList _list458 = iprot.readListBegin();
+                  struct.success = new java.util.ArrayList<Organization>(_list458.size);
+                  @org.apache.thrift.annotation.Nullable Organization _elem459;
+                  for (int _i460 = 0; _i460 < _list458.size; ++_i460)
                   {
-                    _elem347 = new Organization();
-                    _elem347.read(iprot);
-                    struct.success.add(_elem347);
+                    _elem459 = new Organization();
+                    _elem459.read(iprot);
+                    struct.success.add(_elem459);
                   }
                   iprot.readListEnd();
                 }
@@ -23000,9 +23417,9 @@ public class MasterServer {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
-            for (Organization _iter349 : struct.success)
+            for (Organization _iter461 : struct.success)
             {
-              _iter349.write(oprot);
+              _iter461.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -23019,18 +23436,18 @@ public class MasterServer {
 
     }
 
-    private static class getOrganizations_resultTupleSchemeFactory implements SchemeFactory {
+    private static class getOrganizations_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getOrganizations_resultTupleScheme getScheme() {
         return new getOrganizations_resultTupleScheme();
       }
     }
 
-    private static class getOrganizations_resultTupleScheme extends TupleScheme<getOrganizations_result> {
+    private static class getOrganizations_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<getOrganizations_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getOrganizations_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
           optionals.set(0);
         }
@@ -23041,9 +23458,9 @@ public class MasterServer {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (Organization _iter350 : struct.success)
+            for (Organization _iter462 : struct.success)
             {
-              _iter350.write(oprot);
+              _iter462.write(oprot);
             }
           }
         }
@@ -23054,18 +23471,18 @@ public class MasterServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getOrganizations_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(2);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list351 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new ArrayList<Organization>(_list351.size);
-            Organization _elem352;
-            for (int _i353 = 0; _i353 < _list351.size; ++_i353)
+            org.apache.thrift.protocol.TList _list463 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.success = new java.util.ArrayList<Organization>(_list463.size);
+            @org.apache.thrift.annotation.Nullable Organization _elem464;
+            for (int _i465 = 0; _i465 < _list463.size; ++_i465)
             {
-              _elem352 = new Organization();
-              _elem352.read(iprot);
-              struct.success.add(_elem352);
+              _elem464 = new Organization();
+              _elem464.read(iprot);
+              struct.success.add(_elem464);
             }
           }
           struct.setSuccessIsSet(true);
@@ -23078,27 +23495,27 @@ public class MasterServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getOperatingSystems_args implements org.apache.thrift.TBase<getOperatingSystems_args, getOperatingSystems_args._Fields>, java.io.Serializable, Cloneable, Comparable<getOperatingSystems_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getOperatingSystems_args");
 
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getOperatingSystems_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getOperatingSystems_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getOperatingSystems_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getOperatingSystems_argsTupleSchemeFactory();
 
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
 ;
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -23106,6 +23523,7 @@ public class MasterServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           default:
@@ -23119,21 +23537,22 @@ public class MasterServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -23142,14 +23561,14 @@ public class MasterServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getOperatingSystems_args.class, metaDataMap);
     }
 
@@ -23170,32 +23589,31 @@ public class MasterServer {
     public void clear() {
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getOperatingSystems_args)
         return this.equals((getOperatingSystems_args)that);
       return false;
@@ -23204,15 +23622,17 @@ public class MasterServer {
     public boolean equals(getOperatingSystems_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       return true;
     }
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -23226,21 +23646,22 @@ public class MasterServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getOperatingSystems_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getOperatingSystems_args(");
       boolean first = true;
 
       sb.append(")");
@@ -23260,7 +23681,7 @@ public class MasterServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -23268,13 +23689,13 @@ public class MasterServer {
       }
     }
 
-    private static class getOperatingSystems_argsStandardSchemeFactory implements SchemeFactory {
+    private static class getOperatingSystems_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getOperatingSystems_argsStandardScheme getScheme() {
         return new getOperatingSystems_argsStandardScheme();
       }
     }
 
-    private static class getOperatingSystems_argsStandardScheme extends StandardScheme<getOperatingSystems_args> {
+    private static class getOperatingSystems_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<getOperatingSystems_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getOperatingSystems_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -23307,25 +23728,28 @@ public class MasterServer {
 
     }
 
-    private static class getOperatingSystems_argsTupleSchemeFactory implements SchemeFactory {
+    private static class getOperatingSystems_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getOperatingSystems_argsTupleScheme getScheme() {
         return new getOperatingSystems_argsTupleScheme();
       }
     }
 
-    private static class getOperatingSystems_argsTupleScheme extends TupleScheme<getOperatingSystems_args> {
+    private static class getOperatingSystems_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<getOperatingSystems_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getOperatingSystems_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
       }
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getOperatingSystems_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getOperatingSystems_result implements org.apache.thrift.TBase<getOperatingSystems_result, getOperatingSystems_result._Fields>, java.io.Serializable, Cloneable, Comparable<getOperatingSystems_result>   {
@@ -23334,24 +23758,21 @@ public class MasterServer {
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0);
     private static final org.apache.thrift.protocol.TField SERVER_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("serverError", org.apache.thrift.protocol.TType.STRUCT, (short)1);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getOperatingSystems_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getOperatingSystems_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getOperatingSystems_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getOperatingSystems_resultTupleSchemeFactory();
 
-    public List<OperatingSystem> success; // required
-    public TInvocationException serverError; // required
+    public @org.apache.thrift.annotation.Nullable java.util.List<OperatingSystem> success; // required
+    public @org.apache.thrift.annotation.Nullable TInvocationException serverError; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SUCCESS((short)0, "success"),
       SERVER_ERROR((short)1, "serverError");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -23359,6 +23780,7 @@ public class MasterServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
@@ -23376,21 +23798,22 @@ public class MasterServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -23399,21 +23822,21 @@ public class MasterServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
               new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, OperatingSystem.class))));
       tmpMap.put(_Fields.SERVER_ERROR, new org.apache.thrift.meta_data.FieldMetaData("serverError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getOperatingSystems_result.class, metaDataMap);
     }
 
@@ -23421,7 +23844,7 @@ public class MasterServer {
     }
 
     public getOperatingSystems_result(
-      List<OperatingSystem> success,
+      java.util.List<OperatingSystem> success,
       TInvocationException serverError)
     {
       this();
@@ -23434,7 +23857,7 @@ public class MasterServer {
      */
     public getOperatingSystems_result(getOperatingSystems_result other) {
       if (other.isSetSuccess()) {
-        List<OperatingSystem> __this__success = new ArrayList<OperatingSystem>(other.success.size());
+        java.util.List<OperatingSystem> __this__success = new java.util.ArrayList<OperatingSystem>(other.success.size());
         for (OperatingSystem other_element : other.success) {
           __this__success.add(new OperatingSystem(other_element));
         }
@@ -23459,22 +23882,24 @@ public class MasterServer {
       return (this.success == null) ? 0 : this.success.size();
     }
 
+    @org.apache.thrift.annotation.Nullable
     public java.util.Iterator<OperatingSystem> getSuccessIterator() {
       return (this.success == null) ? null : this.success.iterator();
     }
 
     public void addToSuccess(OperatingSystem elem) {
       if (this.success == null) {
-        this.success = new ArrayList<OperatingSystem>();
+        this.success = new java.util.ArrayList<OperatingSystem>();
       }
       this.success.add(elem);
     }
 
-    public List<OperatingSystem> getSuccess() {
+    @org.apache.thrift.annotation.Nullable
+    public java.util.List<OperatingSystem> getSuccess() {
       return this.success;
     }
 
-    public getOperatingSystems_result setSuccess(List<OperatingSystem> success) {
+    public getOperatingSystems_result setSuccess(@org.apache.thrift.annotation.Nullable java.util.List<OperatingSystem> success) {
       this.success = success;
       return this;
     }
@@ -23494,11 +23919,12 @@ public class MasterServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvocationException getServerError() {
       return this.serverError;
     }
 
-    public getOperatingSystems_result setServerError(TInvocationException serverError) {
+    public getOperatingSystems_result setServerError(@org.apache.thrift.annotation.Nullable TInvocationException serverError) {
       this.serverError = serverError;
       return this;
     }
@@ -23518,13 +23944,13 @@ public class MasterServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
           unsetSuccess();
         } else {
-          setSuccess((List<OperatingSystem>)value);
+          setSuccess((java.util.List<OperatingSystem>)value);
         }
         break;
 
@@ -23539,7 +23965,8 @@ public class MasterServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
         return getSuccess();
@@ -23548,13 +23975,13 @@ public class MasterServer {
         return getServerError();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -23563,13 +23990,11 @@ public class MasterServer {
       case SERVER_ERROR:
         return isSetServerError();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getOperatingSystems_result)
         return this.equals((getOperatingSystems_result)that);
       return false;
@@ -23578,6 +24003,8 @@ public class MasterServer {
     public boolean equals(getOperatingSystems_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_success = true && this.isSetSuccess();
       boolean that_present_success = true && that.isSetSuccess();
@@ -23602,19 +24029,17 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
 
-      boolean present_serverError = true && (isSetServerError());
-      list.add(present_serverError);
-      if (present_serverError)
-        list.add(serverError);
+      hashCode = hashCode * 8191 + ((isSetServerError()) ? 131071 : 524287);
+      if (isSetServerError())
+        hashCode = hashCode * 8191 + serverError.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -23625,7 +24050,7 @@ public class MasterServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -23635,7 +24060,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetServerError()).compareTo(other.isSetServerError());
+      lastComparison = java.lang.Boolean.compare(isSetServerError(), other.isSetServerError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -23648,21 +24073,22 @@ public class MasterServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getOperatingSystems_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getOperatingSystems_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -23697,7 +24123,7 @@ public class MasterServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -23705,13 +24131,13 @@ public class MasterServer {
       }
     }
 
-    private static class getOperatingSystems_resultStandardSchemeFactory implements SchemeFactory {
+    private static class getOperatingSystems_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getOperatingSystems_resultStandardScheme getScheme() {
         return new getOperatingSystems_resultStandardScheme();
       }
     }
 
-    private static class getOperatingSystems_resultStandardScheme extends StandardScheme<getOperatingSystems_result> {
+    private static class getOperatingSystems_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<getOperatingSystems_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getOperatingSystems_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -23726,14 +24152,14 @@ public class MasterServer {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list354 = iprot.readListBegin();
-                  struct.success = new ArrayList<OperatingSystem>(_list354.size);
-                  OperatingSystem _elem355;
-                  for (int _i356 = 0; _i356 < _list354.size; ++_i356)
+                  org.apache.thrift.protocol.TList _list466 = iprot.readListBegin();
+                  struct.success = new java.util.ArrayList<OperatingSystem>(_list466.size);
+                  @org.apache.thrift.annotation.Nullable OperatingSystem _elem467;
+                  for (int _i468 = 0; _i468 < _list466.size; ++_i468)
                   {
-                    _elem355 = new OperatingSystem();
-                    _elem355.read(iprot);
-                    struct.success.add(_elem355);
+                    _elem467 = new OperatingSystem();
+                    _elem467.read(iprot);
+                    struct.success.add(_elem467);
                   }
                   iprot.readListEnd();
                 }
@@ -23770,9 +24196,9 @@ public class MasterServer {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
-            for (OperatingSystem _iter357 : struct.success)
+            for (OperatingSystem _iter469 : struct.success)
             {
-              _iter357.write(oprot);
+              _iter469.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -23789,18 +24215,18 @@ public class MasterServer {
 
     }
 
-    private static class getOperatingSystems_resultTupleSchemeFactory implements SchemeFactory {
+    private static class getOperatingSystems_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getOperatingSystems_resultTupleScheme getScheme() {
         return new getOperatingSystems_resultTupleScheme();
       }
     }
 
-    private static class getOperatingSystems_resultTupleScheme extends TupleScheme<getOperatingSystems_result> {
+    private static class getOperatingSystems_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<getOperatingSystems_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getOperatingSystems_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
           optionals.set(0);
         }
@@ -23811,9 +24237,9 @@ public class MasterServer {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (OperatingSystem _iter358 : struct.success)
+            for (OperatingSystem _iter470 : struct.success)
             {
-              _iter358.write(oprot);
+              _iter470.write(oprot);
             }
           }
         }
@@ -23824,18 +24250,18 @@ public class MasterServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getOperatingSystems_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(2);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list359 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new ArrayList<OperatingSystem>(_list359.size);
-            OperatingSystem _elem360;
-            for (int _i361 = 0; _i361 < _list359.size; ++_i361)
+            org.apache.thrift.protocol.TList _list471 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.success = new java.util.ArrayList<OperatingSystem>(_list471.size);
+            @org.apache.thrift.annotation.Nullable OperatingSystem _elem472;
+            for (int _i473 = 0; _i473 < _list471.size; ++_i473)
             {
-              _elem360 = new OperatingSystem();
-              _elem360.read(iprot);
-              struct.success.add(_elem360);
+              _elem472 = new OperatingSystem();
+              _elem472.read(iprot);
+              struct.success.add(_elem472);
             }
           }
           struct.setSuccessIsSet(true);
@@ -23848,27 +24274,27 @@ public class MasterServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getVirtualizers_args implements org.apache.thrift.TBase<getVirtualizers_args, getVirtualizers_args._Fields>, java.io.Serializable, Cloneable, Comparable<getVirtualizers_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getVirtualizers_args");
 
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getVirtualizers_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getVirtualizers_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getVirtualizers_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getVirtualizers_argsTupleSchemeFactory();
 
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
 ;
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -23876,6 +24302,7 @@ public class MasterServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           default:
@@ -23889,21 +24316,22 @@ public class MasterServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -23912,14 +24340,14 @@ public class MasterServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getVirtualizers_args.class, metaDataMap);
     }
 
@@ -23940,32 +24368,31 @@ public class MasterServer {
     public void clear() {
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getVirtualizers_args)
         return this.equals((getVirtualizers_args)that);
       return false;
@@ -23974,15 +24401,17 @@ public class MasterServer {
     public boolean equals(getVirtualizers_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       return true;
     }
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -23996,21 +24425,22 @@ public class MasterServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getVirtualizers_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getVirtualizers_args(");
       boolean first = true;
 
       sb.append(")");
@@ -24030,7 +24460,7 @@ public class MasterServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -24038,13 +24468,13 @@ public class MasterServer {
       }
     }
 
-    private static class getVirtualizers_argsStandardSchemeFactory implements SchemeFactory {
+    private static class getVirtualizers_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getVirtualizers_argsStandardScheme getScheme() {
         return new getVirtualizers_argsStandardScheme();
       }
     }
 
-    private static class getVirtualizers_argsStandardScheme extends StandardScheme<getVirtualizers_args> {
+    private static class getVirtualizers_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<getVirtualizers_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getVirtualizers_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -24077,25 +24507,28 @@ public class MasterServer {
 
     }
 
-    private static class getVirtualizers_argsTupleSchemeFactory implements SchemeFactory {
+    private static class getVirtualizers_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getVirtualizers_argsTupleScheme getScheme() {
         return new getVirtualizers_argsTupleScheme();
       }
     }
 
-    private static class getVirtualizers_argsTupleScheme extends TupleScheme<getVirtualizers_args> {
+    private static class getVirtualizers_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<getVirtualizers_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getVirtualizers_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
       }
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getVirtualizers_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getVirtualizers_result implements org.apache.thrift.TBase<getVirtualizers_result, getVirtualizers_result._Fields>, java.io.Serializable, Cloneable, Comparable<getVirtualizers_result>   {
@@ -24104,24 +24537,21 @@ public class MasterServer {
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0);
     private static final org.apache.thrift.protocol.TField SERVER_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("serverError", org.apache.thrift.protocol.TType.STRUCT, (short)1);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getVirtualizers_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getVirtualizers_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getVirtualizers_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getVirtualizers_resultTupleSchemeFactory();
 
-    public List<Virtualizer> success; // required
-    public TInvocationException serverError; // required
+    public @org.apache.thrift.annotation.Nullable java.util.List<Virtualizer> success; // required
+    public @org.apache.thrift.annotation.Nullable TInvocationException serverError; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SUCCESS((short)0, "success"),
       SERVER_ERROR((short)1, "serverError");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -24129,6 +24559,7 @@ public class MasterServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
@@ -24146,21 +24577,22 @@ public class MasterServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -24169,21 +24601,21 @@ public class MasterServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
               new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Virtualizer.class))));
       tmpMap.put(_Fields.SERVER_ERROR, new org.apache.thrift.meta_data.FieldMetaData("serverError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getVirtualizers_result.class, metaDataMap);
     }
 
@@ -24191,7 +24623,7 @@ public class MasterServer {
     }
 
     public getVirtualizers_result(
-      List<Virtualizer> success,
+      java.util.List<Virtualizer> success,
       TInvocationException serverError)
     {
       this();
@@ -24204,7 +24636,7 @@ public class MasterServer {
      */
     public getVirtualizers_result(getVirtualizers_result other) {
       if (other.isSetSuccess()) {
-        List<Virtualizer> __this__success = new ArrayList<Virtualizer>(other.success.size());
+        java.util.List<Virtualizer> __this__success = new java.util.ArrayList<Virtualizer>(other.success.size());
         for (Virtualizer other_element : other.success) {
           __this__success.add(new Virtualizer(other_element));
         }
@@ -24229,22 +24661,24 @@ public class MasterServer {
       return (this.success == null) ? 0 : this.success.size();
     }
 
+    @org.apache.thrift.annotation.Nullable
     public java.util.Iterator<Virtualizer> getSuccessIterator() {
       return (this.success == null) ? null : this.success.iterator();
     }
 
     public void addToSuccess(Virtualizer elem) {
       if (this.success == null) {
-        this.success = new ArrayList<Virtualizer>();
+        this.success = new java.util.ArrayList<Virtualizer>();
       }
       this.success.add(elem);
     }
 
-    public List<Virtualizer> getSuccess() {
+    @org.apache.thrift.annotation.Nullable
+    public java.util.List<Virtualizer> getSuccess() {
       return this.success;
     }
 
-    public getVirtualizers_result setSuccess(List<Virtualizer> success) {
+    public getVirtualizers_result setSuccess(@org.apache.thrift.annotation.Nullable java.util.List<Virtualizer> success) {
       this.success = success;
       return this;
     }
@@ -24264,11 +24698,12 @@ public class MasterServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvocationException getServerError() {
       return this.serverError;
     }
 
-    public getVirtualizers_result setServerError(TInvocationException serverError) {
+    public getVirtualizers_result setServerError(@org.apache.thrift.annotation.Nullable TInvocationException serverError) {
       this.serverError = serverError;
       return this;
     }
@@ -24288,13 +24723,13 @@ public class MasterServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
           unsetSuccess();
         } else {
-          setSuccess((List<Virtualizer>)value);
+          setSuccess((java.util.List<Virtualizer>)value);
         }
         break;
 
@@ -24309,7 +24744,8 @@ public class MasterServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
         return getSuccess();
@@ -24318,13 +24754,13 @@ public class MasterServer {
         return getServerError();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -24333,13 +24769,11 @@ public class MasterServer {
       case SERVER_ERROR:
         return isSetServerError();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getVirtualizers_result)
         return this.equals((getVirtualizers_result)that);
       return false;
@@ -24348,6 +24782,8 @@ public class MasterServer {
     public boolean equals(getVirtualizers_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_success = true && this.isSetSuccess();
       boolean that_present_success = true && that.isSetSuccess();
@@ -24372,19 +24808,17 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
 
-      boolean present_serverError = true && (isSetServerError());
-      list.add(present_serverError);
-      if (present_serverError)
-        list.add(serverError);
+      hashCode = hashCode * 8191 + ((isSetServerError()) ? 131071 : 524287);
+      if (isSetServerError())
+        hashCode = hashCode * 8191 + serverError.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -24395,7 +24829,7 @@ public class MasterServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -24405,7 +24839,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetServerError()).compareTo(other.isSetServerError());
+      lastComparison = java.lang.Boolean.compare(isSetServerError(), other.isSetServerError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -24418,21 +24852,22 @@ public class MasterServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getVirtualizers_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getVirtualizers_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -24467,7 +24902,7 @@ public class MasterServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -24475,13 +24910,13 @@ public class MasterServer {
       }
     }
 
-    private static class getVirtualizers_resultStandardSchemeFactory implements SchemeFactory {
+    private static class getVirtualizers_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getVirtualizers_resultStandardScheme getScheme() {
         return new getVirtualizers_resultStandardScheme();
       }
     }
 
-    private static class getVirtualizers_resultStandardScheme extends StandardScheme<getVirtualizers_result> {
+    private static class getVirtualizers_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<getVirtualizers_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getVirtualizers_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -24496,14 +24931,14 @@ public class MasterServer {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list362 = iprot.readListBegin();
-                  struct.success = new ArrayList<Virtualizer>(_list362.size);
-                  Virtualizer _elem363;
-                  for (int _i364 = 0; _i364 < _list362.size; ++_i364)
+                  org.apache.thrift.protocol.TList _list474 = iprot.readListBegin();
+                  struct.success = new java.util.ArrayList<Virtualizer>(_list474.size);
+                  @org.apache.thrift.annotation.Nullable Virtualizer _elem475;
+                  for (int _i476 = 0; _i476 < _list474.size; ++_i476)
                   {
-                    _elem363 = new Virtualizer();
-                    _elem363.read(iprot);
-                    struct.success.add(_elem363);
+                    _elem475 = new Virtualizer();
+                    _elem475.read(iprot);
+                    struct.success.add(_elem475);
                   }
                   iprot.readListEnd();
                 }
@@ -24540,9 +24975,9 @@ public class MasterServer {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
-            for (Virtualizer _iter365 : struct.success)
+            for (Virtualizer _iter477 : struct.success)
             {
-              _iter365.write(oprot);
+              _iter477.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -24559,18 +24994,18 @@ public class MasterServer {
 
     }
 
-    private static class getVirtualizers_resultTupleSchemeFactory implements SchemeFactory {
+    private static class getVirtualizers_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getVirtualizers_resultTupleScheme getScheme() {
         return new getVirtualizers_resultTupleScheme();
       }
     }
 
-    private static class getVirtualizers_resultTupleScheme extends TupleScheme<getVirtualizers_result> {
+    private static class getVirtualizers_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<getVirtualizers_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getVirtualizers_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
           optionals.set(0);
         }
@@ -24581,9 +25016,9 @@ public class MasterServer {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (Virtualizer _iter366 : struct.success)
+            for (Virtualizer _iter478 : struct.success)
             {
-              _iter366.write(oprot);
+              _iter478.write(oprot);
             }
           }
         }
@@ -24594,18 +25029,18 @@ public class MasterServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getVirtualizers_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(2);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list367 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new ArrayList<Virtualizer>(_list367.size);
-            Virtualizer _elem368;
-            for (int _i369 = 0; _i369 < _list367.size; ++_i369)
+            org.apache.thrift.protocol.TList _list479 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.success = new java.util.ArrayList<Virtualizer>(_list479.size);
+            @org.apache.thrift.annotation.Nullable Virtualizer _elem480;
+            for (int _i481 = 0; _i481 < _list479.size; ++_i481)
             {
-              _elem368 = new Virtualizer();
-              _elem368.read(iprot);
-              struct.success.add(_elem368);
+              _elem480 = new Virtualizer();
+              _elem480.read(iprot);
+              struct.success.add(_elem480);
             }
           }
           struct.setSuccessIsSet(true);
@@ -24618,6 +25053,9 @@ public class MasterServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getTags_args implements org.apache.thrift.TBase<getTags_args, getTags_args._Fields>, java.io.Serializable, Cloneable, Comparable<getTags_args>   {
@@ -24625,11 +25063,8 @@ public class MasterServer {
 
     private static final org.apache.thrift.protocol.TField START_DATE_FIELD_DESC = new org.apache.thrift.protocol.TField("startDate", org.apache.thrift.protocol.TType.I64, (short)1);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getTags_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getTags_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getTags_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getTags_argsTupleSchemeFactory();
 
     public long startDate; // required
 
@@ -24637,10 +25072,10 @@ public class MasterServer {
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       START_DATE((short)1, "startDate");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -24648,6 +25083,7 @@ public class MasterServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // START_DATE
@@ -24663,21 +25099,22 @@ public class MasterServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -24686,7 +25123,7 @@ public class MasterServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
@@ -24694,12 +25131,12 @@ public class MasterServer {
     // isset id assignments
     private static final int __STARTDATE_ISSET_ID = 0;
     private byte __isset_bitfield = 0;
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.START_DATE, new org.apache.thrift.meta_data.FieldMetaData("startDate", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64          , "UnixTimestamp")));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getTags_args.class, metaDataMap);
     }
 
@@ -24743,57 +25180,56 @@ public class MasterServer {
     }
 
     public void unsetStartDate() {
-      __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __STARTDATE_ISSET_ID);
+      __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __STARTDATE_ISSET_ID);
     }
 
     /** Returns true if field startDate is set (has been assigned a value) and false otherwise */
     public boolean isSetStartDate() {
-      return EncodingUtils.testBit(__isset_bitfield, __STARTDATE_ISSET_ID);
+      return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __STARTDATE_ISSET_ID);
     }
 
     public void setStartDateIsSet(boolean value) {
-      __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __STARTDATE_ISSET_ID, value);
+      __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __STARTDATE_ISSET_ID, value);
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case START_DATE:
         if (value == null) {
           unsetStartDate();
         } else {
-          setStartDate((Long)value);
+          setStartDate((java.lang.Long)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case START_DATE:
         return getStartDate();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
       case START_DATE:
         return isSetStartDate();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getTags_args)
         return this.equals((getTags_args)that);
       return false;
@@ -24802,6 +25238,8 @@ public class MasterServer {
     public boolean equals(getTags_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_startDate = true;
       boolean that_present_startDate = true;
@@ -24817,14 +25255,11 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_startDate = true;
-      list.add(present_startDate);
-      if (present_startDate)
-        list.add(startDate);
+      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(startDate);
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -24835,7 +25270,7 @@ public class MasterServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetStartDate()).compareTo(other.isSetStartDate());
+      lastComparison = java.lang.Boolean.compare(isSetStartDate(), other.isSetStartDate());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -24848,21 +25283,22 @@ public class MasterServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getTags_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getTags_args(");
       boolean first = true;
 
       sb.append("startDate:");
@@ -24885,7 +25321,7 @@ public class MasterServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
         __isset_bitfield = 0;
@@ -24895,13 +25331,13 @@ public class MasterServer {
       }
     }
 
-    private static class getTags_argsStandardSchemeFactory implements SchemeFactory {
+    private static class getTags_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getTags_argsStandardScheme getScheme() {
         return new getTags_argsStandardScheme();
       }
     }
 
-    private static class getTags_argsStandardScheme extends StandardScheme<getTags_args> {
+    private static class getTags_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<getTags_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getTags_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -24945,18 +25381,18 @@ public class MasterServer {
 
     }
 
-    private static class getTags_argsTupleSchemeFactory implements SchemeFactory {
+    private static class getTags_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getTags_argsTupleScheme getScheme() {
         return new getTags_argsTupleScheme();
       }
     }
 
-    private static class getTags_argsTupleScheme extends TupleScheme<getTags_args> {
+    private static class getTags_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<getTags_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getTags_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetStartDate()) {
           optionals.set(0);
         }
@@ -24968,8 +25404,8 @@ public class MasterServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getTags_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(1);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
           struct.startDate = iprot.readI64();
           struct.setStartDateIsSet(true);
@@ -24977,6 +25413,9 @@ public class MasterServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getTags_result implements org.apache.thrift.TBase<getTags_result, getTags_result._Fields>, java.io.Serializable, Cloneable, Comparable<getTags_result>   {
@@ -24985,24 +25424,21 @@ public class MasterServer {
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0);
     private static final org.apache.thrift.protocol.TField SERVER_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("serverError", org.apache.thrift.protocol.TType.STRUCT, (short)1);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getTags_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getTags_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getTags_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getTags_resultTupleSchemeFactory();
 
-    public List<MasterTag> success; // required
-    public TInvocationException serverError; // required
+    public @org.apache.thrift.annotation.Nullable java.util.List<MasterTag> success; // required
+    public @org.apache.thrift.annotation.Nullable TInvocationException serverError; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SUCCESS((short)0, "success"),
       SERVER_ERROR((short)1, "serverError");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -25010,6 +25446,7 @@ public class MasterServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
@@ -25027,21 +25464,22 @@ public class MasterServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -25050,21 +25488,21 @@ public class MasterServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
               new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, MasterTag.class))));
       tmpMap.put(_Fields.SERVER_ERROR, new org.apache.thrift.meta_data.FieldMetaData("serverError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getTags_result.class, metaDataMap);
     }
 
@@ -25072,7 +25510,7 @@ public class MasterServer {
     }
 
     public getTags_result(
-      List<MasterTag> success,
+      java.util.List<MasterTag> success,
       TInvocationException serverError)
     {
       this();
@@ -25085,7 +25523,7 @@ public class MasterServer {
      */
     public getTags_result(getTags_result other) {
       if (other.isSetSuccess()) {
-        List<MasterTag> __this__success = new ArrayList<MasterTag>(other.success.size());
+        java.util.List<MasterTag> __this__success = new java.util.ArrayList<MasterTag>(other.success.size());
         for (MasterTag other_element : other.success) {
           __this__success.add(new MasterTag(other_element));
         }
@@ -25110,22 +25548,24 @@ public class MasterServer {
       return (this.success == null) ? 0 : this.success.size();
     }
 
+    @org.apache.thrift.annotation.Nullable
     public java.util.Iterator<MasterTag> getSuccessIterator() {
       return (this.success == null) ? null : this.success.iterator();
     }
 
     public void addToSuccess(MasterTag elem) {
       if (this.success == null) {
-        this.success = new ArrayList<MasterTag>();
+        this.success = new java.util.ArrayList<MasterTag>();
       }
       this.success.add(elem);
     }
 
-    public List<MasterTag> getSuccess() {
+    @org.apache.thrift.annotation.Nullable
+    public java.util.List<MasterTag> getSuccess() {
       return this.success;
     }
 
-    public getTags_result setSuccess(List<MasterTag> success) {
+    public getTags_result setSuccess(@org.apache.thrift.annotation.Nullable java.util.List<MasterTag> success) {
       this.success = success;
       return this;
     }
@@ -25145,11 +25585,12 @@ public class MasterServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvocationException getServerError() {
       return this.serverError;
     }
 
-    public getTags_result setServerError(TInvocationException serverError) {
+    public getTags_result setServerError(@org.apache.thrift.annotation.Nullable TInvocationException serverError) {
       this.serverError = serverError;
       return this;
     }
@@ -25169,13 +25610,13 @@ public class MasterServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
           unsetSuccess();
         } else {
-          setSuccess((List<MasterTag>)value);
+          setSuccess((java.util.List<MasterTag>)value);
         }
         break;
 
@@ -25190,7 +25631,8 @@ public class MasterServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
         return getSuccess();
@@ -25199,13 +25641,13 @@ public class MasterServer {
         return getServerError();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -25214,13 +25656,11 @@ public class MasterServer {
       case SERVER_ERROR:
         return isSetServerError();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getTags_result)
         return this.equals((getTags_result)that);
       return false;
@@ -25229,6 +25669,8 @@ public class MasterServer {
     public boolean equals(getTags_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_success = true && this.isSetSuccess();
       boolean that_present_success = true && that.isSetSuccess();
@@ -25253,19 +25695,17 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
 
-      boolean present_serverError = true && (isSetServerError());
-      list.add(present_serverError);
-      if (present_serverError)
-        list.add(serverError);
+      hashCode = hashCode * 8191 + ((isSetServerError()) ? 131071 : 524287);
+      if (isSetServerError())
+        hashCode = hashCode * 8191 + serverError.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -25276,7 +25716,7 @@ public class MasterServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -25286,7 +25726,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetServerError()).compareTo(other.isSetServerError());
+      lastComparison = java.lang.Boolean.compare(isSetServerError(), other.isSetServerError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -25299,21 +25739,22 @@ public class MasterServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getTags_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getTags_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -25348,7 +25789,7 @@ public class MasterServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -25356,13 +25797,13 @@ public class MasterServer {
       }
     }
 
-    private static class getTags_resultStandardSchemeFactory implements SchemeFactory {
+    private static class getTags_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getTags_resultStandardScheme getScheme() {
         return new getTags_resultStandardScheme();
       }
     }
 
-    private static class getTags_resultStandardScheme extends StandardScheme<getTags_result> {
+    private static class getTags_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<getTags_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getTags_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -25377,14 +25818,14 @@ public class MasterServer {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list370 = iprot.readListBegin();
-                  struct.success = new ArrayList<MasterTag>(_list370.size);
-                  MasterTag _elem371;
-                  for (int _i372 = 0; _i372 < _list370.size; ++_i372)
+                  org.apache.thrift.protocol.TList _list482 = iprot.readListBegin();
+                  struct.success = new java.util.ArrayList<MasterTag>(_list482.size);
+                  @org.apache.thrift.annotation.Nullable MasterTag _elem483;
+                  for (int _i484 = 0; _i484 < _list482.size; ++_i484)
                   {
-                    _elem371 = new MasterTag();
-                    _elem371.read(iprot);
-                    struct.success.add(_elem371);
+                    _elem483 = new MasterTag();
+                    _elem483.read(iprot);
+                    struct.success.add(_elem483);
                   }
                   iprot.readListEnd();
                 }
@@ -25421,9 +25862,9 @@ public class MasterServer {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
-            for (MasterTag _iter373 : struct.success)
+            for (MasterTag _iter485 : struct.success)
             {
-              _iter373.write(oprot);
+              _iter485.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -25440,18 +25881,18 @@ public class MasterServer {
 
     }
 
-    private static class getTags_resultTupleSchemeFactory implements SchemeFactory {
+    private static class getTags_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getTags_resultTupleScheme getScheme() {
         return new getTags_resultTupleScheme();
       }
     }
 
-    private static class getTags_resultTupleScheme extends TupleScheme<getTags_result> {
+    private static class getTags_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<getTags_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getTags_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
           optionals.set(0);
         }
@@ -25462,9 +25903,9 @@ public class MasterServer {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (MasterTag _iter374 : struct.success)
+            for (MasterTag _iter486 : struct.success)
             {
-              _iter374.write(oprot);
+              _iter486.write(oprot);
             }
           }
         }
@@ -25475,18 +25916,18 @@ public class MasterServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getTags_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(2);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list375 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new ArrayList<MasterTag>(_list375.size);
-            MasterTag _elem376;
-            for (int _i377 = 0; _i377 < _list375.size; ++_i377)
+            org.apache.thrift.protocol.TList _list487 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.success = new java.util.ArrayList<MasterTag>(_list487.size);
+            @org.apache.thrift.annotation.Nullable MasterTag _elem488;
+            for (int _i489 = 0; _i489 < _list487.size; ++_i489)
             {
-              _elem376 = new MasterTag();
-              _elem376.read(iprot);
-              struct.success.add(_elem376);
+              _elem488 = new MasterTag();
+              _elem488.read(iprot);
+              struct.success.add(_elem488);
             }
           }
           struct.setSuccessIsSet(true);
@@ -25499,6 +25940,9 @@ public class MasterServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getSoftware_args implements org.apache.thrift.TBase<getSoftware_args, getSoftware_args._Fields>, java.io.Serializable, Cloneable, Comparable<getSoftware_args>   {
@@ -25506,11 +25950,8 @@ public class MasterServer {
 
     private static final org.apache.thrift.protocol.TField START_DATE_FIELD_DESC = new org.apache.thrift.protocol.TField("startDate", org.apache.thrift.protocol.TType.I64, (short)1);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getSoftware_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getSoftware_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getSoftware_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getSoftware_argsTupleSchemeFactory();
 
     public long startDate; // required
 
@@ -25518,10 +25959,10 @@ public class MasterServer {
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       START_DATE((short)1, "startDate");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -25529,6 +25970,7 @@ public class MasterServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // START_DATE
@@ -25544,21 +25986,22 @@ public class MasterServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -25567,7 +26010,7 @@ public class MasterServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
@@ -25575,12 +26018,12 @@ public class MasterServer {
     // isset id assignments
     private static final int __STARTDATE_ISSET_ID = 0;
     private byte __isset_bitfield = 0;
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.START_DATE, new org.apache.thrift.meta_data.FieldMetaData("startDate", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64          , "UnixTimestamp")));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getSoftware_args.class, metaDataMap);
     }
 
@@ -25624,57 +26067,56 @@ public class MasterServer {
     }
 
     public void unsetStartDate() {
-      __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __STARTDATE_ISSET_ID);
+      __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __STARTDATE_ISSET_ID);
     }
 
     /** Returns true if field startDate is set (has been assigned a value) and false otherwise */
     public boolean isSetStartDate() {
-      return EncodingUtils.testBit(__isset_bitfield, __STARTDATE_ISSET_ID);
+      return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __STARTDATE_ISSET_ID);
     }
 
     public void setStartDateIsSet(boolean value) {
-      __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __STARTDATE_ISSET_ID, value);
+      __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __STARTDATE_ISSET_ID, value);
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case START_DATE:
         if (value == null) {
           unsetStartDate();
         } else {
-          setStartDate((Long)value);
+          setStartDate((java.lang.Long)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case START_DATE:
         return getStartDate();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
       case START_DATE:
         return isSetStartDate();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getSoftware_args)
         return this.equals((getSoftware_args)that);
       return false;
@@ -25683,6 +26125,8 @@ public class MasterServer {
     public boolean equals(getSoftware_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_startDate = true;
       boolean that_present_startDate = true;
@@ -25698,14 +26142,11 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_startDate = true;
-      list.add(present_startDate);
-      if (present_startDate)
-        list.add(startDate);
+      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(startDate);
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -25716,7 +26157,7 @@ public class MasterServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetStartDate()).compareTo(other.isSetStartDate());
+      lastComparison = java.lang.Boolean.compare(isSetStartDate(), other.isSetStartDate());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -25729,21 +26170,22 @@ public class MasterServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getSoftware_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getSoftware_args(");
       boolean first = true;
 
       sb.append("startDate:");
@@ -25766,7 +26208,7 @@ public class MasterServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
         __isset_bitfield = 0;
@@ -25776,13 +26218,13 @@ public class MasterServer {
       }
     }
 
-    private static class getSoftware_argsStandardSchemeFactory implements SchemeFactory {
+    private static class getSoftware_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getSoftware_argsStandardScheme getScheme() {
         return new getSoftware_argsStandardScheme();
       }
     }
 
-    private static class getSoftware_argsStandardScheme extends StandardScheme<getSoftware_args> {
+    private static class getSoftware_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<getSoftware_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getSoftware_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -25826,18 +26268,18 @@ public class MasterServer {
 
     }
 
-    private static class getSoftware_argsTupleSchemeFactory implements SchemeFactory {
+    private static class getSoftware_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getSoftware_argsTupleScheme getScheme() {
         return new getSoftware_argsTupleScheme();
       }
     }
 
-    private static class getSoftware_argsTupleScheme extends TupleScheme<getSoftware_args> {
+    private static class getSoftware_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<getSoftware_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getSoftware_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetStartDate()) {
           optionals.set(0);
         }
@@ -25849,8 +26291,8 @@ public class MasterServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getSoftware_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(1);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
           struct.startDate = iprot.readI64();
           struct.setStartDateIsSet(true);
@@ -25858,6 +26300,9 @@ public class MasterServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getSoftware_result implements org.apache.thrift.TBase<getSoftware_result, getSoftware_result._Fields>, java.io.Serializable, Cloneable, Comparable<getSoftware_result>   {
@@ -25866,24 +26311,21 @@ public class MasterServer {
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0);
     private static final org.apache.thrift.protocol.TField SERVER_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("serverError", org.apache.thrift.protocol.TType.STRUCT, (short)1);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getSoftware_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getSoftware_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getSoftware_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getSoftware_resultTupleSchemeFactory();
 
-    public List<MasterSoftware> success; // required
-    public TInvocationException serverError; // required
+    public @org.apache.thrift.annotation.Nullable java.util.List<MasterSoftware> success; // required
+    public @org.apache.thrift.annotation.Nullable TInvocationException serverError; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SUCCESS((short)0, "success"),
       SERVER_ERROR((short)1, "serverError");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -25891,6 +26333,7 @@ public class MasterServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
@@ -25908,21 +26351,22 @@ public class MasterServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -25931,21 +26375,21 @@ public class MasterServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
               new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, MasterSoftware.class))));
       tmpMap.put(_Fields.SERVER_ERROR, new org.apache.thrift.meta_data.FieldMetaData("serverError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getSoftware_result.class, metaDataMap);
     }
 
@@ -25953,7 +26397,7 @@ public class MasterServer {
     }
 
     public getSoftware_result(
-      List<MasterSoftware> success,
+      java.util.List<MasterSoftware> success,
       TInvocationException serverError)
     {
       this();
@@ -25966,7 +26410,7 @@ public class MasterServer {
      */
     public getSoftware_result(getSoftware_result other) {
       if (other.isSetSuccess()) {
-        List<MasterSoftware> __this__success = new ArrayList<MasterSoftware>(other.success.size());
+        java.util.List<MasterSoftware> __this__success = new java.util.ArrayList<MasterSoftware>(other.success.size());
         for (MasterSoftware other_element : other.success) {
           __this__success.add(new MasterSoftware(other_element));
         }
@@ -25991,22 +26435,24 @@ public class MasterServer {
       return (this.success == null) ? 0 : this.success.size();
     }
 
+    @org.apache.thrift.annotation.Nullable
     public java.util.Iterator<MasterSoftware> getSuccessIterator() {
       return (this.success == null) ? null : this.success.iterator();
     }
 
     public void addToSuccess(MasterSoftware elem) {
       if (this.success == null) {
-        this.success = new ArrayList<MasterSoftware>();
+        this.success = new java.util.ArrayList<MasterSoftware>();
       }
       this.success.add(elem);
     }
 
-    public List<MasterSoftware> getSuccess() {
+    @org.apache.thrift.annotation.Nullable
+    public java.util.List<MasterSoftware> getSuccess() {
       return this.success;
     }
 
-    public getSoftware_result setSuccess(List<MasterSoftware> success) {
+    public getSoftware_result setSuccess(@org.apache.thrift.annotation.Nullable java.util.List<MasterSoftware> success) {
       this.success = success;
       return this;
     }
@@ -26026,11 +26472,12 @@ public class MasterServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvocationException getServerError() {
       return this.serverError;
     }
 
-    public getSoftware_result setServerError(TInvocationException serverError) {
+    public getSoftware_result setServerError(@org.apache.thrift.annotation.Nullable TInvocationException serverError) {
       this.serverError = serverError;
       return this;
     }
@@ -26050,13 +26497,13 @@ public class MasterServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
           unsetSuccess();
         } else {
-          setSuccess((List<MasterSoftware>)value);
+          setSuccess((java.util.List<MasterSoftware>)value);
         }
         break;
 
@@ -26071,7 +26518,8 @@ public class MasterServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
         return getSuccess();
@@ -26080,13 +26528,13 @@ public class MasterServer {
         return getServerError();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -26095,13 +26543,11 @@ public class MasterServer {
       case SERVER_ERROR:
         return isSetServerError();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getSoftware_result)
         return this.equals((getSoftware_result)that);
       return false;
@@ -26110,6 +26556,8 @@ public class MasterServer {
     public boolean equals(getSoftware_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_success = true && this.isSetSuccess();
       boolean that_present_success = true && that.isSetSuccess();
@@ -26134,19 +26582,17 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
 
-      boolean present_serverError = true && (isSetServerError());
-      list.add(present_serverError);
-      if (present_serverError)
-        list.add(serverError);
+      hashCode = hashCode * 8191 + ((isSetServerError()) ? 131071 : 524287);
+      if (isSetServerError())
+        hashCode = hashCode * 8191 + serverError.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -26157,7 +26603,7 @@ public class MasterServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -26167,7 +26613,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetServerError()).compareTo(other.isSetServerError());
+      lastComparison = java.lang.Boolean.compare(isSetServerError(), other.isSetServerError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -26180,21 +26626,22 @@ public class MasterServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getSoftware_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getSoftware_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -26229,7 +26676,7 @@ public class MasterServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -26237,13 +26684,13 @@ public class MasterServer {
       }
     }
 
-    private static class getSoftware_resultStandardSchemeFactory implements SchemeFactory {
+    private static class getSoftware_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getSoftware_resultStandardScheme getScheme() {
         return new getSoftware_resultStandardScheme();
       }
     }
 
-    private static class getSoftware_resultStandardScheme extends StandardScheme<getSoftware_result> {
+    private static class getSoftware_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<getSoftware_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getSoftware_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -26258,14 +26705,14 @@ public class MasterServer {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list378 = iprot.readListBegin();
-                  struct.success = new ArrayList<MasterSoftware>(_list378.size);
-                  MasterSoftware _elem379;
-                  for (int _i380 = 0; _i380 < _list378.size; ++_i380)
+                  org.apache.thrift.protocol.TList _list490 = iprot.readListBegin();
+                  struct.success = new java.util.ArrayList<MasterSoftware>(_list490.size);
+                  @org.apache.thrift.annotation.Nullable MasterSoftware _elem491;
+                  for (int _i492 = 0; _i492 < _list490.size; ++_i492)
                   {
-                    _elem379 = new MasterSoftware();
-                    _elem379.read(iprot);
-                    struct.success.add(_elem379);
+                    _elem491 = new MasterSoftware();
+                    _elem491.read(iprot);
+                    struct.success.add(_elem491);
                   }
                   iprot.readListEnd();
                 }
@@ -26302,9 +26749,9 @@ public class MasterServer {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
-            for (MasterSoftware _iter381 : struct.success)
+            for (MasterSoftware _iter493 : struct.success)
             {
-              _iter381.write(oprot);
+              _iter493.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -26321,18 +26768,18 @@ public class MasterServer {
 
     }
 
-    private static class getSoftware_resultTupleSchemeFactory implements SchemeFactory {
+    private static class getSoftware_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getSoftware_resultTupleScheme getScheme() {
         return new getSoftware_resultTupleScheme();
       }
     }
 
-    private static class getSoftware_resultTupleScheme extends TupleScheme<getSoftware_result> {
+    private static class getSoftware_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<getSoftware_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getSoftware_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
           optionals.set(0);
         }
@@ -26343,9 +26790,9 @@ public class MasterServer {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (MasterSoftware _iter382 : struct.success)
+            for (MasterSoftware _iter494 : struct.success)
             {
-              _iter382.write(oprot);
+              _iter494.write(oprot);
             }
           }
         }
@@ -26356,18 +26803,18 @@ public class MasterServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getSoftware_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(2);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list383 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new ArrayList<MasterSoftware>(_list383.size);
-            MasterSoftware _elem384;
-            for (int _i385 = 0; _i385 < _list383.size; ++_i385)
+            org.apache.thrift.protocol.TList _list495 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.success = new java.util.ArrayList<MasterSoftware>(_list495.size);
+            @org.apache.thrift.annotation.Nullable MasterSoftware _elem496;
+            for (int _i497 = 0; _i497 < _list495.size; ++_i497)
             {
-              _elem384 = new MasterSoftware();
-              _elem384.read(iprot);
-              struct.success.add(_elem384);
+              _elem496 = new MasterSoftware();
+              _elem496.read(iprot);
+              struct.success.add(_elem496);
             }
           }
           struct.setSuccessIsSet(true);
@@ -26380,6 +26827,9 @@ public class MasterServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class queryUploadStatus_args implements org.apache.thrift.TBase<queryUploadStatus_args, queryUploadStatus_args._Fields>, java.io.Serializable, Cloneable, Comparable<queryUploadStatus_args>   {
@@ -26387,22 +26837,19 @@ public class MasterServer {
 
     private static final org.apache.thrift.protocol.TField UPLOAD_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("uploadToken", org.apache.thrift.protocol.TType.STRING, (short)1);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new queryUploadStatus_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new queryUploadStatus_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new queryUploadStatus_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new queryUploadStatus_argsTupleSchemeFactory();
 
-    public String uploadToken; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String uploadToken; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       UPLOAD_TOKEN((short)1, "uploadToken");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -26410,6 +26857,7 @@ public class MasterServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // UPLOAD_TOKEN
@@ -26425,21 +26873,22 @@ public class MasterServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -26448,18 +26897,18 @@ public class MasterServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.UPLOAD_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("uploadToken", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(queryUploadStatus_args.class, metaDataMap);
     }
 
@@ -26467,7 +26916,7 @@ public class MasterServer {
     }
 
     public queryUploadStatus_args(
-      String uploadToken)
+      java.lang.String uploadToken)
     {
       this();
       this.uploadToken = uploadToken;
@@ -26491,11 +26940,12 @@ public class MasterServer {
       this.uploadToken = null;
     }
 
-    public String getUploadToken() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getUploadToken() {
       return this.uploadToken;
     }
 
-    public queryUploadStatus_args setUploadToken(String uploadToken) {
+    public queryUploadStatus_args setUploadToken(@org.apache.thrift.annotation.Nullable java.lang.String uploadToken) {
       this.uploadToken = uploadToken;
       return this;
     }
@@ -26515,45 +26965,44 @@ public class MasterServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case UPLOAD_TOKEN:
         if (value == null) {
           unsetUploadToken();
         } else {
-          setUploadToken((String)value);
+          setUploadToken((java.lang.String)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case UPLOAD_TOKEN:
         return getUploadToken();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
       case UPLOAD_TOKEN:
         return isSetUploadToken();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof queryUploadStatus_args)
         return this.equals((queryUploadStatus_args)that);
       return false;
@@ -26562,6 +27011,8 @@ public class MasterServer {
     public boolean equals(queryUploadStatus_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_uploadToken = true && this.isSetUploadToken();
       boolean that_present_uploadToken = true && that.isSetUploadToken();
@@ -26577,14 +27028,13 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_uploadToken = true && (isSetUploadToken());
-      list.add(present_uploadToken);
-      if (present_uploadToken)
-        list.add(uploadToken);
+      hashCode = hashCode * 8191 + ((isSetUploadToken()) ? 131071 : 524287);
+      if (isSetUploadToken())
+        hashCode = hashCode * 8191 + uploadToken.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -26595,7 +27045,7 @@ public class MasterServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetUploadToken()).compareTo(other.isSetUploadToken());
+      lastComparison = java.lang.Boolean.compare(isSetUploadToken(), other.isSetUploadToken());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -26608,21 +27058,22 @@ public class MasterServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("queryUploadStatus_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("queryUploadStatus_args(");
       boolean first = true;
 
       sb.append("uploadToken:");
@@ -26649,7 +27100,7 @@ public class MasterServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -26657,13 +27108,13 @@ public class MasterServer {
       }
     }
 
-    private static class queryUploadStatus_argsStandardSchemeFactory implements SchemeFactory {
+    private static class queryUploadStatus_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public queryUploadStatus_argsStandardScheme getScheme() {
         return new queryUploadStatus_argsStandardScheme();
       }
     }
 
-    private static class queryUploadStatus_argsStandardScheme extends StandardScheme<queryUploadStatus_args> {
+    private static class queryUploadStatus_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<queryUploadStatus_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, queryUploadStatus_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -26709,18 +27160,18 @@ public class MasterServer {
 
     }
 
-    private static class queryUploadStatus_argsTupleSchemeFactory implements SchemeFactory {
+    private static class queryUploadStatus_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public queryUploadStatus_argsTupleScheme getScheme() {
         return new queryUploadStatus_argsTupleScheme();
       }
     }
 
-    private static class queryUploadStatus_argsTupleScheme extends TupleScheme<queryUploadStatus_args> {
+    private static class queryUploadStatus_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<queryUploadStatus_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, queryUploadStatus_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetUploadToken()) {
           optionals.set(0);
         }
@@ -26732,8 +27183,8 @@ public class MasterServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, queryUploadStatus_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(1);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
           struct.uploadToken = iprot.readString();
           struct.setUploadTokenIsSet(true);
@@ -26741,6 +27192,9 @@ public class MasterServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class queryUploadStatus_result implements org.apache.thrift.TBase<queryUploadStatus_result, queryUploadStatus_result._Fields>, java.io.Serializable, Cloneable, Comparable<queryUploadStatus_result>   {
@@ -26749,24 +27203,21 @@ public class MasterServer {
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0);
     private static final org.apache.thrift.protocol.TField EX1_FIELD_DESC = new org.apache.thrift.protocol.TField("ex1", org.apache.thrift.protocol.TType.STRUCT, (short)1);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new queryUploadStatus_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new queryUploadStatus_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new queryUploadStatus_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new queryUploadStatus_resultTupleSchemeFactory();
 
-    public TransferStatus success; // required
-    public TInvalidTokenException ex1; // required
+    public @org.apache.thrift.annotation.Nullable TransferStatus success; // required
+    public @org.apache.thrift.annotation.Nullable TInvalidTokenException ex1; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SUCCESS((short)0, "success"),
       EX1((short)1, "ex1");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -26774,6 +27225,7 @@ public class MasterServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
@@ -26791,21 +27243,22 @@ public class MasterServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -26814,20 +27267,20 @@ public class MasterServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TransferStatus.class)));
       tmpMap.put(_Fields.EX1, new org.apache.thrift.meta_data.FieldMetaData("ex1", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvalidTokenException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(queryUploadStatus_result.class, metaDataMap);
     }
 
@@ -26865,11 +27318,12 @@ public class MasterServer {
       this.ex1 = null;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TransferStatus getSuccess() {
       return this.success;
     }
 
-    public queryUploadStatus_result setSuccess(TransferStatus success) {
+    public queryUploadStatus_result setSuccess(@org.apache.thrift.annotation.Nullable TransferStatus success) {
       this.success = success;
       return this;
     }
@@ -26889,11 +27343,12 @@ public class MasterServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvalidTokenException getEx1() {
       return this.ex1;
     }
 
-    public queryUploadStatus_result setEx1(TInvalidTokenException ex1) {
+    public queryUploadStatus_result setEx1(@org.apache.thrift.annotation.Nullable TInvalidTokenException ex1) {
       this.ex1 = ex1;
       return this;
     }
@@ -26913,7 +27368,7 @@ public class MasterServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
@@ -26934,7 +27389,8 @@ public class MasterServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
         return getSuccess();
@@ -26943,13 +27399,13 @@ public class MasterServer {
         return getEx1();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -26958,13 +27414,11 @@ public class MasterServer {
       case EX1:
         return isSetEx1();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof queryUploadStatus_result)
         return this.equals((queryUploadStatus_result)that);
       return false;
@@ -26973,6 +27427,8 @@ public class MasterServer {
     public boolean equals(queryUploadStatus_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_success = true && this.isSetSuccess();
       boolean that_present_success = true && that.isSetSuccess();
@@ -26997,19 +27453,17 @@ public class MasterServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
 
-      boolean present_ex1 = true && (isSetEx1());
-      list.add(present_ex1);
-      if (present_ex1)
-        list.add(ex1);
+      hashCode = hashCode * 8191 + ((isSetEx1()) ? 131071 : 524287);
+      if (isSetEx1())
+        hashCode = hashCode * 8191 + ex1.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -27020,7 +27474,7 @@ public class MasterServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -27030,7 +27484,7 @@ public class MasterServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetEx1()).compareTo(other.isSetEx1());
+      lastComparison = java.lang.Boolean.compare(isSetEx1(), other.isSetEx1());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -27043,21 +27497,22 @@ public class MasterServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("queryUploadStatus_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("queryUploadStatus_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -27095,7 +27550,7 @@ public class MasterServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -27103,13 +27558,13 @@ public class MasterServer {
       }
     }
 
-    private static class queryUploadStatus_resultStandardSchemeFactory implements SchemeFactory {
+    private static class queryUploadStatus_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public queryUploadStatus_resultStandardScheme getScheme() {
         return new queryUploadStatus_resultStandardScheme();
       }
     }
 
-    private static class queryUploadStatus_resultStandardScheme extends StandardScheme<queryUploadStatus_result> {
+    private static class queryUploadStatus_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<queryUploadStatus_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, queryUploadStatus_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -27170,18 +27625,18 @@ public class MasterServer {
 
     }
 
-    private static class queryUploadStatus_resultTupleSchemeFactory implements SchemeFactory {
+    private static class queryUploadStatus_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public queryUploadStatus_resultTupleScheme getScheme() {
         return new queryUploadStatus_resultTupleScheme();
       }
     }
 
-    private static class queryUploadStatus_resultTupleScheme extends TupleScheme<queryUploadStatus_result> {
+    private static class queryUploadStatus_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<queryUploadStatus_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, queryUploadStatus_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
           optionals.set(0);
         }
@@ -27199,8 +27654,8 @@ public class MasterServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, queryUploadStatus_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(2);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           struct.success = new TransferStatus();
           struct.success.read(iprot);
@@ -27214,6 +27669,9 @@ public class MasterServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
 }
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/MasterSoftware.java b/src/main/java/org/openslx/bwlp/thrift/iface/MasterSoftware.java
index 8eb8c49..87824cd 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/MasterSoftware.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/MasterSoftware.java
@@ -1,40 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.openslx.bwlp.thrift.iface;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
 public class MasterSoftware implements org.apache.thrift.TBase<MasterSoftware, MasterSoftware._Fields>, java.io.Serializable, Cloneable, Comparable<MasterSoftware> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("MasterSoftware");
 
@@ -42,13 +15,10 @@ public class MasterSoftware implements org.apache.thrift.TBase<MasterSoftware, M
   private static final org.apache.thrift.protocol.TField IS_RESTRICTED_FIELD_DESC = new org.apache.thrift.protocol.TField("isRestricted", org.apache.thrift.protocol.TType.BOOL, (short)2);
   private static final org.apache.thrift.protocol.TField CREATE_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("createTime", org.apache.thrift.protocol.TType.I64, (short)3);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new MasterSoftwareStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new MasterSoftwareTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new MasterSoftwareStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new MasterSoftwareTupleSchemeFactory();
 
-  public String software; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String software; // required
   public boolean isRestricted; // required
   public long createTime; // required
 
@@ -58,10 +28,10 @@ public class MasterSoftware implements org.apache.thrift.TBase<MasterSoftware, M
     IS_RESTRICTED((short)2, "isRestricted"),
     CREATE_TIME((short)3, "createTime");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -69,6 +39,7 @@ public class MasterSoftware implements org.apache.thrift.TBase<MasterSoftware, M
     /**
      * Find the _Fields constant that matches fieldId, or null if its not found.
      */
+    @org.apache.thrift.annotation.Nullable
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
         case 1: // SOFTWARE
@@ -88,21 +59,22 @@ public class MasterSoftware implements org.apache.thrift.TBase<MasterSoftware, M
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    @org.apache.thrift.annotation.Nullable
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -111,7 +83,7 @@ public class MasterSoftware implements org.apache.thrift.TBase<MasterSoftware, M
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -120,16 +92,16 @@ public class MasterSoftware implements org.apache.thrift.TBase<MasterSoftware, M
   private static final int __ISRESTRICTED_ISSET_ID = 0;
   private static final int __CREATETIME_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.SOFTWARE, new org.apache.thrift.meta_data.FieldMetaData("software", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.IS_RESTRICTED, new org.apache.thrift.meta_data.FieldMetaData("isRestricted", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
     tmpMap.put(_Fields.CREATE_TIME, new org.apache.thrift.meta_data.FieldMetaData("createTime", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64        , "UnixTimestamp")));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(MasterSoftware.class, metaDataMap);
   }
 
@@ -137,7 +109,7 @@ public class MasterSoftware implements org.apache.thrift.TBase<MasterSoftware, M
   }
 
   public MasterSoftware(
-    String software,
+    java.lang.String software,
     boolean isRestricted,
     long createTime)
   {
@@ -174,11 +146,12 @@ public class MasterSoftware implements org.apache.thrift.TBase<MasterSoftware, M
     this.createTime = 0;
   }
 
-  public String getSoftware() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getSoftware() {
     return this.software;
   }
 
-  public MasterSoftware setSoftware(String software) {
+  public MasterSoftware setSoftware(@org.apache.thrift.annotation.Nullable java.lang.String software) {
     this.software = software;
     return this;
   }
@@ -209,16 +182,16 @@ public class MasterSoftware implements org.apache.thrift.TBase<MasterSoftware, M
   }
 
   public void unsetIsRestricted() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISRESTRICTED_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ISRESTRICTED_ISSET_ID);
   }
 
   /** Returns true if field isRestricted is set (has been assigned a value) and false otherwise */
   public boolean isSetIsRestricted() {
-    return EncodingUtils.testBit(__isset_bitfield, __ISRESTRICTED_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ISRESTRICTED_ISSET_ID);
   }
 
   public void setIsRestrictedIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISRESTRICTED_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ISRESTRICTED_ISSET_ID, value);
   }
 
   public long getCreateTime() {
@@ -232,25 +205,25 @@ public class MasterSoftware implements org.apache.thrift.TBase<MasterSoftware, M
   }
 
   public void unsetCreateTime() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __CREATETIME_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __CREATETIME_ISSET_ID);
   }
 
   /** Returns true if field createTime is set (has been assigned a value) and false otherwise */
   public boolean isSetCreateTime() {
-    return EncodingUtils.testBit(__isset_bitfield, __CREATETIME_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __CREATETIME_ISSET_ID);
   }
 
   public void setCreateTimeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __CREATETIME_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __CREATETIME_ISSET_ID, value);
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case SOFTWARE:
       if (value == null) {
         unsetSoftware();
       } else {
-        setSoftware((String)value);
+        setSoftware((java.lang.String)value);
       }
       break;
 
@@ -258,7 +231,7 @@ public class MasterSoftware implements org.apache.thrift.TBase<MasterSoftware, M
       if (value == null) {
         unsetIsRestricted();
       } else {
-        setIsRestricted((Boolean)value);
+        setIsRestricted((java.lang.Boolean)value);
       }
       break;
 
@@ -266,14 +239,15 @@ public class MasterSoftware implements org.apache.thrift.TBase<MasterSoftware, M
       if (value == null) {
         unsetCreateTime();
       } else {
-        setCreateTime((Long)value);
+        setCreateTime((java.lang.Long)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SOFTWARE:
       return getSoftware();
@@ -285,13 +259,13 @@ public class MasterSoftware implements org.apache.thrift.TBase<MasterSoftware, M
       return getCreateTime();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -302,13 +276,11 @@ public class MasterSoftware implements org.apache.thrift.TBase<MasterSoftware, M
     case CREATE_TIME:
       return isSetCreateTime();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
+  public boolean equals(java.lang.Object that) {
     if (that instanceof MasterSoftware)
       return this.equals((MasterSoftware)that);
     return false;
@@ -317,6 +289,8 @@ public class MasterSoftware implements org.apache.thrift.TBase<MasterSoftware, M
   public boolean equals(MasterSoftware that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_software = true && this.isSetSoftware();
     boolean that_present_software = true && that.isSetSoftware();
@@ -350,24 +324,17 @@ public class MasterSoftware implements org.apache.thrift.TBase<MasterSoftware, M
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_software = true && (isSetSoftware());
-    list.add(present_software);
-    if (present_software)
-      list.add(software);
+    hashCode = hashCode * 8191 + ((isSetSoftware()) ? 131071 : 524287);
+    if (isSetSoftware())
+      hashCode = hashCode * 8191 + software.hashCode();
 
-    boolean present_isRestricted = true;
-    list.add(present_isRestricted);
-    if (present_isRestricted)
-      list.add(isRestricted);
+    hashCode = hashCode * 8191 + ((isRestricted) ? 131071 : 524287);
 
-    boolean present_createTime = true;
-    list.add(present_createTime);
-    if (present_createTime)
-      list.add(createTime);
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(createTime);
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -378,7 +345,7 @@ public class MasterSoftware implements org.apache.thrift.TBase<MasterSoftware, M
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetSoftware()).compareTo(other.isSetSoftware());
+    lastComparison = java.lang.Boolean.compare(isSetSoftware(), other.isSetSoftware());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -388,7 +355,7 @@ public class MasterSoftware implements org.apache.thrift.TBase<MasterSoftware, M
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetIsRestricted()).compareTo(other.isSetIsRestricted());
+    lastComparison = java.lang.Boolean.compare(isSetIsRestricted(), other.isSetIsRestricted());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -398,7 +365,7 @@ public class MasterSoftware implements org.apache.thrift.TBase<MasterSoftware, M
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetCreateTime()).compareTo(other.isSetCreateTime());
+    lastComparison = java.lang.Boolean.compare(isSetCreateTime(), other.isSetCreateTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -411,21 +378,22 @@ public class MasterSoftware implements org.apache.thrift.TBase<MasterSoftware, M
     return 0;
   }
 
+  @org.apache.thrift.annotation.Nullable
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("MasterSoftware(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("MasterSoftware(");
     boolean first = true;
 
     sb.append("software:");
@@ -460,7 +428,7 @@ public class MasterSoftware implements org.apache.thrift.TBase<MasterSoftware, M
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -470,13 +438,13 @@ public class MasterSoftware implements org.apache.thrift.TBase<MasterSoftware, M
     }
   }
 
-  private static class MasterSoftwareStandardSchemeFactory implements SchemeFactory {
+  private static class MasterSoftwareStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public MasterSoftwareStandardScheme getScheme() {
       return new MasterSoftwareStandardScheme();
     }
   }
 
-  private static class MasterSoftwareStandardScheme extends StandardScheme<MasterSoftware> {
+  private static class MasterSoftwareStandardScheme extends org.apache.thrift.scheme.StandardScheme<MasterSoftware> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, MasterSoftware struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -544,18 +512,18 @@ public class MasterSoftware implements org.apache.thrift.TBase<MasterSoftware, M
 
   }
 
-  private static class MasterSoftwareTupleSchemeFactory implements SchemeFactory {
+  private static class MasterSoftwareTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public MasterSoftwareTupleScheme getScheme() {
       return new MasterSoftwareTupleScheme();
     }
   }
 
-  private static class MasterSoftwareTupleScheme extends TupleScheme<MasterSoftware> {
+  private static class MasterSoftwareTupleScheme extends org.apache.thrift.scheme.TupleScheme<MasterSoftware> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, MasterSoftware struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetSoftware()) {
         optionals.set(0);
       }
@@ -579,8 +547,8 @@ public class MasterSoftware implements org.apache.thrift.TBase<MasterSoftware, M
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, MasterSoftware struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(3);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(3);
       if (incoming.get(0)) {
         struct.software = iprot.readString();
         struct.setSoftwareIsSet(true);
@@ -596,5 +564,8 @@ public class MasterSoftware implements org.apache.thrift.TBase<MasterSoftware, M
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/MasterTag.java b/src/main/java/org/openslx/bwlp/thrift/iface/MasterTag.java
index 962550b..ffcf8a7 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/MasterTag.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/MasterTag.java
@@ -1,53 +1,23 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.openslx.bwlp.thrift.iface;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
 public class MasterTag implements org.apache.thrift.TBase<MasterTag, MasterTag._Fields>, java.io.Serializable, Cloneable, Comparable<MasterTag> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("MasterTag");
 
   private static final org.apache.thrift.protocol.TField TAG_FIELD_DESC = new org.apache.thrift.protocol.TField("tag", org.apache.thrift.protocol.TType.STRING, (short)1);
   private static final org.apache.thrift.protocol.TField CREATE_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("createTime", org.apache.thrift.protocol.TType.I64, (short)2);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new MasterTagStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new MasterTagTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new MasterTagStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new MasterTagTupleSchemeFactory();
 
-  public String tag; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String tag; // required
   public long createTime; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@@ -55,10 +25,10 @@ public class MasterTag implements org.apache.thrift.TBase<MasterTag, MasterTag._
     TAG((short)1, "tag"),
     CREATE_TIME((short)2, "createTime");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -66,6 +36,7 @@ public class MasterTag implements org.apache.thrift.TBase<MasterTag, MasterTag._
     /**
      * Find the _Fields constant that matches fieldId, or null if its not found.
      */
+    @org.apache.thrift.annotation.Nullable
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
         case 1: // TAG
@@ -83,21 +54,22 @@ public class MasterTag implements org.apache.thrift.TBase<MasterTag, MasterTag._
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    @org.apache.thrift.annotation.Nullable
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -106,7 +78,7 @@ public class MasterTag implements org.apache.thrift.TBase<MasterTag, MasterTag._
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -114,14 +86,14 @@ public class MasterTag implements org.apache.thrift.TBase<MasterTag, MasterTag._
   // isset id assignments
   private static final int __CREATETIME_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.TAG, new org.apache.thrift.meta_data.FieldMetaData("tag", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.CREATE_TIME, new org.apache.thrift.meta_data.FieldMetaData("createTime", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64        , "UnixTimestamp")));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(MasterTag.class, metaDataMap);
   }
 
@@ -129,7 +101,7 @@ public class MasterTag implements org.apache.thrift.TBase<MasterTag, MasterTag._
   }
 
   public MasterTag(
-    String tag,
+    java.lang.String tag,
     long createTime)
   {
     this();
@@ -160,11 +132,12 @@ public class MasterTag implements org.apache.thrift.TBase<MasterTag, MasterTag._
     this.createTime = 0;
   }
 
-  public String getTag() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getTag() {
     return this.tag;
   }
 
-  public MasterTag setTag(String tag) {
+  public MasterTag setTag(@org.apache.thrift.annotation.Nullable java.lang.String tag) {
     this.tag = tag;
     return this;
   }
@@ -195,25 +168,25 @@ public class MasterTag implements org.apache.thrift.TBase<MasterTag, MasterTag._
   }
 
   public void unsetCreateTime() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __CREATETIME_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __CREATETIME_ISSET_ID);
   }
 
   /** Returns true if field createTime is set (has been assigned a value) and false otherwise */
   public boolean isSetCreateTime() {
-    return EncodingUtils.testBit(__isset_bitfield, __CREATETIME_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __CREATETIME_ISSET_ID);
   }
 
   public void setCreateTimeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __CREATETIME_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __CREATETIME_ISSET_ID, value);
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case TAG:
       if (value == null) {
         unsetTag();
       } else {
-        setTag((String)value);
+        setTag((java.lang.String)value);
       }
       break;
 
@@ -221,14 +194,15 @@ public class MasterTag implements org.apache.thrift.TBase<MasterTag, MasterTag._
       if (value == null) {
         unsetCreateTime();
       } else {
-        setCreateTime((Long)value);
+        setCreateTime((java.lang.Long)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case TAG:
       return getTag();
@@ -237,13 +211,13 @@ public class MasterTag implements org.apache.thrift.TBase<MasterTag, MasterTag._
       return getCreateTime();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -252,13 +226,11 @@ public class MasterTag implements org.apache.thrift.TBase<MasterTag, MasterTag._
     case CREATE_TIME:
       return isSetCreateTime();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
+  public boolean equals(java.lang.Object that) {
     if (that instanceof MasterTag)
       return this.equals((MasterTag)that);
     return false;
@@ -267,6 +239,8 @@ public class MasterTag implements org.apache.thrift.TBase<MasterTag, MasterTag._
   public boolean equals(MasterTag that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_tag = true && this.isSetTag();
     boolean that_present_tag = true && that.isSetTag();
@@ -291,19 +265,15 @@ public class MasterTag implements org.apache.thrift.TBase<MasterTag, MasterTag._
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_tag = true && (isSetTag());
-    list.add(present_tag);
-    if (present_tag)
-      list.add(tag);
+    hashCode = hashCode * 8191 + ((isSetTag()) ? 131071 : 524287);
+    if (isSetTag())
+      hashCode = hashCode * 8191 + tag.hashCode();
 
-    boolean present_createTime = true;
-    list.add(present_createTime);
-    if (present_createTime)
-      list.add(createTime);
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(createTime);
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -314,7 +284,7 @@ public class MasterTag implements org.apache.thrift.TBase<MasterTag, MasterTag._
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetTag()).compareTo(other.isSetTag());
+    lastComparison = java.lang.Boolean.compare(isSetTag(), other.isSetTag());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -324,7 +294,7 @@ public class MasterTag implements org.apache.thrift.TBase<MasterTag, MasterTag._
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetCreateTime()).compareTo(other.isSetCreateTime());
+    lastComparison = java.lang.Boolean.compare(isSetCreateTime(), other.isSetCreateTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -337,21 +307,22 @@ public class MasterTag implements org.apache.thrift.TBase<MasterTag, MasterTag._
     return 0;
   }
 
+  @org.apache.thrift.annotation.Nullable
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("MasterTag(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("MasterTag(");
     boolean first = true;
 
     sb.append("tag:");
@@ -382,7 +353,7 @@ public class MasterTag implements org.apache.thrift.TBase<MasterTag, MasterTag._
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -392,13 +363,13 @@ public class MasterTag implements org.apache.thrift.TBase<MasterTag, MasterTag._
     }
   }
 
-  private static class MasterTagStandardSchemeFactory implements SchemeFactory {
+  private static class MasterTagStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public MasterTagStandardScheme getScheme() {
       return new MasterTagStandardScheme();
     }
   }
 
-  private static class MasterTagStandardScheme extends StandardScheme<MasterTag> {
+  private static class MasterTagStandardScheme extends org.apache.thrift.scheme.StandardScheme<MasterTag> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, MasterTag struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -455,18 +426,18 @@ public class MasterTag implements org.apache.thrift.TBase<MasterTag, MasterTag._
 
   }
 
-  private static class MasterTagTupleSchemeFactory implements SchemeFactory {
+  private static class MasterTagTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public MasterTagTupleScheme getScheme() {
       return new MasterTagTupleScheme();
     }
   }
 
-  private static class MasterTagTupleScheme extends TupleScheme<MasterTag> {
+  private static class MasterTagTupleScheme extends org.apache.thrift.scheme.TupleScheme<MasterTag> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, MasterTag struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetTag()) {
         optionals.set(0);
       }
@@ -484,8 +455,8 @@ public class MasterTag implements org.apache.thrift.TBase<MasterTag, MasterTag._
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, MasterTag struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(2);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(2);
       if (incoming.get(0)) {
         struct.tag = iprot.readString();
         struct.setTagIsSet(true);
@@ -497,5 +468,8 @@ public class MasterTag implements org.apache.thrift.TBase<MasterTag, MasterTag._
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/NetDirection.java b/src/main/java/org/openslx/bwlp/thrift/iface/NetDirection.java
index ae22bfa..e777d20 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/NetDirection.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/NetDirection.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,10 +7,7 @@
 package org.openslx.bwlp.thrift.iface;
 
 
-import java.util.Map;
-import java.util.HashMap;
-import org.apache.thrift.TEnum;
-
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
 public enum NetDirection implements org.apache.thrift.TEnum {
   IN(0),
   OUT(1);
@@ -32,6 +29,7 @@ public enum NetDirection implements org.apache.thrift.TEnum {
    * Find a the enum type by its integer value, as defined in the Thrift IDL.
    * @return null if the value is not found.
    */
+  @org.apache.thrift.annotation.Nullable
   public static NetDirection findByValue(int value) { 
     switch (value) {
       case 0:
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/NetRule.java b/src/main/java/org/openslx/bwlp/thrift/iface/NetRule.java
index abc7486..ac82656 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/NetRule.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/NetRule.java
@@ -1,40 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.openslx.bwlp.thrift.iface;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2019-02-25")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
 public class NetRule implements org.apache.thrift.TBase<NetRule, NetRule._Fields>, java.io.Serializable, Cloneable, Comparable<NetRule> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NetRule");
 
@@ -42,18 +15,15 @@ public class NetRule implements org.apache.thrift.TBase<NetRule, NetRule._Fields
   private static final org.apache.thrift.protocol.TField HOST_FIELD_DESC = new org.apache.thrift.protocol.TField("host", org.apache.thrift.protocol.TType.STRING, (short)3);
   private static final org.apache.thrift.protocol.TField PORT_FIELD_DESC = new org.apache.thrift.protocol.TField("port", org.apache.thrift.protocol.TType.I32, (short)4);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new NetRuleStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new NetRuleTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new NetRuleStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new NetRuleTupleSchemeFactory();
 
   /**
    * 
    * @see NetDirection
    */
-  public NetDirection direction; // required
-  public String host; // required
+  public @org.apache.thrift.annotation.Nullable NetDirection direction; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String host; // required
   public int port; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@@ -66,10 +36,10 @@ public class NetRule implements org.apache.thrift.TBase<NetRule, NetRule._Fields
     HOST((short)3, "host"),
     PORT((short)4, "port");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -77,6 +47,7 @@ public class NetRule implements org.apache.thrift.TBase<NetRule, NetRule._Fields
     /**
      * Find the _Fields constant that matches fieldId, or null if its not found.
      */
+    @org.apache.thrift.annotation.Nullable
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
         case 2: // DIRECTION
@@ -96,21 +67,22 @@ public class NetRule implements org.apache.thrift.TBase<NetRule, NetRule._Fields
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    @org.apache.thrift.annotation.Nullable
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -119,7 +91,7 @@ public class NetRule implements org.apache.thrift.TBase<NetRule, NetRule._Fields
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -127,16 +99,16 @@ public class NetRule implements org.apache.thrift.TBase<NetRule, NetRule._Fields
   // isset id assignments
   private static final int __PORT_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.DIRECTION, new org.apache.thrift.meta_data.FieldMetaData("direction", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, NetDirection.class)));
     tmpMap.put(_Fields.HOST, new org.apache.thrift.meta_data.FieldMetaData("host", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.PORT, new org.apache.thrift.meta_data.FieldMetaData("port", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(NetRule.class, metaDataMap);
   }
 
@@ -145,7 +117,7 @@ public class NetRule implements org.apache.thrift.TBase<NetRule, NetRule._Fields
 
   public NetRule(
     NetDirection direction,
-    String host,
+    java.lang.String host,
     int port)
   {
     this();
@@ -185,6 +157,7 @@ public class NetRule implements org.apache.thrift.TBase<NetRule, NetRule._Fields
    * 
    * @see NetDirection
    */
+  @org.apache.thrift.annotation.Nullable
   public NetDirection getDirection() {
     return this.direction;
   }
@@ -193,7 +166,7 @@ public class NetRule implements org.apache.thrift.TBase<NetRule, NetRule._Fields
    * 
    * @see NetDirection
    */
-  public NetRule setDirection(NetDirection direction) {
+  public NetRule setDirection(@org.apache.thrift.annotation.Nullable NetDirection direction) {
     this.direction = direction;
     return this;
   }
@@ -213,11 +186,12 @@ public class NetRule implements org.apache.thrift.TBase<NetRule, NetRule._Fields
     }
   }
 
-  public String getHost() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getHost() {
     return this.host;
   }
 
-  public NetRule setHost(String host) {
+  public NetRule setHost(@org.apache.thrift.annotation.Nullable java.lang.String host) {
     this.host = host;
     return this;
   }
@@ -248,19 +222,19 @@ public class NetRule implements org.apache.thrift.TBase<NetRule, NetRule._Fields
   }
 
   public void unsetPort() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __PORT_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __PORT_ISSET_ID);
   }
 
   /** Returns true if field port is set (has been assigned a value) and false otherwise */
   public boolean isSetPort() {
-    return EncodingUtils.testBit(__isset_bitfield, __PORT_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __PORT_ISSET_ID);
   }
 
   public void setPortIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __PORT_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __PORT_ISSET_ID, value);
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case DIRECTION:
       if (value == null) {
@@ -274,7 +248,7 @@ public class NetRule implements org.apache.thrift.TBase<NetRule, NetRule._Fields
       if (value == null) {
         unsetHost();
       } else {
-        setHost((String)value);
+        setHost((java.lang.String)value);
       }
       break;
 
@@ -282,14 +256,15 @@ public class NetRule implements org.apache.thrift.TBase<NetRule, NetRule._Fields
       if (value == null) {
         unsetPort();
       } else {
-        setPort((Integer)value);
+        setPort((java.lang.Integer)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case DIRECTION:
       return getDirection();
@@ -301,13 +276,13 @@ public class NetRule implements org.apache.thrift.TBase<NetRule, NetRule._Fields
       return getPort();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -318,13 +293,11 @@ public class NetRule implements org.apache.thrift.TBase<NetRule, NetRule._Fields
     case PORT:
       return isSetPort();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
+  public boolean equals(java.lang.Object that) {
     if (that instanceof NetRule)
       return this.equals((NetRule)that);
     return false;
@@ -333,6 +306,8 @@ public class NetRule implements org.apache.thrift.TBase<NetRule, NetRule._Fields
   public boolean equals(NetRule that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_direction = true && this.isSetDirection();
     boolean that_present_direction = true && that.isSetDirection();
@@ -366,24 +341,19 @@ public class NetRule implements org.apache.thrift.TBase<NetRule, NetRule._Fields
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_direction = true && (isSetDirection());
-    list.add(present_direction);
-    if (present_direction)
-      list.add(direction.getValue());
+    hashCode = hashCode * 8191 + ((isSetDirection()) ? 131071 : 524287);
+    if (isSetDirection())
+      hashCode = hashCode * 8191 + direction.getValue();
 
-    boolean present_host = true && (isSetHost());
-    list.add(present_host);
-    if (present_host)
-      list.add(host);
+    hashCode = hashCode * 8191 + ((isSetHost()) ? 131071 : 524287);
+    if (isSetHost())
+      hashCode = hashCode * 8191 + host.hashCode();
 
-    boolean present_port = true;
-    list.add(present_port);
-    if (present_port)
-      list.add(port);
+    hashCode = hashCode * 8191 + port;
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -394,7 +364,7 @@ public class NetRule implements org.apache.thrift.TBase<NetRule, NetRule._Fields
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetDirection()).compareTo(other.isSetDirection());
+    lastComparison = java.lang.Boolean.compare(isSetDirection(), other.isSetDirection());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -404,7 +374,7 @@ public class NetRule implements org.apache.thrift.TBase<NetRule, NetRule._Fields
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetHost()).compareTo(other.isSetHost());
+    lastComparison = java.lang.Boolean.compare(isSetHost(), other.isSetHost());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -414,7 +384,7 @@ public class NetRule implements org.apache.thrift.TBase<NetRule, NetRule._Fields
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetPort()).compareTo(other.isSetPort());
+    lastComparison = java.lang.Boolean.compare(isSetPort(), other.isSetPort());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -427,21 +397,22 @@ public class NetRule implements org.apache.thrift.TBase<NetRule, NetRule._Fields
     return 0;
   }
 
+  @org.apache.thrift.annotation.Nullable
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("NetRule(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("NetRule(");
     boolean first = true;
 
     sb.append("direction:");
@@ -480,7 +451,7 @@ public class NetRule implements org.apache.thrift.TBase<NetRule, NetRule._Fields
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -490,13 +461,13 @@ public class NetRule implements org.apache.thrift.TBase<NetRule, NetRule._Fields
     }
   }
 
-  private static class NetRuleStandardSchemeFactory implements SchemeFactory {
+  private static class NetRuleStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public NetRuleStandardScheme getScheme() {
       return new NetRuleStandardScheme();
     }
   }
 
-  private static class NetRuleStandardScheme extends StandardScheme<NetRule> {
+  private static class NetRuleStandardScheme extends org.apache.thrift.scheme.StandardScheme<NetRule> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, NetRule struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -566,18 +537,18 @@ public class NetRule implements org.apache.thrift.TBase<NetRule, NetRule._Fields
 
   }
 
-  private static class NetRuleTupleSchemeFactory implements SchemeFactory {
+  private static class NetRuleTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public NetRuleTupleScheme getScheme() {
       return new NetRuleTupleScheme();
     }
   }
 
-  private static class NetRuleTupleScheme extends TupleScheme<NetRule> {
+  private static class NetRuleTupleScheme extends org.apache.thrift.scheme.TupleScheme<NetRule> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, NetRule struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetDirection()) {
         optionals.set(0);
       }
@@ -601,8 +572,8 @@ public class NetRule implements org.apache.thrift.TBase<NetRule, NetRule._Fields
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, NetRule struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(3);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(3);
       if (incoming.get(0)) {
         struct.direction = org.openslx.bwlp.thrift.iface.NetDirection.findByValue(iprot.readI32());
         struct.setDirectionIsSet(true);
@@ -618,5 +589,8 @@ public class NetRule implements org.apache.thrift.TBase<NetRule, NetRule._Fields
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/NetShare.java b/src/main/java/org/openslx/bwlp/thrift/iface/NetShare.java
index df1d0c4..19205a0 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/NetShare.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/NetShare.java
@@ -1,40 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.openslx.bwlp.thrift.iface;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2018-11-23")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
 public class NetShare implements org.apache.thrift.TBase<NetShare, NetShare._Fields>, java.io.Serializable, Cloneable, Comparable<NetShare> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("NetShare");
 
@@ -46,22 +19,19 @@ public class NetShare implements org.apache.thrift.TBase<NetShare, NetShare._Fie
   private static final org.apache.thrift.protocol.TField PASSWORD_FIELD_DESC = new org.apache.thrift.protocol.TField("password", org.apache.thrift.protocol.TType.STRING, (short)3);
   private static final org.apache.thrift.protocol.TField SHARE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("shareId", org.apache.thrift.protocol.TType.I32, (short)7);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new NetShareStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new NetShareTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new NetShareStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new NetShareTupleSchemeFactory();
 
   /**
    * 
    * @see NetShareAuth
    */
-  public NetShareAuth auth; // required
-  public String path; // required
-  public String displayname; // optional
-  public String mountpoint; // optional
-  public String username; // optional
-  public String password; // optional
+  public @org.apache.thrift.annotation.Nullable NetShareAuth auth; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String path; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String displayname; // optional
+  public @org.apache.thrift.annotation.Nullable java.lang.String mountpoint; // optional
+  public @org.apache.thrift.annotation.Nullable java.lang.String username; // optional
+  public @org.apache.thrift.annotation.Nullable java.lang.String password; // optional
   public int shareId; // optional
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@@ -78,10 +48,10 @@ public class NetShare implements org.apache.thrift.TBase<NetShare, NetShare._Fie
     PASSWORD((short)3, "password"),
     SHARE_ID((short)7, "shareId");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -89,6 +59,7 @@ public class NetShare implements org.apache.thrift.TBase<NetShare, NetShare._Fie
     /**
      * Find the _Fields constant that matches fieldId, or null if its not found.
      */
+    @org.apache.thrift.annotation.Nullable
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
         case 4: // AUTH
@@ -116,21 +87,22 @@ public class NetShare implements org.apache.thrift.TBase<NetShare, NetShare._Fie
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    @org.apache.thrift.annotation.Nullable
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -139,7 +111,7 @@ public class NetShare implements org.apache.thrift.TBase<NetShare, NetShare._Fie
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -148,9 +120,9 @@ public class NetShare implements org.apache.thrift.TBase<NetShare, NetShare._Fie
   private static final int __SHAREID_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.DISPLAYNAME,_Fields.MOUNTPOINT,_Fields.USERNAME,_Fields.PASSWORD,_Fields.SHARE_ID};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.AUTH, new org.apache.thrift.meta_data.FieldMetaData("auth", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, NetShareAuth.class)));
     tmpMap.put(_Fields.PATH, new org.apache.thrift.meta_data.FieldMetaData("path", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -165,7 +137,7 @@ public class NetShare implements org.apache.thrift.TBase<NetShare, NetShare._Fie
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.SHARE_ID, new org.apache.thrift.meta_data.FieldMetaData("shareId", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(NetShare.class, metaDataMap);
   }
 
@@ -174,7 +146,7 @@ public class NetShare implements org.apache.thrift.TBase<NetShare, NetShare._Fie
 
   public NetShare(
     NetShareAuth auth,
-    String path)
+    java.lang.String path)
   {
     this();
     this.auth = auth;
@@ -227,6 +199,7 @@ public class NetShare implements org.apache.thrift.TBase<NetShare, NetShare._Fie
    * 
    * @see NetShareAuth
    */
+  @org.apache.thrift.annotation.Nullable
   public NetShareAuth getAuth() {
     return this.auth;
   }
@@ -235,7 +208,7 @@ public class NetShare implements org.apache.thrift.TBase<NetShare, NetShare._Fie
    * 
    * @see NetShareAuth
    */
-  public NetShare setAuth(NetShareAuth auth) {
+  public NetShare setAuth(@org.apache.thrift.annotation.Nullable NetShareAuth auth) {
     this.auth = auth;
     return this;
   }
@@ -255,11 +228,12 @@ public class NetShare implements org.apache.thrift.TBase<NetShare, NetShare._Fie
     }
   }
 
-  public String getPath() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getPath() {
     return this.path;
   }
 
-  public NetShare setPath(String path) {
+  public NetShare setPath(@org.apache.thrift.annotation.Nullable java.lang.String path) {
     this.path = path;
     return this;
   }
@@ -279,11 +253,12 @@ public class NetShare implements org.apache.thrift.TBase<NetShare, NetShare._Fie
     }
   }
 
-  public String getDisplayname() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getDisplayname() {
     return this.displayname;
   }
 
-  public NetShare setDisplayname(String displayname) {
+  public NetShare setDisplayname(@org.apache.thrift.annotation.Nullable java.lang.String displayname) {
     this.displayname = displayname;
     return this;
   }
@@ -303,11 +278,12 @@ public class NetShare implements org.apache.thrift.TBase<NetShare, NetShare._Fie
     }
   }
 
-  public String getMountpoint() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getMountpoint() {
     return this.mountpoint;
   }
 
-  public NetShare setMountpoint(String mountpoint) {
+  public NetShare setMountpoint(@org.apache.thrift.annotation.Nullable java.lang.String mountpoint) {
     this.mountpoint = mountpoint;
     return this;
   }
@@ -327,11 +303,12 @@ public class NetShare implements org.apache.thrift.TBase<NetShare, NetShare._Fie
     }
   }
 
-  public String getUsername() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getUsername() {
     return this.username;
   }
 
-  public NetShare setUsername(String username) {
+  public NetShare setUsername(@org.apache.thrift.annotation.Nullable java.lang.String username) {
     this.username = username;
     return this;
   }
@@ -351,11 +328,12 @@ public class NetShare implements org.apache.thrift.TBase<NetShare, NetShare._Fie
     }
   }
 
-  public String getPassword() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getPassword() {
     return this.password;
   }
 
-  public NetShare setPassword(String password) {
+  public NetShare setPassword(@org.apache.thrift.annotation.Nullable java.lang.String password) {
     this.password = password;
     return this;
   }
@@ -386,19 +364,19 @@ public class NetShare implements org.apache.thrift.TBase<NetShare, NetShare._Fie
   }
 
   public void unsetShareId() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SHAREID_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SHAREID_ISSET_ID);
   }
 
   /** Returns true if field shareId is set (has been assigned a value) and false otherwise */
   public boolean isSetShareId() {
-    return EncodingUtils.testBit(__isset_bitfield, __SHAREID_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SHAREID_ISSET_ID);
   }
 
   public void setShareIdIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SHAREID_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SHAREID_ISSET_ID, value);
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case AUTH:
       if (value == null) {
@@ -412,7 +390,7 @@ public class NetShare implements org.apache.thrift.TBase<NetShare, NetShare._Fie
       if (value == null) {
         unsetPath();
       } else {
-        setPath((String)value);
+        setPath((java.lang.String)value);
       }
       break;
 
@@ -420,7 +398,7 @@ public class NetShare implements org.apache.thrift.TBase<NetShare, NetShare._Fie
       if (value == null) {
         unsetDisplayname();
       } else {
-        setDisplayname((String)value);
+        setDisplayname((java.lang.String)value);
       }
       break;
 
@@ -428,7 +406,7 @@ public class NetShare implements org.apache.thrift.TBase<NetShare, NetShare._Fie
       if (value == null) {
         unsetMountpoint();
       } else {
-        setMountpoint((String)value);
+        setMountpoint((java.lang.String)value);
       }
       break;
 
@@ -436,7 +414,7 @@ public class NetShare implements org.apache.thrift.TBase<NetShare, NetShare._Fie
       if (value == null) {
         unsetUsername();
       } else {
-        setUsername((String)value);
+        setUsername((java.lang.String)value);
       }
       break;
 
@@ -444,7 +422,7 @@ public class NetShare implements org.apache.thrift.TBase<NetShare, NetShare._Fie
       if (value == null) {
         unsetPassword();
       } else {
-        setPassword((String)value);
+        setPassword((java.lang.String)value);
       }
       break;
 
@@ -452,14 +430,15 @@ public class NetShare implements org.apache.thrift.TBase<NetShare, NetShare._Fie
       if (value == null) {
         unsetShareId();
       } else {
-        setShareId((Integer)value);
+        setShareId((java.lang.Integer)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case AUTH:
       return getAuth();
@@ -483,13 +462,13 @@ public class NetShare implements org.apache.thrift.TBase<NetShare, NetShare._Fie
       return getShareId();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -508,13 +487,11 @@ public class NetShare implements org.apache.thrift.TBase<NetShare, NetShare._Fie
     case SHARE_ID:
       return isSetShareId();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
+  public boolean equals(java.lang.Object that) {
     if (that instanceof NetShare)
       return this.equals((NetShare)that);
     return false;
@@ -523,6 +500,8 @@ public class NetShare implements org.apache.thrift.TBase<NetShare, NetShare._Fie
   public boolean equals(NetShare that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_auth = true && this.isSetAuth();
     boolean that_present_auth = true && that.isSetAuth();
@@ -592,44 +571,37 @@ public class NetShare implements org.apache.thrift.TBase<NetShare, NetShare._Fie
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_auth = true && (isSetAuth());
-    list.add(present_auth);
-    if (present_auth)
-      list.add(auth.getValue());
-
-    boolean present_path = true && (isSetPath());
-    list.add(present_path);
-    if (present_path)
-      list.add(path);
-
-    boolean present_displayname = true && (isSetDisplayname());
-    list.add(present_displayname);
-    if (present_displayname)
-      list.add(displayname);
-
-    boolean present_mountpoint = true && (isSetMountpoint());
-    list.add(present_mountpoint);
-    if (present_mountpoint)
-      list.add(mountpoint);
-
-    boolean present_username = true && (isSetUsername());
-    list.add(present_username);
-    if (present_username)
-      list.add(username);
-
-    boolean present_password = true && (isSetPassword());
-    list.add(present_password);
-    if (present_password)
-      list.add(password);
-
-    boolean present_shareId = true && (isSetShareId());
-    list.add(present_shareId);
-    if (present_shareId)
-      list.add(shareId);
-
-    return list.hashCode();
+    int hashCode = 1;
+
+    hashCode = hashCode * 8191 + ((isSetAuth()) ? 131071 : 524287);
+    if (isSetAuth())
+      hashCode = hashCode * 8191 + auth.getValue();
+
+    hashCode = hashCode * 8191 + ((isSetPath()) ? 131071 : 524287);
+    if (isSetPath())
+      hashCode = hashCode * 8191 + path.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetDisplayname()) ? 131071 : 524287);
+    if (isSetDisplayname())
+      hashCode = hashCode * 8191 + displayname.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetMountpoint()) ? 131071 : 524287);
+    if (isSetMountpoint())
+      hashCode = hashCode * 8191 + mountpoint.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetUsername()) ? 131071 : 524287);
+    if (isSetUsername())
+      hashCode = hashCode * 8191 + username.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetPassword()) ? 131071 : 524287);
+    if (isSetPassword())
+      hashCode = hashCode * 8191 + password.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetShareId()) ? 131071 : 524287);
+    if (isSetShareId())
+      hashCode = hashCode * 8191 + shareId;
+
+    return hashCode;
   }
 
   @Override
@@ -640,7 +612,7 @@ public class NetShare implements org.apache.thrift.TBase<NetShare, NetShare._Fie
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetAuth()).compareTo(other.isSetAuth());
+    lastComparison = java.lang.Boolean.compare(isSetAuth(), other.isSetAuth());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -650,7 +622,7 @@ public class NetShare implements org.apache.thrift.TBase<NetShare, NetShare._Fie
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetPath()).compareTo(other.isSetPath());
+    lastComparison = java.lang.Boolean.compare(isSetPath(), other.isSetPath());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -660,7 +632,7 @@ public class NetShare implements org.apache.thrift.TBase<NetShare, NetShare._Fie
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetDisplayname()).compareTo(other.isSetDisplayname());
+    lastComparison = java.lang.Boolean.compare(isSetDisplayname(), other.isSetDisplayname());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -670,7 +642,7 @@ public class NetShare implements org.apache.thrift.TBase<NetShare, NetShare._Fie
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMountpoint()).compareTo(other.isSetMountpoint());
+    lastComparison = java.lang.Boolean.compare(isSetMountpoint(), other.isSetMountpoint());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -680,7 +652,7 @@ public class NetShare implements org.apache.thrift.TBase<NetShare, NetShare._Fie
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetUsername()).compareTo(other.isSetUsername());
+    lastComparison = java.lang.Boolean.compare(isSetUsername(), other.isSetUsername());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -690,7 +662,7 @@ public class NetShare implements org.apache.thrift.TBase<NetShare, NetShare._Fie
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetPassword()).compareTo(other.isSetPassword());
+    lastComparison = java.lang.Boolean.compare(isSetPassword(), other.isSetPassword());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -700,7 +672,7 @@ public class NetShare implements org.apache.thrift.TBase<NetShare, NetShare._Fie
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetShareId()).compareTo(other.isSetShareId());
+    lastComparison = java.lang.Boolean.compare(isSetShareId(), other.isSetShareId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -713,21 +685,22 @@ public class NetShare implements org.apache.thrift.TBase<NetShare, NetShare._Fie
     return 0;
   }
 
+  @org.apache.thrift.annotation.Nullable
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("NetShare(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("NetShare(");
     boolean first = true;
 
     sb.append("auth:");
@@ -808,7 +781,7 @@ public class NetShare implements org.apache.thrift.TBase<NetShare, NetShare._Fie
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -818,13 +791,13 @@ public class NetShare implements org.apache.thrift.TBase<NetShare, NetShare._Fie
     }
   }
 
-  private static class NetShareStandardSchemeFactory implements SchemeFactory {
+  private static class NetShareStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public NetShareStandardScheme getScheme() {
       return new NetShareStandardScheme();
     }
   }
 
-  private static class NetShareStandardScheme extends StandardScheme<NetShare> {
+  private static class NetShareStandardScheme extends org.apache.thrift.scheme.StandardScheme<NetShare> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, NetShare struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -956,18 +929,18 @@ public class NetShare implements org.apache.thrift.TBase<NetShare, NetShare._Fie
 
   }
 
-  private static class NetShareTupleSchemeFactory implements SchemeFactory {
+  private static class NetShareTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public NetShareTupleScheme getScheme() {
       return new NetShareTupleScheme();
     }
   }
 
-  private static class NetShareTupleScheme extends TupleScheme<NetShare> {
+  private static class NetShareTupleScheme extends org.apache.thrift.scheme.TupleScheme<NetShare> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, NetShare struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetAuth()) {
         optionals.set(0);
       }
@@ -1015,8 +988,8 @@ public class NetShare implements org.apache.thrift.TBase<NetShare, NetShare._Fie
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, NetShare struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(7);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(7);
       if (incoming.get(0)) {
         struct.auth = org.openslx.bwlp.thrift.iface.NetShareAuth.findByValue(iprot.readI32());
         struct.setAuthIsSet(true);
@@ -1048,5 +1021,8 @@ public class NetShare implements org.apache.thrift.TBase<NetShare, NetShare._Fie
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/NetShareAuth.java b/src/main/java/org/openslx/bwlp/thrift/iface/NetShareAuth.java
index cc7b4e9..636b448 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/NetShareAuth.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/NetShareAuth.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,10 +7,7 @@
 package org.openslx.bwlp.thrift.iface;
 
 
-import java.util.Map;
-import java.util.HashMap;
-import org.apache.thrift.TEnum;
-
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
 public enum NetShareAuth implements org.apache.thrift.TEnum {
   LOGIN_USER(0),
   OTHER_USER(1);
@@ -32,6 +29,7 @@ public enum NetShareAuth implements org.apache.thrift.TEnum {
    * Find a the enum type by its integer value, as defined in the Thrift IDL.
    * @return null if the value is not found.
    */
+  @org.apache.thrift.annotation.Nullable
   public static NetShareAuth findByValue(int value) { 
     switch (value) {
       case 0:
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/OperatingSystem.java b/src/main/java/org/openslx/bwlp/thrift/iface/OperatingSystem.java
index 364ad03..fc1e577 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/OperatingSystem.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/OperatingSystem.java
@@ -1,40 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.openslx.bwlp.thrift.iface;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
 public class OperatingSystem implements org.apache.thrift.TBase<OperatingSystem, OperatingSystem._Fields>, java.io.Serializable, Cloneable, Comparable<OperatingSystem> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("OperatingSystem");
 
@@ -45,16 +18,13 @@ public class OperatingSystem implements org.apache.thrift.TBase<OperatingSystem,
   private static final org.apache.thrift.protocol.TField MAX_MEM_MB_FIELD_DESC = new org.apache.thrift.protocol.TField("maxMemMb", org.apache.thrift.protocol.TType.I32, (short)5);
   private static final org.apache.thrift.protocol.TField MAX_CORES_FIELD_DESC = new org.apache.thrift.protocol.TField("maxCores", org.apache.thrift.protocol.TType.I32, (short)6);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new OperatingSystemStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new OperatingSystemTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new OperatingSystemStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new OperatingSystemTupleSchemeFactory();
 
   public int osId; // required
-  public String osName; // required
-  public Map<String,String> virtualizerOsId; // required
-  public String architecture; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String osName; // required
+  public @org.apache.thrift.annotation.Nullable java.util.Map<java.lang.String,java.lang.String> virtualizerOsId; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String architecture; // required
   public int maxMemMb; // required
   public int maxCores; // required
 
@@ -67,10 +37,10 @@ public class OperatingSystem implements org.apache.thrift.TBase<OperatingSystem,
     MAX_MEM_MB((short)5, "maxMemMb"),
     MAX_CORES((short)6, "maxCores");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -78,6 +48,7 @@ public class OperatingSystem implements org.apache.thrift.TBase<OperatingSystem,
     /**
      * Find the _Fields constant that matches fieldId, or null if its not found.
      */
+    @org.apache.thrift.annotation.Nullable
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
         case 1: // OS_ID
@@ -103,21 +74,22 @@ public class OperatingSystem implements org.apache.thrift.TBase<OperatingSystem,
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    @org.apache.thrift.annotation.Nullable
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -126,7 +98,7 @@ public class OperatingSystem implements org.apache.thrift.TBase<OperatingSystem,
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -136,9 +108,9 @@ public class OperatingSystem implements org.apache.thrift.TBase<OperatingSystem,
   private static final int __MAXMEMMB_ISSET_ID = 1;
   private static final int __MAXCORES_ISSET_ID = 2;
   private byte __isset_bitfield = 0;
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.OS_ID, new org.apache.thrift.meta_data.FieldMetaData("osId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
     tmpMap.put(_Fields.OS_NAME, new org.apache.thrift.meta_data.FieldMetaData("osName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -153,7 +125,7 @@ public class OperatingSystem implements org.apache.thrift.TBase<OperatingSystem,
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
     tmpMap.put(_Fields.MAX_CORES, new org.apache.thrift.meta_data.FieldMetaData("maxCores", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(OperatingSystem.class, metaDataMap);
   }
 
@@ -162,9 +134,9 @@ public class OperatingSystem implements org.apache.thrift.TBase<OperatingSystem,
 
   public OperatingSystem(
     int osId,
-    String osName,
-    Map<String,String> virtualizerOsId,
-    String architecture,
+    java.lang.String osName,
+    java.util.Map<java.lang.String,java.lang.String> virtualizerOsId,
+    java.lang.String architecture,
     int maxMemMb,
     int maxCores)
   {
@@ -190,7 +162,7 @@ public class OperatingSystem implements org.apache.thrift.TBase<OperatingSystem,
       this.osName = other.osName;
     }
     if (other.isSetVirtualizerOsId()) {
-      Map<String,String> __this__virtualizerOsId = new HashMap<String,String>(other.virtualizerOsId);
+      java.util.Map<java.lang.String,java.lang.String> __this__virtualizerOsId = new java.util.HashMap<java.lang.String,java.lang.String>(other.virtualizerOsId);
       this.virtualizerOsId = __this__virtualizerOsId;
     }
     if (other.isSetArchitecture()) {
@@ -228,23 +200,24 @@ public class OperatingSystem implements org.apache.thrift.TBase<OperatingSystem,
   }
 
   public void unsetOsId() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __OSID_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __OSID_ISSET_ID);
   }
 
   /** Returns true if field osId is set (has been assigned a value) and false otherwise */
   public boolean isSetOsId() {
-    return EncodingUtils.testBit(__isset_bitfield, __OSID_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __OSID_ISSET_ID);
   }
 
   public void setOsIdIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __OSID_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __OSID_ISSET_ID, value);
   }
 
-  public String getOsName() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getOsName() {
     return this.osName;
   }
 
-  public OperatingSystem setOsName(String osName) {
+  public OperatingSystem setOsName(@org.apache.thrift.annotation.Nullable java.lang.String osName) {
     this.osName = osName;
     return this;
   }
@@ -268,18 +241,19 @@ public class OperatingSystem implements org.apache.thrift.TBase<OperatingSystem,
     return (this.virtualizerOsId == null) ? 0 : this.virtualizerOsId.size();
   }
 
-  public void putToVirtualizerOsId(String key, String val) {
+  public void putToVirtualizerOsId(java.lang.String key, java.lang.String val) {
     if (this.virtualizerOsId == null) {
-      this.virtualizerOsId = new HashMap<String,String>();
+      this.virtualizerOsId = new java.util.HashMap<java.lang.String,java.lang.String>();
     }
     this.virtualizerOsId.put(key, val);
   }
 
-  public Map<String,String> getVirtualizerOsId() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.Map<java.lang.String,java.lang.String> getVirtualizerOsId() {
     return this.virtualizerOsId;
   }
 
-  public OperatingSystem setVirtualizerOsId(Map<String,String> virtualizerOsId) {
+  public OperatingSystem setVirtualizerOsId(@org.apache.thrift.annotation.Nullable java.util.Map<java.lang.String,java.lang.String> virtualizerOsId) {
     this.virtualizerOsId = virtualizerOsId;
     return this;
   }
@@ -299,11 +273,12 @@ public class OperatingSystem implements org.apache.thrift.TBase<OperatingSystem,
     }
   }
 
-  public String getArchitecture() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getArchitecture() {
     return this.architecture;
   }
 
-  public OperatingSystem setArchitecture(String architecture) {
+  public OperatingSystem setArchitecture(@org.apache.thrift.annotation.Nullable java.lang.String architecture) {
     this.architecture = architecture;
     return this;
   }
@@ -334,16 +309,16 @@ public class OperatingSystem implements org.apache.thrift.TBase<OperatingSystem,
   }
 
   public void unsetMaxMemMb() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __MAXMEMMB_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __MAXMEMMB_ISSET_ID);
   }
 
   /** Returns true if field maxMemMb is set (has been assigned a value) and false otherwise */
   public boolean isSetMaxMemMb() {
-    return EncodingUtils.testBit(__isset_bitfield, __MAXMEMMB_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __MAXMEMMB_ISSET_ID);
   }
 
   public void setMaxMemMbIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __MAXMEMMB_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __MAXMEMMB_ISSET_ID, value);
   }
 
   public int getMaxCores() {
@@ -357,25 +332,25 @@ public class OperatingSystem implements org.apache.thrift.TBase<OperatingSystem,
   }
 
   public void unsetMaxCores() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __MAXCORES_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __MAXCORES_ISSET_ID);
   }
 
   /** Returns true if field maxCores is set (has been assigned a value) and false otherwise */
   public boolean isSetMaxCores() {
-    return EncodingUtils.testBit(__isset_bitfield, __MAXCORES_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __MAXCORES_ISSET_ID);
   }
 
   public void setMaxCoresIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __MAXCORES_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __MAXCORES_ISSET_ID, value);
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case OS_ID:
       if (value == null) {
         unsetOsId();
       } else {
-        setOsId((Integer)value);
+        setOsId((java.lang.Integer)value);
       }
       break;
 
@@ -383,7 +358,7 @@ public class OperatingSystem implements org.apache.thrift.TBase<OperatingSystem,
       if (value == null) {
         unsetOsName();
       } else {
-        setOsName((String)value);
+        setOsName((java.lang.String)value);
       }
       break;
 
@@ -391,7 +366,7 @@ public class OperatingSystem implements org.apache.thrift.TBase<OperatingSystem,
       if (value == null) {
         unsetVirtualizerOsId();
       } else {
-        setVirtualizerOsId((Map<String,String>)value);
+        setVirtualizerOsId((java.util.Map<java.lang.String,java.lang.String>)value);
       }
       break;
 
@@ -399,7 +374,7 @@ public class OperatingSystem implements org.apache.thrift.TBase<OperatingSystem,
       if (value == null) {
         unsetArchitecture();
       } else {
-        setArchitecture((String)value);
+        setArchitecture((java.lang.String)value);
       }
       break;
 
@@ -407,7 +382,7 @@ public class OperatingSystem implements org.apache.thrift.TBase<OperatingSystem,
       if (value == null) {
         unsetMaxMemMb();
       } else {
-        setMaxMemMb((Integer)value);
+        setMaxMemMb((java.lang.Integer)value);
       }
       break;
 
@@ -415,14 +390,15 @@ public class OperatingSystem implements org.apache.thrift.TBase<OperatingSystem,
       if (value == null) {
         unsetMaxCores();
       } else {
-        setMaxCores((Integer)value);
+        setMaxCores((java.lang.Integer)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case OS_ID:
       return getOsId();
@@ -443,13 +419,13 @@ public class OperatingSystem implements org.apache.thrift.TBase<OperatingSystem,
       return getMaxCores();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -466,13 +442,11 @@ public class OperatingSystem implements org.apache.thrift.TBase<OperatingSystem,
     case MAX_CORES:
       return isSetMaxCores();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
+  public boolean equals(java.lang.Object that) {
     if (that instanceof OperatingSystem)
       return this.equals((OperatingSystem)that);
     return false;
@@ -481,6 +455,8 @@ public class OperatingSystem implements org.apache.thrift.TBase<OperatingSystem,
   public boolean equals(OperatingSystem that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_osId = true;
     boolean that_present_osId = true;
@@ -541,39 +517,27 @@ public class OperatingSystem implements org.apache.thrift.TBase<OperatingSystem,
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_osId = true;
-    list.add(present_osId);
-    if (present_osId)
-      list.add(osId);
+    hashCode = hashCode * 8191 + osId;
 
-    boolean present_osName = true && (isSetOsName());
-    list.add(present_osName);
-    if (present_osName)
-      list.add(osName);
+    hashCode = hashCode * 8191 + ((isSetOsName()) ? 131071 : 524287);
+    if (isSetOsName())
+      hashCode = hashCode * 8191 + osName.hashCode();
 
-    boolean present_virtualizerOsId = true && (isSetVirtualizerOsId());
-    list.add(present_virtualizerOsId);
-    if (present_virtualizerOsId)
-      list.add(virtualizerOsId);
+    hashCode = hashCode * 8191 + ((isSetVirtualizerOsId()) ? 131071 : 524287);
+    if (isSetVirtualizerOsId())
+      hashCode = hashCode * 8191 + virtualizerOsId.hashCode();
 
-    boolean present_architecture = true && (isSetArchitecture());
-    list.add(present_architecture);
-    if (present_architecture)
-      list.add(architecture);
+    hashCode = hashCode * 8191 + ((isSetArchitecture()) ? 131071 : 524287);
+    if (isSetArchitecture())
+      hashCode = hashCode * 8191 + architecture.hashCode();
 
-    boolean present_maxMemMb = true;
-    list.add(present_maxMemMb);
-    if (present_maxMemMb)
-      list.add(maxMemMb);
+    hashCode = hashCode * 8191 + maxMemMb;
 
-    boolean present_maxCores = true;
-    list.add(present_maxCores);
-    if (present_maxCores)
-      list.add(maxCores);
+    hashCode = hashCode * 8191 + maxCores;
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -584,7 +548,7 @@ public class OperatingSystem implements org.apache.thrift.TBase<OperatingSystem,
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetOsId()).compareTo(other.isSetOsId());
+    lastComparison = java.lang.Boolean.compare(isSetOsId(), other.isSetOsId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -594,7 +558,7 @@ public class OperatingSystem implements org.apache.thrift.TBase<OperatingSystem,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetOsName()).compareTo(other.isSetOsName());
+    lastComparison = java.lang.Boolean.compare(isSetOsName(), other.isSetOsName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -604,7 +568,7 @@ public class OperatingSystem implements org.apache.thrift.TBase<OperatingSystem,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetVirtualizerOsId()).compareTo(other.isSetVirtualizerOsId());
+    lastComparison = java.lang.Boolean.compare(isSetVirtualizerOsId(), other.isSetVirtualizerOsId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -614,7 +578,7 @@ public class OperatingSystem implements org.apache.thrift.TBase<OperatingSystem,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetArchitecture()).compareTo(other.isSetArchitecture());
+    lastComparison = java.lang.Boolean.compare(isSetArchitecture(), other.isSetArchitecture());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -624,7 +588,7 @@ public class OperatingSystem implements org.apache.thrift.TBase<OperatingSystem,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMaxMemMb()).compareTo(other.isSetMaxMemMb());
+    lastComparison = java.lang.Boolean.compare(isSetMaxMemMb(), other.isSetMaxMemMb());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -634,7 +598,7 @@ public class OperatingSystem implements org.apache.thrift.TBase<OperatingSystem,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMaxCores()).compareTo(other.isSetMaxCores());
+    lastComparison = java.lang.Boolean.compare(isSetMaxCores(), other.isSetMaxCores());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -647,21 +611,22 @@ public class OperatingSystem implements org.apache.thrift.TBase<OperatingSystem,
     return 0;
   }
 
+  @org.apache.thrift.annotation.Nullable
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("OperatingSystem(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("OperatingSystem(");
     boolean first = true;
 
     sb.append("osId:");
@@ -716,7 +681,7 @@ public class OperatingSystem implements org.apache.thrift.TBase<OperatingSystem,
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -726,13 +691,13 @@ public class OperatingSystem implements org.apache.thrift.TBase<OperatingSystem,
     }
   }
 
-  private static class OperatingSystemStandardSchemeFactory implements SchemeFactory {
+  private static class OperatingSystemStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public OperatingSystemStandardScheme getScheme() {
       return new OperatingSystemStandardScheme();
     }
   }
 
-  private static class OperatingSystemStandardScheme extends StandardScheme<OperatingSystem> {
+  private static class OperatingSystemStandardScheme extends org.apache.thrift.scheme.StandardScheme<OperatingSystem> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, OperatingSystem struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -764,9 +729,9 @@ public class OperatingSystem implements org.apache.thrift.TBase<OperatingSystem,
             if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
               {
                 org.apache.thrift.protocol.TMap _map24 = iprot.readMapBegin();
-                struct.virtualizerOsId = new HashMap<String,String>(2*_map24.size);
-                String _key25;
-                String _val26;
+                struct.virtualizerOsId = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map24.size);
+                @org.apache.thrift.annotation.Nullable java.lang.String _key25;
+                @org.apache.thrift.annotation.Nullable java.lang.String _val26;
                 for (int _i27 = 0; _i27 < _map24.size; ++_i27)
                 {
                   _key25 = iprot.readString();
@@ -831,7 +796,7 @@ public class OperatingSystem implements org.apache.thrift.TBase<OperatingSystem,
         oprot.writeFieldBegin(VIRTUALIZER_OS_ID_FIELD_DESC);
         {
           oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.virtualizerOsId.size()));
-          for (Map.Entry<String, String> _iter28 : struct.virtualizerOsId.entrySet())
+          for (java.util.Map.Entry<java.lang.String, java.lang.String> _iter28 : struct.virtualizerOsId.entrySet())
           {
             oprot.writeString(_iter28.getKey());
             oprot.writeString(_iter28.getValue());
@@ -857,18 +822,18 @@ public class OperatingSystem implements org.apache.thrift.TBase<OperatingSystem,
 
   }
 
-  private static class OperatingSystemTupleSchemeFactory implements SchemeFactory {
+  private static class OperatingSystemTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public OperatingSystemTupleScheme getScheme() {
       return new OperatingSystemTupleScheme();
     }
   }
 
-  private static class OperatingSystemTupleScheme extends TupleScheme<OperatingSystem> {
+  private static class OperatingSystemTupleScheme extends org.apache.thrift.scheme.TupleScheme<OperatingSystem> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, OperatingSystem struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetOsId()) {
         optionals.set(0);
       }
@@ -897,7 +862,7 @@ public class OperatingSystem implements org.apache.thrift.TBase<OperatingSystem,
       if (struct.isSetVirtualizerOsId()) {
         {
           oprot.writeI32(struct.virtualizerOsId.size());
-          for (Map.Entry<String, String> _iter29 : struct.virtualizerOsId.entrySet())
+          for (java.util.Map.Entry<java.lang.String, java.lang.String> _iter29 : struct.virtualizerOsId.entrySet())
           {
             oprot.writeString(_iter29.getKey());
             oprot.writeString(_iter29.getValue());
@@ -917,8 +882,8 @@ public class OperatingSystem implements org.apache.thrift.TBase<OperatingSystem,
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, OperatingSystem struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(6);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(6);
       if (incoming.get(0)) {
         struct.osId = iprot.readI32();
         struct.setOsIdIsSet(true);
@@ -929,10 +894,10 @@ public class OperatingSystem implements org.apache.thrift.TBase<OperatingSystem,
       }
       if (incoming.get(2)) {
         {
-          org.apache.thrift.protocol.TMap _map30 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.virtualizerOsId = new HashMap<String,String>(2*_map30.size);
-          String _key31;
-          String _val32;
+          org.apache.thrift.protocol.TMap _map30 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING); 
+          struct.virtualizerOsId = new java.util.HashMap<java.lang.String,java.lang.String>(2*_map30.size);
+          @org.apache.thrift.annotation.Nullable java.lang.String _key31;
+          @org.apache.thrift.annotation.Nullable java.lang.String _val32;
           for (int _i33 = 0; _i33 < _map30.size; ++_i33)
           {
             _key31 = iprot.readString();
@@ -957,5 +922,8 @@ public class OperatingSystem implements org.apache.thrift.TBase<OperatingSystem,
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/Organization.java b/src/main/java/org/openslx/bwlp/thrift/iface/Organization.java
index 2021634..b9b8b50 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/Organization.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/Organization.java
@@ -1,40 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.openslx.bwlp.thrift.iface;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
 public class Organization implements org.apache.thrift.TBase<Organization, Organization._Fields>, java.io.Serializable, Cloneable, Comparable<Organization> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Organization");
 
@@ -43,16 +16,13 @@ public class Organization implements org.apache.thrift.TBase<Organization, Organ
   private static final org.apache.thrift.protocol.TField ECP_URL_FIELD_DESC = new org.apache.thrift.protocol.TField("ecpUrl", org.apache.thrift.protocol.TType.STRING, (short)3);
   private static final org.apache.thrift.protocol.TField SUFFIX_LIST_FIELD_DESC = new org.apache.thrift.protocol.TField("suffixList", org.apache.thrift.protocol.TType.LIST, (short)4);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new OrganizationStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new OrganizationTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new OrganizationStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new OrganizationTupleSchemeFactory();
 
-  public String organizationId; // required
-  public String displayName; // required
-  public String ecpUrl; // required
-  public List<String> suffixList; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String organizationId; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String displayName; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String ecpUrl; // required
+  public @org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> suffixList; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -61,10 +31,10 @@ public class Organization implements org.apache.thrift.TBase<Organization, Organ
     ECP_URL((short)3, "ecpUrl"),
     SUFFIX_LIST((short)4, "suffixList");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -72,6 +42,7 @@ public class Organization implements org.apache.thrift.TBase<Organization, Organ
     /**
      * Find the _Fields constant that matches fieldId, or null if its not found.
      */
+    @org.apache.thrift.annotation.Nullable
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
         case 1: // ORGANIZATION_ID
@@ -93,21 +64,22 @@ public class Organization implements org.apache.thrift.TBase<Organization, Organ
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    @org.apache.thrift.annotation.Nullable
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -116,15 +88,15 @@ public class Organization implements org.apache.thrift.TBase<Organization, Organ
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.ORGANIZATION_ID, new org.apache.thrift.meta_data.FieldMetaData("organizationId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.DISPLAY_NAME, new org.apache.thrift.meta_data.FieldMetaData("displayName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -134,7 +106,7 @@ public class Organization implements org.apache.thrift.TBase<Organization, Organ
     tmpMap.put(_Fields.SUFFIX_LIST, new org.apache.thrift.meta_data.FieldMetaData("suffixList", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
             new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Organization.class, metaDataMap);
   }
 
@@ -142,10 +114,10 @@ public class Organization implements org.apache.thrift.TBase<Organization, Organ
   }
 
   public Organization(
-    String organizationId,
-    String displayName,
-    String ecpUrl,
-    List<String> suffixList)
+    java.lang.String organizationId,
+    java.lang.String displayName,
+    java.lang.String ecpUrl,
+    java.util.List<java.lang.String> suffixList)
   {
     this();
     this.organizationId = organizationId;
@@ -168,7 +140,7 @@ public class Organization implements org.apache.thrift.TBase<Organization, Organ
       this.ecpUrl = other.ecpUrl;
     }
     if (other.isSetSuffixList()) {
-      List<String> __this__suffixList = new ArrayList<String>(other.suffixList);
+      java.util.List<java.lang.String> __this__suffixList = new java.util.ArrayList<java.lang.String>(other.suffixList);
       this.suffixList = __this__suffixList;
     }
   }
@@ -185,11 +157,12 @@ public class Organization implements org.apache.thrift.TBase<Organization, Organ
     this.suffixList = null;
   }
 
-  public String getOrganizationId() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getOrganizationId() {
     return this.organizationId;
   }
 
-  public Organization setOrganizationId(String organizationId) {
+  public Organization setOrganizationId(@org.apache.thrift.annotation.Nullable java.lang.String organizationId) {
     this.organizationId = organizationId;
     return this;
   }
@@ -209,11 +182,12 @@ public class Organization implements org.apache.thrift.TBase<Organization, Organ
     }
   }
 
-  public String getDisplayName() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getDisplayName() {
     return this.displayName;
   }
 
-  public Organization setDisplayName(String displayName) {
+  public Organization setDisplayName(@org.apache.thrift.annotation.Nullable java.lang.String displayName) {
     this.displayName = displayName;
     return this;
   }
@@ -233,11 +207,12 @@ public class Organization implements org.apache.thrift.TBase<Organization, Organ
     }
   }
 
-  public String getEcpUrl() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getEcpUrl() {
     return this.ecpUrl;
   }
 
-  public Organization setEcpUrl(String ecpUrl) {
+  public Organization setEcpUrl(@org.apache.thrift.annotation.Nullable java.lang.String ecpUrl) {
     this.ecpUrl = ecpUrl;
     return this;
   }
@@ -261,22 +236,24 @@ public class Organization implements org.apache.thrift.TBase<Organization, Organ
     return (this.suffixList == null) ? 0 : this.suffixList.size();
   }
 
-  public java.util.Iterator<String> getSuffixListIterator() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.Iterator<java.lang.String> getSuffixListIterator() {
     return (this.suffixList == null) ? null : this.suffixList.iterator();
   }
 
-  public void addToSuffixList(String elem) {
+  public void addToSuffixList(java.lang.String elem) {
     if (this.suffixList == null) {
-      this.suffixList = new ArrayList<String>();
+      this.suffixList = new java.util.ArrayList<java.lang.String>();
     }
     this.suffixList.add(elem);
   }
 
-  public List<String> getSuffixList() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.List<java.lang.String> getSuffixList() {
     return this.suffixList;
   }
 
-  public Organization setSuffixList(List<String> suffixList) {
+  public Organization setSuffixList(@org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> suffixList) {
     this.suffixList = suffixList;
     return this;
   }
@@ -296,13 +273,13 @@ public class Organization implements org.apache.thrift.TBase<Organization, Organ
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case ORGANIZATION_ID:
       if (value == null) {
         unsetOrganizationId();
       } else {
-        setOrganizationId((String)value);
+        setOrganizationId((java.lang.String)value);
       }
       break;
 
@@ -310,7 +287,7 @@ public class Organization implements org.apache.thrift.TBase<Organization, Organ
       if (value == null) {
         unsetDisplayName();
       } else {
-        setDisplayName((String)value);
+        setDisplayName((java.lang.String)value);
       }
       break;
 
@@ -318,7 +295,7 @@ public class Organization implements org.apache.thrift.TBase<Organization, Organ
       if (value == null) {
         unsetEcpUrl();
       } else {
-        setEcpUrl((String)value);
+        setEcpUrl((java.lang.String)value);
       }
       break;
 
@@ -326,14 +303,15 @@ public class Organization implements org.apache.thrift.TBase<Organization, Organ
       if (value == null) {
         unsetSuffixList();
       } else {
-        setSuffixList((List<String>)value);
+        setSuffixList((java.util.List<java.lang.String>)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case ORGANIZATION_ID:
       return getOrganizationId();
@@ -348,13 +326,13 @@ public class Organization implements org.apache.thrift.TBase<Organization, Organ
       return getSuffixList();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -367,13 +345,11 @@ public class Organization implements org.apache.thrift.TBase<Organization, Organ
     case SUFFIX_LIST:
       return isSetSuffixList();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
+  public boolean equals(java.lang.Object that) {
     if (that instanceof Organization)
       return this.equals((Organization)that);
     return false;
@@ -382,6 +358,8 @@ public class Organization implements org.apache.thrift.TBase<Organization, Organ
   public boolean equals(Organization that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_organizationId = true && this.isSetOrganizationId();
     boolean that_present_organizationId = true && that.isSetOrganizationId();
@@ -424,29 +402,25 @@ public class Organization implements org.apache.thrift.TBase<Organization, Organ
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_organizationId = true && (isSetOrganizationId());
-    list.add(present_organizationId);
-    if (present_organizationId)
-      list.add(organizationId);
+    hashCode = hashCode * 8191 + ((isSetOrganizationId()) ? 131071 : 524287);
+    if (isSetOrganizationId())
+      hashCode = hashCode * 8191 + organizationId.hashCode();
 
-    boolean present_displayName = true && (isSetDisplayName());
-    list.add(present_displayName);
-    if (present_displayName)
-      list.add(displayName);
+    hashCode = hashCode * 8191 + ((isSetDisplayName()) ? 131071 : 524287);
+    if (isSetDisplayName())
+      hashCode = hashCode * 8191 + displayName.hashCode();
 
-    boolean present_ecpUrl = true && (isSetEcpUrl());
-    list.add(present_ecpUrl);
-    if (present_ecpUrl)
-      list.add(ecpUrl);
+    hashCode = hashCode * 8191 + ((isSetEcpUrl()) ? 131071 : 524287);
+    if (isSetEcpUrl())
+      hashCode = hashCode * 8191 + ecpUrl.hashCode();
 
-    boolean present_suffixList = true && (isSetSuffixList());
-    list.add(present_suffixList);
-    if (present_suffixList)
-      list.add(suffixList);
+    hashCode = hashCode * 8191 + ((isSetSuffixList()) ? 131071 : 524287);
+    if (isSetSuffixList())
+      hashCode = hashCode * 8191 + suffixList.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -457,7 +431,7 @@ public class Organization implements org.apache.thrift.TBase<Organization, Organ
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetOrganizationId()).compareTo(other.isSetOrganizationId());
+    lastComparison = java.lang.Boolean.compare(isSetOrganizationId(), other.isSetOrganizationId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -467,7 +441,7 @@ public class Organization implements org.apache.thrift.TBase<Organization, Organ
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetDisplayName()).compareTo(other.isSetDisplayName());
+    lastComparison = java.lang.Boolean.compare(isSetDisplayName(), other.isSetDisplayName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -477,7 +451,7 @@ public class Organization implements org.apache.thrift.TBase<Organization, Organ
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetEcpUrl()).compareTo(other.isSetEcpUrl());
+    lastComparison = java.lang.Boolean.compare(isSetEcpUrl(), other.isSetEcpUrl());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -487,7 +461,7 @@ public class Organization implements org.apache.thrift.TBase<Organization, Organ
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetSuffixList()).compareTo(other.isSetSuffixList());
+    lastComparison = java.lang.Boolean.compare(isSetSuffixList(), other.isSetSuffixList());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -500,21 +474,22 @@ public class Organization implements org.apache.thrift.TBase<Organization, Organ
     return 0;
   }
 
+  @org.apache.thrift.annotation.Nullable
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("Organization(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("Organization(");
     boolean first = true;
 
     sb.append("organizationId:");
@@ -565,7 +540,7 @@ public class Organization implements org.apache.thrift.TBase<Organization, Organ
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
     } catch (org.apache.thrift.TException te) {
@@ -573,13 +548,13 @@ public class Organization implements org.apache.thrift.TBase<Organization, Organ
     }
   }
 
-  private static class OrganizationStandardSchemeFactory implements SchemeFactory {
+  private static class OrganizationStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public OrganizationStandardScheme getScheme() {
       return new OrganizationStandardScheme();
     }
   }
 
-  private static class OrganizationStandardScheme extends StandardScheme<Organization> {
+  private static class OrganizationStandardScheme extends org.apache.thrift.scheme.StandardScheme<Organization> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, Organization struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -619,8 +594,8 @@ public class Organization implements org.apache.thrift.TBase<Organization, Organ
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
-                struct.suffixList = new ArrayList<String>(_list0.size);
-                String _elem1;
+                struct.suffixList = new java.util.ArrayList<java.lang.String>(_list0.size);
+                @org.apache.thrift.annotation.Nullable java.lang.String _elem1;
                 for (int _i2 = 0; _i2 < _list0.size; ++_i2)
                 {
                   _elem1 = iprot.readString();
@@ -667,7 +642,7 @@ public class Organization implements org.apache.thrift.TBase<Organization, Organ
         oprot.writeFieldBegin(SUFFIX_LIST_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.suffixList.size()));
-          for (String _iter3 : struct.suffixList)
+          for (java.lang.String _iter3 : struct.suffixList)
           {
             oprot.writeString(_iter3);
           }
@@ -681,18 +656,18 @@ public class Organization implements org.apache.thrift.TBase<Organization, Organ
 
   }
 
-  private static class OrganizationTupleSchemeFactory implements SchemeFactory {
+  private static class OrganizationTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public OrganizationTupleScheme getScheme() {
       return new OrganizationTupleScheme();
     }
   }
 
-  private static class OrganizationTupleScheme extends TupleScheme<Organization> {
+  private static class OrganizationTupleScheme extends org.apache.thrift.scheme.TupleScheme<Organization> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, Organization struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetOrganizationId()) {
         optionals.set(0);
       }
@@ -718,7 +693,7 @@ public class Organization implements org.apache.thrift.TBase<Organization, Organ
       if (struct.isSetSuffixList()) {
         {
           oprot.writeI32(struct.suffixList.size());
-          for (String _iter4 : struct.suffixList)
+          for (java.lang.String _iter4 : struct.suffixList)
           {
             oprot.writeString(_iter4);
           }
@@ -728,8 +703,8 @@ public class Organization implements org.apache.thrift.TBase<Organization, Organ
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, Organization struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(4);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(4);
       if (incoming.get(0)) {
         struct.organizationId = iprot.readString();
         struct.setOrganizationIdIsSet(true);
@@ -744,9 +719,9 @@ public class Organization implements org.apache.thrift.TBase<Organization, Organ
       }
       if (incoming.get(3)) {
         {
-          org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.suffixList = new ArrayList<String>(_list5.size);
-          String _elem6;
+          org.apache.thrift.protocol.TList _list5 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+          struct.suffixList = new java.util.ArrayList<java.lang.String>(_list5.size);
+          @org.apache.thrift.annotation.Nullable java.lang.String _elem6;
           for (int _i7 = 0; _i7 < _list5.size; ++_i7)
           {
             _elem6 = iprot.readString();
@@ -758,5 +733,8 @@ public class Organization implements org.apache.thrift.TBase<Organization, Organ
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/PredefinedData.java b/src/main/java/org/openslx/bwlp/thrift/iface/PredefinedData.java
index 4032b4e..afdf0b0 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/PredefinedData.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/PredefinedData.java
@@ -1,40 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.openslx.bwlp.thrift.iface;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2019-02-25")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
 public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, PredefinedData._Fields>, java.io.Serializable, Cloneable, Comparable<PredefinedData> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PredefinedData");
 
@@ -43,16 +16,13 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
   private static final org.apache.thrift.protocol.TField RUN_SCRIPTS_FIELD_DESC = new org.apache.thrift.protocol.TField("runScripts", org.apache.thrift.protocol.TType.LIST, (short)3);
   private static final org.apache.thrift.protocol.TField NETWORK_EXCEPTIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("networkExceptions", org.apache.thrift.protocol.TType.LIST, (short)4);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new PredefinedDataStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new PredefinedDataTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new PredefinedDataStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new PredefinedDataTupleSchemeFactory();
 
-  public List<NetShare> netShares; // required
-  public List<LdapFilter> ldapFilter; // required
-  public List<PresetRunScript> runScripts; // required
-  public List<PresetNetRule> networkExceptions; // required
+  public @org.apache.thrift.annotation.Nullable java.util.List<NetShare> netShares; // required
+  public @org.apache.thrift.annotation.Nullable java.util.List<LdapFilter> ldapFilter; // required
+  public @org.apache.thrift.annotation.Nullable java.util.List<PresetRunScript> runScripts; // required
+  public @org.apache.thrift.annotation.Nullable java.util.List<PresetNetRule> networkExceptions; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -61,10 +31,10 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
     RUN_SCRIPTS((short)3, "runScripts"),
     NETWORK_EXCEPTIONS((short)4, "networkExceptions");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -72,6 +42,7 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
     /**
      * Find the _Fields constant that matches fieldId, or null if its not found.
      */
+    @org.apache.thrift.annotation.Nullable
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
         case 1: // NET_SHARES
@@ -93,21 +64,22 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    @org.apache.thrift.annotation.Nullable
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -116,15 +88,15 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.NET_SHARES, new org.apache.thrift.meta_data.FieldMetaData("netShares", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
             new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NetShare.class))));
@@ -137,7 +109,7 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
     tmpMap.put(_Fields.NETWORK_EXCEPTIONS, new org.apache.thrift.meta_data.FieldMetaData("networkExceptions", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
             new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, PresetNetRule.class))));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(PredefinedData.class, metaDataMap);
   }
 
@@ -145,10 +117,10 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
   }
 
   public PredefinedData(
-    List<NetShare> netShares,
-    List<LdapFilter> ldapFilter,
-    List<PresetRunScript> runScripts,
-    List<PresetNetRule> networkExceptions)
+    java.util.List<NetShare> netShares,
+    java.util.List<LdapFilter> ldapFilter,
+    java.util.List<PresetRunScript> runScripts,
+    java.util.List<PresetNetRule> networkExceptions)
   {
     this();
     this.netShares = netShares;
@@ -162,28 +134,28 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
    */
   public PredefinedData(PredefinedData other) {
     if (other.isSetNetShares()) {
-      List<NetShare> __this__netShares = new ArrayList<NetShare>(other.netShares.size());
+      java.util.List<NetShare> __this__netShares = new java.util.ArrayList<NetShare>(other.netShares.size());
       for (NetShare other_element : other.netShares) {
         __this__netShares.add(new NetShare(other_element));
       }
       this.netShares = __this__netShares;
     }
     if (other.isSetLdapFilter()) {
-      List<LdapFilter> __this__ldapFilter = new ArrayList<LdapFilter>(other.ldapFilter.size());
+      java.util.List<LdapFilter> __this__ldapFilter = new java.util.ArrayList<LdapFilter>(other.ldapFilter.size());
       for (LdapFilter other_element : other.ldapFilter) {
         __this__ldapFilter.add(new LdapFilter(other_element));
       }
       this.ldapFilter = __this__ldapFilter;
     }
     if (other.isSetRunScripts()) {
-      List<PresetRunScript> __this__runScripts = new ArrayList<PresetRunScript>(other.runScripts.size());
+      java.util.List<PresetRunScript> __this__runScripts = new java.util.ArrayList<PresetRunScript>(other.runScripts.size());
       for (PresetRunScript other_element : other.runScripts) {
         __this__runScripts.add(new PresetRunScript(other_element));
       }
       this.runScripts = __this__runScripts;
     }
     if (other.isSetNetworkExceptions()) {
-      List<PresetNetRule> __this__networkExceptions = new ArrayList<PresetNetRule>(other.networkExceptions.size());
+      java.util.List<PresetNetRule> __this__networkExceptions = new java.util.ArrayList<PresetNetRule>(other.networkExceptions.size());
       for (PresetNetRule other_element : other.networkExceptions) {
         __this__networkExceptions.add(new PresetNetRule(other_element));
       }
@@ -207,22 +179,24 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
     return (this.netShares == null) ? 0 : this.netShares.size();
   }
 
+  @org.apache.thrift.annotation.Nullable
   public java.util.Iterator<NetShare> getNetSharesIterator() {
     return (this.netShares == null) ? null : this.netShares.iterator();
   }
 
   public void addToNetShares(NetShare elem) {
     if (this.netShares == null) {
-      this.netShares = new ArrayList<NetShare>();
+      this.netShares = new java.util.ArrayList<NetShare>();
     }
     this.netShares.add(elem);
   }
 
-  public List<NetShare> getNetShares() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.List<NetShare> getNetShares() {
     return this.netShares;
   }
 
-  public PredefinedData setNetShares(List<NetShare> netShares) {
+  public PredefinedData setNetShares(@org.apache.thrift.annotation.Nullable java.util.List<NetShare> netShares) {
     this.netShares = netShares;
     return this;
   }
@@ -246,22 +220,24 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
     return (this.ldapFilter == null) ? 0 : this.ldapFilter.size();
   }
 
+  @org.apache.thrift.annotation.Nullable
   public java.util.Iterator<LdapFilter> getLdapFilterIterator() {
     return (this.ldapFilter == null) ? null : this.ldapFilter.iterator();
   }
 
   public void addToLdapFilter(LdapFilter elem) {
     if (this.ldapFilter == null) {
-      this.ldapFilter = new ArrayList<LdapFilter>();
+      this.ldapFilter = new java.util.ArrayList<LdapFilter>();
     }
     this.ldapFilter.add(elem);
   }
 
-  public List<LdapFilter> getLdapFilter() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.List<LdapFilter> getLdapFilter() {
     return this.ldapFilter;
   }
 
-  public PredefinedData setLdapFilter(List<LdapFilter> ldapFilter) {
+  public PredefinedData setLdapFilter(@org.apache.thrift.annotation.Nullable java.util.List<LdapFilter> ldapFilter) {
     this.ldapFilter = ldapFilter;
     return this;
   }
@@ -285,22 +261,24 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
     return (this.runScripts == null) ? 0 : this.runScripts.size();
   }
 
+  @org.apache.thrift.annotation.Nullable
   public java.util.Iterator<PresetRunScript> getRunScriptsIterator() {
     return (this.runScripts == null) ? null : this.runScripts.iterator();
   }
 
   public void addToRunScripts(PresetRunScript elem) {
     if (this.runScripts == null) {
-      this.runScripts = new ArrayList<PresetRunScript>();
+      this.runScripts = new java.util.ArrayList<PresetRunScript>();
     }
     this.runScripts.add(elem);
   }
 
-  public List<PresetRunScript> getRunScripts() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.List<PresetRunScript> getRunScripts() {
     return this.runScripts;
   }
 
-  public PredefinedData setRunScripts(List<PresetRunScript> runScripts) {
+  public PredefinedData setRunScripts(@org.apache.thrift.annotation.Nullable java.util.List<PresetRunScript> runScripts) {
     this.runScripts = runScripts;
     return this;
   }
@@ -324,22 +302,24 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
     return (this.networkExceptions == null) ? 0 : this.networkExceptions.size();
   }
 
+  @org.apache.thrift.annotation.Nullable
   public java.util.Iterator<PresetNetRule> getNetworkExceptionsIterator() {
     return (this.networkExceptions == null) ? null : this.networkExceptions.iterator();
   }
 
   public void addToNetworkExceptions(PresetNetRule elem) {
     if (this.networkExceptions == null) {
-      this.networkExceptions = new ArrayList<PresetNetRule>();
+      this.networkExceptions = new java.util.ArrayList<PresetNetRule>();
     }
     this.networkExceptions.add(elem);
   }
 
-  public List<PresetNetRule> getNetworkExceptions() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.List<PresetNetRule> getNetworkExceptions() {
     return this.networkExceptions;
   }
 
-  public PredefinedData setNetworkExceptions(List<PresetNetRule> networkExceptions) {
+  public PredefinedData setNetworkExceptions(@org.apache.thrift.annotation.Nullable java.util.List<PresetNetRule> networkExceptions) {
     this.networkExceptions = networkExceptions;
     return this;
   }
@@ -359,13 +339,13 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case NET_SHARES:
       if (value == null) {
         unsetNetShares();
       } else {
-        setNetShares((List<NetShare>)value);
+        setNetShares((java.util.List<NetShare>)value);
       }
       break;
 
@@ -373,7 +353,7 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
       if (value == null) {
         unsetLdapFilter();
       } else {
-        setLdapFilter((List<LdapFilter>)value);
+        setLdapFilter((java.util.List<LdapFilter>)value);
       }
       break;
 
@@ -381,7 +361,7 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
       if (value == null) {
         unsetRunScripts();
       } else {
-        setRunScripts((List<PresetRunScript>)value);
+        setRunScripts((java.util.List<PresetRunScript>)value);
       }
       break;
 
@@ -389,14 +369,15 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
       if (value == null) {
         unsetNetworkExceptions();
       } else {
-        setNetworkExceptions((List<PresetNetRule>)value);
+        setNetworkExceptions((java.util.List<PresetNetRule>)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case NET_SHARES:
       return getNetShares();
@@ -411,13 +392,13 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
       return getNetworkExceptions();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -430,13 +411,11 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
     case NETWORK_EXCEPTIONS:
       return isSetNetworkExceptions();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
+  public boolean equals(java.lang.Object that) {
     if (that instanceof PredefinedData)
       return this.equals((PredefinedData)that);
     return false;
@@ -445,6 +424,8 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
   public boolean equals(PredefinedData that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_netShares = true && this.isSetNetShares();
     boolean that_present_netShares = true && that.isSetNetShares();
@@ -487,29 +468,25 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_netShares = true && (isSetNetShares());
-    list.add(present_netShares);
-    if (present_netShares)
-      list.add(netShares);
+    hashCode = hashCode * 8191 + ((isSetNetShares()) ? 131071 : 524287);
+    if (isSetNetShares())
+      hashCode = hashCode * 8191 + netShares.hashCode();
 
-    boolean present_ldapFilter = true && (isSetLdapFilter());
-    list.add(present_ldapFilter);
-    if (present_ldapFilter)
-      list.add(ldapFilter);
+    hashCode = hashCode * 8191 + ((isSetLdapFilter()) ? 131071 : 524287);
+    if (isSetLdapFilter())
+      hashCode = hashCode * 8191 + ldapFilter.hashCode();
 
-    boolean present_runScripts = true && (isSetRunScripts());
-    list.add(present_runScripts);
-    if (present_runScripts)
-      list.add(runScripts);
+    hashCode = hashCode * 8191 + ((isSetRunScripts()) ? 131071 : 524287);
+    if (isSetRunScripts())
+      hashCode = hashCode * 8191 + runScripts.hashCode();
 
-    boolean present_networkExceptions = true && (isSetNetworkExceptions());
-    list.add(present_networkExceptions);
-    if (present_networkExceptions)
-      list.add(networkExceptions);
+    hashCode = hashCode * 8191 + ((isSetNetworkExceptions()) ? 131071 : 524287);
+    if (isSetNetworkExceptions())
+      hashCode = hashCode * 8191 + networkExceptions.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -520,7 +497,7 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetNetShares()).compareTo(other.isSetNetShares());
+    lastComparison = java.lang.Boolean.compare(isSetNetShares(), other.isSetNetShares());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -530,7 +507,7 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetLdapFilter()).compareTo(other.isSetLdapFilter());
+    lastComparison = java.lang.Boolean.compare(isSetLdapFilter(), other.isSetLdapFilter());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -540,7 +517,7 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetRunScripts()).compareTo(other.isSetRunScripts());
+    lastComparison = java.lang.Boolean.compare(isSetRunScripts(), other.isSetRunScripts());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -550,7 +527,7 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetNetworkExceptions()).compareTo(other.isSetNetworkExceptions());
+    lastComparison = java.lang.Boolean.compare(isSetNetworkExceptions(), other.isSetNetworkExceptions());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -563,21 +540,22 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
     return 0;
   }
 
+  @org.apache.thrift.annotation.Nullable
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("PredefinedData(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("PredefinedData(");
     boolean first = true;
 
     sb.append("netShares:");
@@ -628,7 +606,7 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
     } catch (org.apache.thrift.TException te) {
@@ -636,13 +614,13 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
     }
   }
 
-  private static class PredefinedDataStandardSchemeFactory implements SchemeFactory {
+  private static class PredefinedDataStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public PredefinedDataStandardScheme getScheme() {
       return new PredefinedDataStandardScheme();
     }
   }
 
-  private static class PredefinedDataStandardScheme extends StandardScheme<PredefinedData> {
+  private static class PredefinedDataStandardScheme extends org.apache.thrift.scheme.StandardScheme<PredefinedData> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, PredefinedData struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -658,8 +636,8 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list106 = iprot.readListBegin();
-                struct.netShares = new ArrayList<NetShare>(_list106.size);
-                NetShare _elem107;
+                struct.netShares = new java.util.ArrayList<NetShare>(_list106.size);
+                @org.apache.thrift.annotation.Nullable NetShare _elem107;
                 for (int _i108 = 0; _i108 < _list106.size; ++_i108)
                 {
                   _elem107 = new NetShare();
@@ -677,8 +655,8 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list109 = iprot.readListBegin();
-                struct.ldapFilter = new ArrayList<LdapFilter>(_list109.size);
-                LdapFilter _elem110;
+                struct.ldapFilter = new java.util.ArrayList<LdapFilter>(_list109.size);
+                @org.apache.thrift.annotation.Nullable LdapFilter _elem110;
                 for (int _i111 = 0; _i111 < _list109.size; ++_i111)
                 {
                   _elem110 = new LdapFilter();
@@ -696,8 +674,8 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list112 = iprot.readListBegin();
-                struct.runScripts = new ArrayList<PresetRunScript>(_list112.size);
-                PresetRunScript _elem113;
+                struct.runScripts = new java.util.ArrayList<PresetRunScript>(_list112.size);
+                @org.apache.thrift.annotation.Nullable PresetRunScript _elem113;
                 for (int _i114 = 0; _i114 < _list112.size; ++_i114)
                 {
                   _elem113 = new PresetRunScript();
@@ -715,8 +693,8 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list115 = iprot.readListBegin();
-                struct.networkExceptions = new ArrayList<PresetNetRule>(_list115.size);
-                PresetNetRule _elem116;
+                struct.networkExceptions = new java.util.ArrayList<PresetNetRule>(_list115.size);
+                @org.apache.thrift.annotation.Nullable PresetNetRule _elem116;
                 for (int _i117 = 0; _i117 < _list115.size; ++_i117)
                 {
                   _elem116 = new PresetNetRule();
@@ -799,18 +777,18 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
 
   }
 
-  private static class PredefinedDataTupleSchemeFactory implements SchemeFactory {
+  private static class PredefinedDataTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public PredefinedDataTupleScheme getScheme() {
       return new PredefinedDataTupleScheme();
     }
   }
 
-  private static class PredefinedDataTupleScheme extends TupleScheme<PredefinedData> {
+  private static class PredefinedDataTupleScheme extends org.apache.thrift.scheme.TupleScheme<PredefinedData> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, PredefinedData struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetNetShares()) {
         optionals.set(0);
       }
@@ -864,13 +842,13 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, PredefinedData struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(4);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(4);
       if (incoming.get(0)) {
         {
-          org.apache.thrift.protocol.TList _list126 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.netShares = new ArrayList<NetShare>(_list126.size);
-          NetShare _elem127;
+          org.apache.thrift.protocol.TList _list126 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.netShares = new java.util.ArrayList<NetShare>(_list126.size);
+          @org.apache.thrift.annotation.Nullable NetShare _elem127;
           for (int _i128 = 0; _i128 < _list126.size; ++_i128)
           {
             _elem127 = new NetShare();
@@ -882,9 +860,9 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
       }
       if (incoming.get(1)) {
         {
-          org.apache.thrift.protocol.TList _list129 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.ldapFilter = new ArrayList<LdapFilter>(_list129.size);
-          LdapFilter _elem130;
+          org.apache.thrift.protocol.TList _list129 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.ldapFilter = new java.util.ArrayList<LdapFilter>(_list129.size);
+          @org.apache.thrift.annotation.Nullable LdapFilter _elem130;
           for (int _i131 = 0; _i131 < _list129.size; ++_i131)
           {
             _elem130 = new LdapFilter();
@@ -896,9 +874,9 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
       }
       if (incoming.get(2)) {
         {
-          org.apache.thrift.protocol.TList _list132 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.runScripts = new ArrayList<PresetRunScript>(_list132.size);
-          PresetRunScript _elem133;
+          org.apache.thrift.protocol.TList _list132 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.runScripts = new java.util.ArrayList<PresetRunScript>(_list132.size);
+          @org.apache.thrift.annotation.Nullable PresetRunScript _elem133;
           for (int _i134 = 0; _i134 < _list132.size; ++_i134)
           {
             _elem133 = new PresetRunScript();
@@ -910,9 +888,9 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
       }
       if (incoming.get(3)) {
         {
-          org.apache.thrift.protocol.TList _list135 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.networkExceptions = new ArrayList<PresetNetRule>(_list135.size);
-          PresetNetRule _elem136;
+          org.apache.thrift.protocol.TList _list135 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.networkExceptions = new java.util.ArrayList<PresetNetRule>(_list135.size);
+          @org.apache.thrift.annotation.Nullable PresetNetRule _elem136;
           for (int _i137 = 0; _i137 < _list135.size; ++_i137)
           {
             _elem136 = new PresetNetRule();
@@ -925,5 +903,8 @@ public class PredefinedData implements org.apache.thrift.TBase<PredefinedData, P
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/PresetNetRule.java b/src/main/java/org/openslx/bwlp/thrift/iface/PresetNetRule.java
index 262c8ac..215d8ba 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/PresetNetRule.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/PresetNetRule.java
@@ -1,40 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.openslx.bwlp.thrift.iface;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2019-02-25")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
 public class PresetNetRule implements org.apache.thrift.TBase<PresetNetRule, PresetNetRule._Fields>, java.io.Serializable, Cloneable, Comparable<PresetNetRule> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PresetNetRule");
 
@@ -42,15 +15,12 @@ public class PresetNetRule implements org.apache.thrift.TBase<PresetNetRule, Pre
   private static final org.apache.thrift.protocol.TField DISPLAY_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("displayName", org.apache.thrift.protocol.TType.STRING, (short)2);
   private static final org.apache.thrift.protocol.TField NET_RULES_FIELD_DESC = new org.apache.thrift.protocol.TField("netRules", org.apache.thrift.protocol.TType.LIST, (short)3);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new PresetNetRuleStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new PresetNetRuleTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new PresetNetRuleStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new PresetNetRuleTupleSchemeFactory();
 
   public int ruleId; // required
-  public String displayName; // required
-  public List<NetRule> netRules; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String displayName; // required
+  public @org.apache.thrift.annotation.Nullable java.util.List<NetRule> netRules; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -58,10 +28,10 @@ public class PresetNetRule implements org.apache.thrift.TBase<PresetNetRule, Pre
     DISPLAY_NAME((short)2, "displayName"),
     NET_RULES((short)3, "netRules");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -69,6 +39,7 @@ public class PresetNetRule implements org.apache.thrift.TBase<PresetNetRule, Pre
     /**
      * Find the _Fields constant that matches fieldId, or null if its not found.
      */
+    @org.apache.thrift.annotation.Nullable
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
         case 1: // RULE_ID
@@ -88,21 +59,22 @@ public class PresetNetRule implements org.apache.thrift.TBase<PresetNetRule, Pre
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    @org.apache.thrift.annotation.Nullable
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -111,7 +83,7 @@ public class PresetNetRule implements org.apache.thrift.TBase<PresetNetRule, Pre
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -119,9 +91,9 @@ public class PresetNetRule implements org.apache.thrift.TBase<PresetNetRule, Pre
   // isset id assignments
   private static final int __RULEID_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.RULE_ID, new org.apache.thrift.meta_data.FieldMetaData("ruleId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
     tmpMap.put(_Fields.DISPLAY_NAME, new org.apache.thrift.meta_data.FieldMetaData("displayName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -129,7 +101,7 @@ public class PresetNetRule implements org.apache.thrift.TBase<PresetNetRule, Pre
     tmpMap.put(_Fields.NET_RULES, new org.apache.thrift.meta_data.FieldMetaData("netRules", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
             new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, NetRule.class))));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(PresetNetRule.class, metaDataMap);
   }
 
@@ -138,8 +110,8 @@ public class PresetNetRule implements org.apache.thrift.TBase<PresetNetRule, Pre
 
   public PresetNetRule(
     int ruleId,
-    String displayName,
-    List<NetRule> netRules)
+    java.lang.String displayName,
+    java.util.List<NetRule> netRules)
   {
     this();
     this.ruleId = ruleId;
@@ -158,7 +130,7 @@ public class PresetNetRule implements org.apache.thrift.TBase<PresetNetRule, Pre
       this.displayName = other.displayName;
     }
     if (other.isSetNetRules()) {
-      List<NetRule> __this__netRules = new ArrayList<NetRule>(other.netRules.size());
+      java.util.List<NetRule> __this__netRules = new java.util.ArrayList<NetRule>(other.netRules.size());
       for (NetRule other_element : other.netRules) {
         __this__netRules.add(new NetRule(other_element));
       }
@@ -189,23 +161,24 @@ public class PresetNetRule implements org.apache.thrift.TBase<PresetNetRule, Pre
   }
 
   public void unsetRuleId() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __RULEID_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __RULEID_ISSET_ID);
   }
 
   /** Returns true if field ruleId is set (has been assigned a value) and false otherwise */
   public boolean isSetRuleId() {
-    return EncodingUtils.testBit(__isset_bitfield, __RULEID_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __RULEID_ISSET_ID);
   }
 
   public void setRuleIdIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __RULEID_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __RULEID_ISSET_ID, value);
   }
 
-  public String getDisplayName() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getDisplayName() {
     return this.displayName;
   }
 
-  public PresetNetRule setDisplayName(String displayName) {
+  public PresetNetRule setDisplayName(@org.apache.thrift.annotation.Nullable java.lang.String displayName) {
     this.displayName = displayName;
     return this;
   }
@@ -229,22 +202,24 @@ public class PresetNetRule implements org.apache.thrift.TBase<PresetNetRule, Pre
     return (this.netRules == null) ? 0 : this.netRules.size();
   }
 
+  @org.apache.thrift.annotation.Nullable
   public java.util.Iterator<NetRule> getNetRulesIterator() {
     return (this.netRules == null) ? null : this.netRules.iterator();
   }
 
   public void addToNetRules(NetRule elem) {
     if (this.netRules == null) {
-      this.netRules = new ArrayList<NetRule>();
+      this.netRules = new java.util.ArrayList<NetRule>();
     }
     this.netRules.add(elem);
   }
 
-  public List<NetRule> getNetRules() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.List<NetRule> getNetRules() {
     return this.netRules;
   }
 
-  public PresetNetRule setNetRules(List<NetRule> netRules) {
+  public PresetNetRule setNetRules(@org.apache.thrift.annotation.Nullable java.util.List<NetRule> netRules) {
     this.netRules = netRules;
     return this;
   }
@@ -264,13 +239,13 @@ public class PresetNetRule implements org.apache.thrift.TBase<PresetNetRule, Pre
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case RULE_ID:
       if (value == null) {
         unsetRuleId();
       } else {
-        setRuleId((Integer)value);
+        setRuleId((java.lang.Integer)value);
       }
       break;
 
@@ -278,7 +253,7 @@ public class PresetNetRule implements org.apache.thrift.TBase<PresetNetRule, Pre
       if (value == null) {
         unsetDisplayName();
       } else {
-        setDisplayName((String)value);
+        setDisplayName((java.lang.String)value);
       }
       break;
 
@@ -286,14 +261,15 @@ public class PresetNetRule implements org.apache.thrift.TBase<PresetNetRule, Pre
       if (value == null) {
         unsetNetRules();
       } else {
-        setNetRules((List<NetRule>)value);
+        setNetRules((java.util.List<NetRule>)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case RULE_ID:
       return getRuleId();
@@ -305,13 +281,13 @@ public class PresetNetRule implements org.apache.thrift.TBase<PresetNetRule, Pre
       return getNetRules();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -322,13 +298,11 @@ public class PresetNetRule implements org.apache.thrift.TBase<PresetNetRule, Pre
     case NET_RULES:
       return isSetNetRules();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
+  public boolean equals(java.lang.Object that) {
     if (that instanceof PresetNetRule)
       return this.equals((PresetNetRule)that);
     return false;
@@ -337,6 +311,8 @@ public class PresetNetRule implements org.apache.thrift.TBase<PresetNetRule, Pre
   public boolean equals(PresetNetRule that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_ruleId = true;
     boolean that_present_ruleId = true;
@@ -370,24 +346,19 @@ public class PresetNetRule implements org.apache.thrift.TBase<PresetNetRule, Pre
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_ruleId = true;
-    list.add(present_ruleId);
-    if (present_ruleId)
-      list.add(ruleId);
+    hashCode = hashCode * 8191 + ruleId;
 
-    boolean present_displayName = true && (isSetDisplayName());
-    list.add(present_displayName);
-    if (present_displayName)
-      list.add(displayName);
+    hashCode = hashCode * 8191 + ((isSetDisplayName()) ? 131071 : 524287);
+    if (isSetDisplayName())
+      hashCode = hashCode * 8191 + displayName.hashCode();
 
-    boolean present_netRules = true && (isSetNetRules());
-    list.add(present_netRules);
-    if (present_netRules)
-      list.add(netRules);
+    hashCode = hashCode * 8191 + ((isSetNetRules()) ? 131071 : 524287);
+    if (isSetNetRules())
+      hashCode = hashCode * 8191 + netRules.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -398,7 +369,7 @@ public class PresetNetRule implements org.apache.thrift.TBase<PresetNetRule, Pre
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetRuleId()).compareTo(other.isSetRuleId());
+    lastComparison = java.lang.Boolean.compare(isSetRuleId(), other.isSetRuleId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -408,7 +379,7 @@ public class PresetNetRule implements org.apache.thrift.TBase<PresetNetRule, Pre
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetDisplayName()).compareTo(other.isSetDisplayName());
+    lastComparison = java.lang.Boolean.compare(isSetDisplayName(), other.isSetDisplayName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -418,7 +389,7 @@ public class PresetNetRule implements org.apache.thrift.TBase<PresetNetRule, Pre
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetNetRules()).compareTo(other.isSetNetRules());
+    lastComparison = java.lang.Boolean.compare(isSetNetRules(), other.isSetNetRules());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -431,21 +402,22 @@ public class PresetNetRule implements org.apache.thrift.TBase<PresetNetRule, Pre
     return 0;
   }
 
+  @org.apache.thrift.annotation.Nullable
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("PresetNetRule(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("PresetNetRule(");
     boolean first = true;
 
     sb.append("ruleId:");
@@ -484,7 +456,7 @@ public class PresetNetRule implements org.apache.thrift.TBase<PresetNetRule, Pre
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -494,13 +466,13 @@ public class PresetNetRule implements org.apache.thrift.TBase<PresetNetRule, Pre
     }
   }
 
-  private static class PresetNetRuleStandardSchemeFactory implements SchemeFactory {
+  private static class PresetNetRuleStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public PresetNetRuleStandardScheme getScheme() {
       return new PresetNetRuleStandardScheme();
     }
   }
 
-  private static class PresetNetRuleStandardScheme extends StandardScheme<PresetNetRule> {
+  private static class PresetNetRuleStandardScheme extends org.apache.thrift.scheme.StandardScheme<PresetNetRule> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, PresetNetRule struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -532,8 +504,8 @@ public class PresetNetRule implements org.apache.thrift.TBase<PresetNetRule, Pre
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list98 = iprot.readListBegin();
-                struct.netRules = new ArrayList<NetRule>(_list98.size);
-                NetRule _elem99;
+                struct.netRules = new java.util.ArrayList<NetRule>(_list98.size);
+                @org.apache.thrift.annotation.Nullable NetRule _elem99;
                 for (int _i100 = 0; _i100 < _list98.size; ++_i100)
                 {
                   _elem99 = new NetRule();
@@ -588,18 +560,18 @@ public class PresetNetRule implements org.apache.thrift.TBase<PresetNetRule, Pre
 
   }
 
-  private static class PresetNetRuleTupleSchemeFactory implements SchemeFactory {
+  private static class PresetNetRuleTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public PresetNetRuleTupleScheme getScheme() {
       return new PresetNetRuleTupleScheme();
     }
   }
 
-  private static class PresetNetRuleTupleScheme extends TupleScheme<PresetNetRule> {
+  private static class PresetNetRuleTupleScheme extends org.apache.thrift.scheme.TupleScheme<PresetNetRule> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, PresetNetRule struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetRuleId()) {
         optionals.set(0);
       }
@@ -629,8 +601,8 @@ public class PresetNetRule implements org.apache.thrift.TBase<PresetNetRule, Pre
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, PresetNetRule struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(3);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(3);
       if (incoming.get(0)) {
         struct.ruleId = iprot.readI32();
         struct.setRuleIdIsSet(true);
@@ -641,9 +613,9 @@ public class PresetNetRule implements org.apache.thrift.TBase<PresetNetRule, Pre
       }
       if (incoming.get(2)) {
         {
-          org.apache.thrift.protocol.TList _list103 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.netRules = new ArrayList<NetRule>(_list103.size);
-          NetRule _elem104;
+          org.apache.thrift.protocol.TList _list103 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+          struct.netRules = new java.util.ArrayList<NetRule>(_list103.size);
+          @org.apache.thrift.annotation.Nullable NetRule _elem104;
           for (int _i105 = 0; _i105 < _list103.size; ++_i105)
           {
             _elem104 = new NetRule();
@@ -656,5 +628,8 @@ public class PresetNetRule implements org.apache.thrift.TBase<PresetNetRule, Pre
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/PresetRunScript.java b/src/main/java/org/openslx/bwlp/thrift/iface/PresetRunScript.java
index da245ef..46443b6 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/PresetRunScript.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/PresetRunScript.java
@@ -1,40 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.openslx.bwlp.thrift.iface;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2018-12-11")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
 public class PresetRunScript implements org.apache.thrift.TBase<PresetRunScript, PresetRunScript._Fields>, java.io.Serializable, Cloneable, Comparable<PresetRunScript> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PresetRunScript");
 
@@ -42,15 +15,12 @@ public class PresetRunScript implements org.apache.thrift.TBase<PresetRunScript,
   private static final org.apache.thrift.protocol.TField DISPLAYNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("displayname", org.apache.thrift.protocol.TType.STRING, (short)2);
   private static final org.apache.thrift.protocol.TField OS_IDS_FIELD_DESC = new org.apache.thrift.protocol.TField("osIds", org.apache.thrift.protocol.TType.LIST, (short)3);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new PresetRunScriptStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new PresetRunScriptTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new PresetRunScriptStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new PresetRunScriptTupleSchemeFactory();
 
   public int scriptId; // required
-  public String displayname; // required
-  public List<Integer> osIds; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String displayname; // required
+  public @org.apache.thrift.annotation.Nullable java.util.List<java.lang.Integer> osIds; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -58,10 +28,10 @@ public class PresetRunScript implements org.apache.thrift.TBase<PresetRunScript,
     DISPLAYNAME((short)2, "displayname"),
     OS_IDS((short)3, "osIds");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -69,6 +39,7 @@ public class PresetRunScript implements org.apache.thrift.TBase<PresetRunScript,
     /**
      * Find the _Fields constant that matches fieldId, or null if its not found.
      */
+    @org.apache.thrift.annotation.Nullable
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
         case 1: // SCRIPT_ID
@@ -88,21 +59,22 @@ public class PresetRunScript implements org.apache.thrift.TBase<PresetRunScript,
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    @org.apache.thrift.annotation.Nullable
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -111,7 +83,7 @@ public class PresetRunScript implements org.apache.thrift.TBase<PresetRunScript,
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -119,9 +91,9 @@ public class PresetRunScript implements org.apache.thrift.TBase<PresetRunScript,
   // isset id assignments
   private static final int __SCRIPTID_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.SCRIPT_ID, new org.apache.thrift.meta_data.FieldMetaData("scriptId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
     tmpMap.put(_Fields.DISPLAYNAME, new org.apache.thrift.meta_data.FieldMetaData("displayname", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -129,7 +101,7 @@ public class PresetRunScript implements org.apache.thrift.TBase<PresetRunScript,
     tmpMap.put(_Fields.OS_IDS, new org.apache.thrift.meta_data.FieldMetaData("osIds", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
             new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(PresetRunScript.class, metaDataMap);
   }
 
@@ -138,8 +110,8 @@ public class PresetRunScript implements org.apache.thrift.TBase<PresetRunScript,
 
   public PresetRunScript(
     int scriptId,
-    String displayname,
-    List<Integer> osIds)
+    java.lang.String displayname,
+    java.util.List<java.lang.Integer> osIds)
   {
     this();
     this.scriptId = scriptId;
@@ -158,7 +130,7 @@ public class PresetRunScript implements org.apache.thrift.TBase<PresetRunScript,
       this.displayname = other.displayname;
     }
     if (other.isSetOsIds()) {
-      List<Integer> __this__osIds = new ArrayList<Integer>(other.osIds);
+      java.util.List<java.lang.Integer> __this__osIds = new java.util.ArrayList<java.lang.Integer>(other.osIds);
       this.osIds = __this__osIds;
     }
   }
@@ -186,23 +158,24 @@ public class PresetRunScript implements org.apache.thrift.TBase<PresetRunScript,
   }
 
   public void unsetScriptId() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SCRIPTID_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SCRIPTID_ISSET_ID);
   }
 
   /** Returns true if field scriptId is set (has been assigned a value) and false otherwise */
   public boolean isSetScriptId() {
-    return EncodingUtils.testBit(__isset_bitfield, __SCRIPTID_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SCRIPTID_ISSET_ID);
   }
 
   public void setScriptIdIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SCRIPTID_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SCRIPTID_ISSET_ID, value);
   }
 
-  public String getDisplayname() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getDisplayname() {
     return this.displayname;
   }
 
-  public PresetRunScript setDisplayname(String displayname) {
+  public PresetRunScript setDisplayname(@org.apache.thrift.annotation.Nullable java.lang.String displayname) {
     this.displayname = displayname;
     return this;
   }
@@ -226,22 +199,24 @@ public class PresetRunScript implements org.apache.thrift.TBase<PresetRunScript,
     return (this.osIds == null) ? 0 : this.osIds.size();
   }
 
-  public java.util.Iterator<Integer> getOsIdsIterator() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.Iterator<java.lang.Integer> getOsIdsIterator() {
     return (this.osIds == null) ? null : this.osIds.iterator();
   }
 
   public void addToOsIds(int elem) {
     if (this.osIds == null) {
-      this.osIds = new ArrayList<Integer>();
+      this.osIds = new java.util.ArrayList<java.lang.Integer>();
     }
     this.osIds.add(elem);
   }
 
-  public List<Integer> getOsIds() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.List<java.lang.Integer> getOsIds() {
     return this.osIds;
   }
 
-  public PresetRunScript setOsIds(List<Integer> osIds) {
+  public PresetRunScript setOsIds(@org.apache.thrift.annotation.Nullable java.util.List<java.lang.Integer> osIds) {
     this.osIds = osIds;
     return this;
   }
@@ -261,13 +236,13 @@ public class PresetRunScript implements org.apache.thrift.TBase<PresetRunScript,
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case SCRIPT_ID:
       if (value == null) {
         unsetScriptId();
       } else {
-        setScriptId((Integer)value);
+        setScriptId((java.lang.Integer)value);
       }
       break;
 
@@ -275,7 +250,7 @@ public class PresetRunScript implements org.apache.thrift.TBase<PresetRunScript,
       if (value == null) {
         unsetDisplayname();
       } else {
-        setDisplayname((String)value);
+        setDisplayname((java.lang.String)value);
       }
       break;
 
@@ -283,14 +258,15 @@ public class PresetRunScript implements org.apache.thrift.TBase<PresetRunScript,
       if (value == null) {
         unsetOsIds();
       } else {
-        setOsIds((List<Integer>)value);
+        setOsIds((java.util.List<java.lang.Integer>)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SCRIPT_ID:
       return getScriptId();
@@ -302,13 +278,13 @@ public class PresetRunScript implements org.apache.thrift.TBase<PresetRunScript,
       return getOsIds();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -319,13 +295,11 @@ public class PresetRunScript implements org.apache.thrift.TBase<PresetRunScript,
     case OS_IDS:
       return isSetOsIds();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
+  public boolean equals(java.lang.Object that) {
     if (that instanceof PresetRunScript)
       return this.equals((PresetRunScript)that);
     return false;
@@ -334,6 +308,8 @@ public class PresetRunScript implements org.apache.thrift.TBase<PresetRunScript,
   public boolean equals(PresetRunScript that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_scriptId = true;
     boolean that_present_scriptId = true;
@@ -367,24 +343,19 @@ public class PresetRunScript implements org.apache.thrift.TBase<PresetRunScript,
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_scriptId = true;
-    list.add(present_scriptId);
-    if (present_scriptId)
-      list.add(scriptId);
+    hashCode = hashCode * 8191 + scriptId;
 
-    boolean present_displayname = true && (isSetDisplayname());
-    list.add(present_displayname);
-    if (present_displayname)
-      list.add(displayname);
+    hashCode = hashCode * 8191 + ((isSetDisplayname()) ? 131071 : 524287);
+    if (isSetDisplayname())
+      hashCode = hashCode * 8191 + displayname.hashCode();
 
-    boolean present_osIds = true && (isSetOsIds());
-    list.add(present_osIds);
-    if (present_osIds)
-      list.add(osIds);
+    hashCode = hashCode * 8191 + ((isSetOsIds()) ? 131071 : 524287);
+    if (isSetOsIds())
+      hashCode = hashCode * 8191 + osIds.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -395,7 +366,7 @@ public class PresetRunScript implements org.apache.thrift.TBase<PresetRunScript,
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetScriptId()).compareTo(other.isSetScriptId());
+    lastComparison = java.lang.Boolean.compare(isSetScriptId(), other.isSetScriptId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -405,7 +376,7 @@ public class PresetRunScript implements org.apache.thrift.TBase<PresetRunScript,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetDisplayname()).compareTo(other.isSetDisplayname());
+    lastComparison = java.lang.Boolean.compare(isSetDisplayname(), other.isSetDisplayname());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -415,7 +386,7 @@ public class PresetRunScript implements org.apache.thrift.TBase<PresetRunScript,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetOsIds()).compareTo(other.isSetOsIds());
+    lastComparison = java.lang.Boolean.compare(isSetOsIds(), other.isSetOsIds());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -428,21 +399,22 @@ public class PresetRunScript implements org.apache.thrift.TBase<PresetRunScript,
     return 0;
   }
 
+  @org.apache.thrift.annotation.Nullable
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("PresetRunScript(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("PresetRunScript(");
     boolean first = true;
 
     sb.append("scriptId:");
@@ -481,7 +453,7 @@ public class PresetRunScript implements org.apache.thrift.TBase<PresetRunScript,
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -491,13 +463,13 @@ public class PresetRunScript implements org.apache.thrift.TBase<PresetRunScript,
     }
   }
 
-  private static class PresetRunScriptStandardSchemeFactory implements SchemeFactory {
+  private static class PresetRunScriptStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public PresetRunScriptStandardScheme getScheme() {
       return new PresetRunScriptStandardScheme();
     }
   }
 
-  private static class PresetRunScriptStandardScheme extends StandardScheme<PresetRunScript> {
+  private static class PresetRunScriptStandardScheme extends org.apache.thrift.scheme.StandardScheme<PresetRunScript> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, PresetRunScript struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -529,7 +501,7 @@ public class PresetRunScript implements org.apache.thrift.TBase<PresetRunScript,
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list90 = iprot.readListBegin();
-                struct.osIds = new ArrayList<Integer>(_list90.size);
+                struct.osIds = new java.util.ArrayList<java.lang.Integer>(_list90.size);
                 int _elem91;
                 for (int _i92 = 0; _i92 < _list90.size; ++_i92)
                 {
@@ -584,18 +556,18 @@ public class PresetRunScript implements org.apache.thrift.TBase<PresetRunScript,
 
   }
 
-  private static class PresetRunScriptTupleSchemeFactory implements SchemeFactory {
+  private static class PresetRunScriptTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public PresetRunScriptTupleScheme getScheme() {
       return new PresetRunScriptTupleScheme();
     }
   }
 
-  private static class PresetRunScriptTupleScheme extends TupleScheme<PresetRunScript> {
+  private static class PresetRunScriptTupleScheme extends org.apache.thrift.scheme.TupleScheme<PresetRunScript> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, PresetRunScript struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetScriptId()) {
         optionals.set(0);
       }
@@ -625,8 +597,8 @@ public class PresetRunScript implements org.apache.thrift.TBase<PresetRunScript,
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, PresetRunScript struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(3);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(3);
       if (incoming.get(0)) {
         struct.scriptId = iprot.readI32();
         struct.setScriptIdIsSet(true);
@@ -637,8 +609,8 @@ public class PresetRunScript implements org.apache.thrift.TBase<PresetRunScript,
       }
       if (incoming.get(2)) {
         {
-          org.apache.thrift.protocol.TList _list95 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32());
-          struct.osIds = new ArrayList<Integer>(_list95.size);
+          org.apache.thrift.protocol.TList _list95 = iprot.readListBegin(org.apache.thrift.protocol.TType.I32);
+          struct.osIds = new java.util.ArrayList<java.lang.Integer>(_list95.size);
           int _elem96;
           for (int _i97 = 0; _i97 < _list95.size; ++_i97)
           {
@@ -651,5 +623,8 @@ public class PresetRunScript implements org.apache.thrift.TBase<PresetRunScript,
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/Role.java b/src/main/java/org/openslx/bwlp/thrift/iface/Role.java
index bbdd984..fc39705 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/Role.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/Role.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,10 +7,7 @@
 package org.openslx.bwlp.thrift.iface;
 
 
-import java.util.Map;
-import java.util.HashMap;
-import org.apache.thrift.TEnum;
-
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
 public enum Role implements org.apache.thrift.TEnum {
   STUDENT(0),
   TUTOR(1);
@@ -32,6 +29,7 @@ public enum Role implements org.apache.thrift.TEnum {
    * Find a the enum type by its integer value, as defined in the Thrift IDL.
    * @return null if the value is not found.
    */
+  @org.apache.thrift.annotation.Nullable
   public static Role findByValue(int value) { 
     switch (value) {
       case 0:
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/Satellite.java b/src/main/java/org/openslx/bwlp/thrift/iface/Satellite.java
index 2d498af..6a9cc85 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/Satellite.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/Satellite.java
@@ -1,40 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.openslx.bwlp.thrift.iface;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
 public class Satellite implements org.apache.thrift.TBase<Satellite, Satellite._Fields>, java.io.Serializable, Cloneable, Comparable<Satellite> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Satellite");
 
@@ -42,15 +15,12 @@ public class Satellite implements org.apache.thrift.TBase<Satellite, Satellite._
   private static final org.apache.thrift.protocol.TField DISPLAY_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("displayName", org.apache.thrift.protocol.TType.STRING, (short)2);
   private static final org.apache.thrift.protocol.TField CERT_SHA256_FIELD_DESC = new org.apache.thrift.protocol.TField("certSha256", org.apache.thrift.protocol.TType.STRING, (short)3);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new SatelliteStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new SatelliteTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new SatelliteStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new SatelliteTupleSchemeFactory();
 
-  public List<String> addressList; // required
-  public String displayName; // required
-  public ByteBuffer certSha256; // required
+  public @org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> addressList; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String displayName; // required
+  public @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer certSha256; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -58,10 +28,10 @@ public class Satellite implements org.apache.thrift.TBase<Satellite, Satellite._
     DISPLAY_NAME((short)2, "displayName"),
     CERT_SHA256((short)3, "certSha256");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -69,6 +39,7 @@ public class Satellite implements org.apache.thrift.TBase<Satellite, Satellite._
     /**
      * Find the _Fields constant that matches fieldId, or null if its not found.
      */
+    @org.apache.thrift.annotation.Nullable
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
         case 1: // ADDRESS_LIST
@@ -88,21 +59,22 @@ public class Satellite implements org.apache.thrift.TBase<Satellite, Satellite._
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    @org.apache.thrift.annotation.Nullable
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -111,15 +83,15 @@ public class Satellite implements org.apache.thrift.TBase<Satellite, Satellite._
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.ADDRESS_LIST, new org.apache.thrift.meta_data.FieldMetaData("addressList", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
             new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
@@ -127,7 +99,7 @@ public class Satellite implements org.apache.thrift.TBase<Satellite, Satellite._
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.CERT_SHA256, new org.apache.thrift.meta_data.FieldMetaData("certSha256", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , true)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Satellite.class, metaDataMap);
   }
 
@@ -135,9 +107,9 @@ public class Satellite implements org.apache.thrift.TBase<Satellite, Satellite._
   }
 
   public Satellite(
-    List<String> addressList,
-    String displayName,
-    ByteBuffer certSha256)
+    java.util.List<java.lang.String> addressList,
+    java.lang.String displayName,
+    java.nio.ByteBuffer certSha256)
   {
     this();
     this.addressList = addressList;
@@ -150,7 +122,7 @@ public class Satellite implements org.apache.thrift.TBase<Satellite, Satellite._
    */
   public Satellite(Satellite other) {
     if (other.isSetAddressList()) {
-      List<String> __this__addressList = new ArrayList<String>(other.addressList);
+      java.util.List<java.lang.String> __this__addressList = new java.util.ArrayList<java.lang.String>(other.addressList);
       this.addressList = __this__addressList;
     }
     if (other.isSetDisplayName()) {
@@ -176,22 +148,24 @@ public class Satellite implements org.apache.thrift.TBase<Satellite, Satellite._
     return (this.addressList == null) ? 0 : this.addressList.size();
   }
 
-  public java.util.Iterator<String> getAddressListIterator() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.Iterator<java.lang.String> getAddressListIterator() {
     return (this.addressList == null) ? null : this.addressList.iterator();
   }
 
-  public void addToAddressList(String elem) {
+  public void addToAddressList(java.lang.String elem) {
     if (this.addressList == null) {
-      this.addressList = new ArrayList<String>();
+      this.addressList = new java.util.ArrayList<java.lang.String>();
     }
     this.addressList.add(elem);
   }
 
-  public List<String> getAddressList() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.List<java.lang.String> getAddressList() {
     return this.addressList;
   }
 
-  public Satellite setAddressList(List<String> addressList) {
+  public Satellite setAddressList(@org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> addressList) {
     this.addressList = addressList;
     return this;
   }
@@ -211,11 +185,12 @@ public class Satellite implements org.apache.thrift.TBase<Satellite, Satellite._
     }
   }
 
-  public String getDisplayName() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getDisplayName() {
     return this.displayName;
   }
 
-  public Satellite setDisplayName(String displayName) {
+  public Satellite setDisplayName(@org.apache.thrift.annotation.Nullable java.lang.String displayName) {
     this.displayName = displayName;
     return this;
   }
@@ -240,16 +215,16 @@ public class Satellite implements org.apache.thrift.TBase<Satellite, Satellite._
     return certSha256 == null ? null : certSha256.array();
   }
 
-  public ByteBuffer bufferForCertSha256() {
+  public java.nio.ByteBuffer bufferForCertSha256() {
     return org.apache.thrift.TBaseHelper.copyBinary(certSha256);
   }
 
   public Satellite setCertSha256(byte[] certSha256) {
-    this.certSha256 = certSha256 == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(certSha256, certSha256.length));
+    this.certSha256 = certSha256 == null ? (java.nio.ByteBuffer)null   : java.nio.ByteBuffer.wrap(certSha256.clone());
     return this;
   }
 
-  public Satellite setCertSha256(ByteBuffer certSha256) {
+  public Satellite setCertSha256(@org.apache.thrift.annotation.Nullable java.nio.ByteBuffer certSha256) {
     this.certSha256 = org.apache.thrift.TBaseHelper.copyBinary(certSha256);
     return this;
   }
@@ -269,13 +244,13 @@ public class Satellite implements org.apache.thrift.TBase<Satellite, Satellite._
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case ADDRESS_LIST:
       if (value == null) {
         unsetAddressList();
       } else {
-        setAddressList((List<String>)value);
+        setAddressList((java.util.List<java.lang.String>)value);
       }
       break;
 
@@ -283,7 +258,7 @@ public class Satellite implements org.apache.thrift.TBase<Satellite, Satellite._
       if (value == null) {
         unsetDisplayName();
       } else {
-        setDisplayName((String)value);
+        setDisplayName((java.lang.String)value);
       }
       break;
 
@@ -291,14 +266,19 @@ public class Satellite implements org.apache.thrift.TBase<Satellite, Satellite._
       if (value == null) {
         unsetCertSha256();
       } else {
-        setCertSha256((ByteBuffer)value);
+        if (value instanceof byte[]) {
+          setCertSha256((byte[])value);
+        } else {
+          setCertSha256((java.nio.ByteBuffer)value);
+        }
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case ADDRESS_LIST:
       return getAddressList();
@@ -310,13 +290,13 @@ public class Satellite implements org.apache.thrift.TBase<Satellite, Satellite._
       return getCertSha256();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -327,13 +307,11 @@ public class Satellite implements org.apache.thrift.TBase<Satellite, Satellite._
     case CERT_SHA256:
       return isSetCertSha256();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
+  public boolean equals(java.lang.Object that) {
     if (that instanceof Satellite)
       return this.equals((Satellite)that);
     return false;
@@ -342,6 +320,8 @@ public class Satellite implements org.apache.thrift.TBase<Satellite, Satellite._
   public boolean equals(Satellite that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_addressList = true && this.isSetAddressList();
     boolean that_present_addressList = true && that.isSetAddressList();
@@ -375,24 +355,21 @@ public class Satellite implements org.apache.thrift.TBase<Satellite, Satellite._
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_addressList = true && (isSetAddressList());
-    list.add(present_addressList);
-    if (present_addressList)
-      list.add(addressList);
+    hashCode = hashCode * 8191 + ((isSetAddressList()) ? 131071 : 524287);
+    if (isSetAddressList())
+      hashCode = hashCode * 8191 + addressList.hashCode();
 
-    boolean present_displayName = true && (isSetDisplayName());
-    list.add(present_displayName);
-    if (present_displayName)
-      list.add(displayName);
+    hashCode = hashCode * 8191 + ((isSetDisplayName()) ? 131071 : 524287);
+    if (isSetDisplayName())
+      hashCode = hashCode * 8191 + displayName.hashCode();
 
-    boolean present_certSha256 = true && (isSetCertSha256());
-    list.add(present_certSha256);
-    if (present_certSha256)
-      list.add(certSha256);
+    hashCode = hashCode * 8191 + ((isSetCertSha256()) ? 131071 : 524287);
+    if (isSetCertSha256())
+      hashCode = hashCode * 8191 + certSha256.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -403,7 +380,7 @@ public class Satellite implements org.apache.thrift.TBase<Satellite, Satellite._
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetAddressList()).compareTo(other.isSetAddressList());
+    lastComparison = java.lang.Boolean.compare(isSetAddressList(), other.isSetAddressList());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -413,7 +390,7 @@ public class Satellite implements org.apache.thrift.TBase<Satellite, Satellite._
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetDisplayName()).compareTo(other.isSetDisplayName());
+    lastComparison = java.lang.Boolean.compare(isSetDisplayName(), other.isSetDisplayName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -423,7 +400,7 @@ public class Satellite implements org.apache.thrift.TBase<Satellite, Satellite._
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetCertSha256()).compareTo(other.isSetCertSha256());
+    lastComparison = java.lang.Boolean.compare(isSetCertSha256(), other.isSetCertSha256());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -436,21 +413,22 @@ public class Satellite implements org.apache.thrift.TBase<Satellite, Satellite._
     return 0;
   }
 
+  @org.apache.thrift.annotation.Nullable
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("Satellite(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("Satellite(");
     boolean first = true;
 
     sb.append("addressList:");
@@ -493,7 +471,7 @@ public class Satellite implements org.apache.thrift.TBase<Satellite, Satellite._
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
     } catch (org.apache.thrift.TException te) {
@@ -501,13 +479,13 @@ public class Satellite implements org.apache.thrift.TBase<Satellite, Satellite._
     }
   }
 
-  private static class SatelliteStandardSchemeFactory implements SchemeFactory {
+  private static class SatelliteStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public SatelliteStandardScheme getScheme() {
       return new SatelliteStandardScheme();
     }
   }
 
-  private static class SatelliteStandardScheme extends StandardScheme<Satellite> {
+  private static class SatelliteStandardScheme extends org.apache.thrift.scheme.StandardScheme<Satellite> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, Satellite struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -523,8 +501,8 @@ public class Satellite implements org.apache.thrift.TBase<Satellite, Satellite._
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
                 org.apache.thrift.protocol.TList _list8 = iprot.readListBegin();
-                struct.addressList = new ArrayList<String>(_list8.size);
-                String _elem9;
+                struct.addressList = new java.util.ArrayList<java.lang.String>(_list8.size);
+                @org.apache.thrift.annotation.Nullable java.lang.String _elem9;
                 for (int _i10 = 0; _i10 < _list8.size; ++_i10)
                 {
                   _elem9 = iprot.readString();
@@ -572,7 +550,7 @@ public class Satellite implements org.apache.thrift.TBase<Satellite, Satellite._
         oprot.writeFieldBegin(ADDRESS_LIST_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.addressList.size()));
-          for (String _iter11 : struct.addressList)
+          for (java.lang.String _iter11 : struct.addressList)
           {
             oprot.writeString(_iter11);
           }
@@ -596,18 +574,18 @@ public class Satellite implements org.apache.thrift.TBase<Satellite, Satellite._
 
   }
 
-  private static class SatelliteTupleSchemeFactory implements SchemeFactory {
+  private static class SatelliteTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public SatelliteTupleScheme getScheme() {
       return new SatelliteTupleScheme();
     }
   }
 
-  private static class SatelliteTupleScheme extends TupleScheme<Satellite> {
+  private static class SatelliteTupleScheme extends org.apache.thrift.scheme.TupleScheme<Satellite> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, Satellite struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetAddressList()) {
         optionals.set(0);
       }
@@ -621,7 +599,7 @@ public class Satellite implements org.apache.thrift.TBase<Satellite, Satellite._
       if (struct.isSetAddressList()) {
         {
           oprot.writeI32(struct.addressList.size());
-          for (String _iter12 : struct.addressList)
+          for (java.lang.String _iter12 : struct.addressList)
           {
             oprot.writeString(_iter12);
           }
@@ -637,13 +615,13 @@ public class Satellite implements org.apache.thrift.TBase<Satellite, Satellite._
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, Satellite struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(3);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(3);
       if (incoming.get(0)) {
         {
-          org.apache.thrift.protocol.TList _list13 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.addressList = new ArrayList<String>(_list13.size);
-          String _elem14;
+          org.apache.thrift.protocol.TList _list13 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+          struct.addressList = new java.util.ArrayList<java.lang.String>(_list13.size);
+          @org.apache.thrift.annotation.Nullable java.lang.String _elem14;
           for (int _i15 = 0; _i15 < _list13.size; ++_i15)
           {
             _elem14 = iprot.readString();
@@ -663,5 +641,8 @@ public class Satellite implements org.apache.thrift.TBase<Satellite, Satellite._
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/SatelliteConfig.java b/src/main/java/org/openslx/bwlp/thrift/iface/SatelliteConfig.java
index 0dc1800..b412de9 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/SatelliteConfig.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/SatelliteConfig.java
@@ -1,40 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.openslx.bwlp.thrift.iface;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2021-04-21")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
 public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig, SatelliteConfig._Fields>, java.io.Serializable, Cloneable, Comparable<SatelliteConfig> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SatelliteConfig");
 
@@ -50,15 +23,12 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
   private static final org.apache.thrift.protocol.TField SERVER_SIDE_COPY_FIELD_DESC = new org.apache.thrift.protocol.TField("serverSideCopy", org.apache.thrift.protocol.TType.I32, (short)10);
   private static final org.apache.thrift.protocol.TField ALLOW_STUDENT_DOWNLOAD_FIELD_DESC = new org.apache.thrift.protocol.TField("allowStudentDownload", org.apache.thrift.protocol.TType.BOOL, (short)11);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new SatelliteConfigStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new SatelliteConfigTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new SatelliteConfigStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new SatelliteConfigTupleSchemeFactory();
 
   public int pageSize; // required
-  public ImagePermissions defaultImagePermissions; // required
-  public LecturePermissions defaultLecturePermissions; // required
+  public @org.apache.thrift.annotation.Nullable ImagePermissions defaultImagePermissions; // required
+  public @org.apache.thrift.annotation.Nullable LecturePermissions defaultLecturePermissions; // required
   public int maxImageValidityDays; // required
   public int maxLectureValidityDays; // required
   public int maxTransfers; // optional
@@ -69,7 +39,7 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
    * 
    * @see SscMode
    */
-  public SscMode serverSideCopy; // optional
+  public @org.apache.thrift.annotation.Nullable SscMode serverSideCopy; // optional
   public boolean allowStudentDownload; // optional
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@@ -90,10 +60,10 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
     SERVER_SIDE_COPY((short)10, "serverSideCopy"),
     ALLOW_STUDENT_DOWNLOAD((short)11, "allowStudentDownload");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -101,6 +71,7 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
     /**
      * Find the _Fields constant that matches fieldId, or null if its not found.
      */
+    @org.apache.thrift.annotation.Nullable
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
         case 1: // PAGE_SIZE
@@ -136,21 +107,22 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    @org.apache.thrift.annotation.Nullable
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -159,7 +131,7 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -175,9 +147,9 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
   private static final int __ALLOWSTUDENTDOWNLOAD_ISSET_ID = 7;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.MAX_TRANSFERS,_Fields.MAX_CONNECTIONS_PER_TRANSFER,_Fields.MAX_LOCATIONS_PER_LECTURE,_Fields.ALLOW_LOGIN_BY_DEFAULT,_Fields.SERVER_SIDE_COPY,_Fields.ALLOW_STUDENT_DOWNLOAD};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.PAGE_SIZE, new org.apache.thrift.meta_data.FieldMetaData("pageSize", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
     tmpMap.put(_Fields.DEFAULT_IMAGE_PERMISSIONS, new org.apache.thrift.meta_data.FieldMetaData("defaultImagePermissions", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -200,7 +172,7 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
         new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, SscMode.class)));
     tmpMap.put(_Fields.ALLOW_STUDENT_DOWNLOAD, new org.apache.thrift.meta_data.FieldMetaData("allowStudentDownload", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SatelliteConfig.class, metaDataMap);
   }
 
@@ -287,23 +259,24 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
   }
 
   public void unsetPageSize() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __PAGESIZE_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __PAGESIZE_ISSET_ID);
   }
 
   /** Returns true if field pageSize is set (has been assigned a value) and false otherwise */
   public boolean isSetPageSize() {
-    return EncodingUtils.testBit(__isset_bitfield, __PAGESIZE_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __PAGESIZE_ISSET_ID);
   }
 
   public void setPageSizeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __PAGESIZE_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __PAGESIZE_ISSET_ID, value);
   }
 
+  @org.apache.thrift.annotation.Nullable
   public ImagePermissions getDefaultImagePermissions() {
     return this.defaultImagePermissions;
   }
 
-  public SatelliteConfig setDefaultImagePermissions(ImagePermissions defaultImagePermissions) {
+  public SatelliteConfig setDefaultImagePermissions(@org.apache.thrift.annotation.Nullable ImagePermissions defaultImagePermissions) {
     this.defaultImagePermissions = defaultImagePermissions;
     return this;
   }
@@ -323,11 +296,12 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
     }
   }
 
+  @org.apache.thrift.annotation.Nullable
   public LecturePermissions getDefaultLecturePermissions() {
     return this.defaultLecturePermissions;
   }
 
-  public SatelliteConfig setDefaultLecturePermissions(LecturePermissions defaultLecturePermissions) {
+  public SatelliteConfig setDefaultLecturePermissions(@org.apache.thrift.annotation.Nullable LecturePermissions defaultLecturePermissions) {
     this.defaultLecturePermissions = defaultLecturePermissions;
     return this;
   }
@@ -358,16 +332,16 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
   }
 
   public void unsetMaxImageValidityDays() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __MAXIMAGEVALIDITYDAYS_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __MAXIMAGEVALIDITYDAYS_ISSET_ID);
   }
 
   /** Returns true if field maxImageValidityDays is set (has been assigned a value) and false otherwise */
   public boolean isSetMaxImageValidityDays() {
-    return EncodingUtils.testBit(__isset_bitfield, __MAXIMAGEVALIDITYDAYS_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __MAXIMAGEVALIDITYDAYS_ISSET_ID);
   }
 
   public void setMaxImageValidityDaysIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __MAXIMAGEVALIDITYDAYS_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __MAXIMAGEVALIDITYDAYS_ISSET_ID, value);
   }
 
   public int getMaxLectureValidityDays() {
@@ -381,16 +355,16 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
   }
 
   public void unsetMaxLectureValidityDays() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __MAXLECTUREVALIDITYDAYS_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __MAXLECTUREVALIDITYDAYS_ISSET_ID);
   }
 
   /** Returns true if field maxLectureValidityDays is set (has been assigned a value) and false otherwise */
   public boolean isSetMaxLectureValidityDays() {
-    return EncodingUtils.testBit(__isset_bitfield, __MAXLECTUREVALIDITYDAYS_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __MAXLECTUREVALIDITYDAYS_ISSET_ID);
   }
 
   public void setMaxLectureValidityDaysIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __MAXLECTUREVALIDITYDAYS_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __MAXLECTUREVALIDITYDAYS_ISSET_ID, value);
   }
 
   public int getMaxTransfers() {
@@ -404,16 +378,16 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
   }
 
   public void unsetMaxTransfers() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __MAXTRANSFERS_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __MAXTRANSFERS_ISSET_ID);
   }
 
   /** Returns true if field maxTransfers is set (has been assigned a value) and false otherwise */
   public boolean isSetMaxTransfers() {
-    return EncodingUtils.testBit(__isset_bitfield, __MAXTRANSFERS_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __MAXTRANSFERS_ISSET_ID);
   }
 
   public void setMaxTransfersIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __MAXTRANSFERS_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __MAXTRANSFERS_ISSET_ID, value);
   }
 
   public int getMaxConnectionsPerTransfer() {
@@ -427,16 +401,16 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
   }
 
   public void unsetMaxConnectionsPerTransfer() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __MAXCONNECTIONSPERTRANSFER_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __MAXCONNECTIONSPERTRANSFER_ISSET_ID);
   }
 
   /** Returns true if field maxConnectionsPerTransfer is set (has been assigned a value) and false otherwise */
   public boolean isSetMaxConnectionsPerTransfer() {
-    return EncodingUtils.testBit(__isset_bitfield, __MAXCONNECTIONSPERTRANSFER_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __MAXCONNECTIONSPERTRANSFER_ISSET_ID);
   }
 
   public void setMaxConnectionsPerTransferIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __MAXCONNECTIONSPERTRANSFER_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __MAXCONNECTIONSPERTRANSFER_ISSET_ID, value);
   }
 
   public int getMaxLocationsPerLecture() {
@@ -450,16 +424,16 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
   }
 
   public void unsetMaxLocationsPerLecture() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __MAXLOCATIONSPERLECTURE_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __MAXLOCATIONSPERLECTURE_ISSET_ID);
   }
 
   /** Returns true if field maxLocationsPerLecture is set (has been assigned a value) and false otherwise */
   public boolean isSetMaxLocationsPerLecture() {
-    return EncodingUtils.testBit(__isset_bitfield, __MAXLOCATIONSPERLECTURE_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __MAXLOCATIONSPERLECTURE_ISSET_ID);
   }
 
   public void setMaxLocationsPerLectureIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __MAXLOCATIONSPERLECTURE_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __MAXLOCATIONSPERLECTURE_ISSET_ID, value);
   }
 
   public boolean isAllowLoginByDefault() {
@@ -473,22 +447,23 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
   }
 
   public void unsetAllowLoginByDefault() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ALLOWLOGINBYDEFAULT_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ALLOWLOGINBYDEFAULT_ISSET_ID);
   }
 
   /** Returns true if field allowLoginByDefault is set (has been assigned a value) and false otherwise */
   public boolean isSetAllowLoginByDefault() {
-    return EncodingUtils.testBit(__isset_bitfield, __ALLOWLOGINBYDEFAULT_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ALLOWLOGINBYDEFAULT_ISSET_ID);
   }
 
   public void setAllowLoginByDefaultIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ALLOWLOGINBYDEFAULT_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ALLOWLOGINBYDEFAULT_ISSET_ID, value);
   }
 
   /**
    * 
    * @see SscMode
    */
+  @org.apache.thrift.annotation.Nullable
   public SscMode getServerSideCopy() {
     return this.serverSideCopy;
   }
@@ -497,7 +472,7 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
    * 
    * @see SscMode
    */
-  public SatelliteConfig setServerSideCopy(SscMode serverSideCopy) {
+  public SatelliteConfig setServerSideCopy(@org.apache.thrift.annotation.Nullable SscMode serverSideCopy) {
     this.serverSideCopy = serverSideCopy;
     return this;
   }
@@ -528,25 +503,25 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
   }
 
   public void unsetAllowStudentDownload() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ALLOWSTUDENTDOWNLOAD_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ALLOWSTUDENTDOWNLOAD_ISSET_ID);
   }
 
   /** Returns true if field allowStudentDownload is set (has been assigned a value) and false otherwise */
   public boolean isSetAllowStudentDownload() {
-    return EncodingUtils.testBit(__isset_bitfield, __ALLOWSTUDENTDOWNLOAD_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ALLOWSTUDENTDOWNLOAD_ISSET_ID);
   }
 
   public void setAllowStudentDownloadIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ALLOWSTUDENTDOWNLOAD_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ALLOWSTUDENTDOWNLOAD_ISSET_ID, value);
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case PAGE_SIZE:
       if (value == null) {
         unsetPageSize();
       } else {
-        setPageSize((Integer)value);
+        setPageSize((java.lang.Integer)value);
       }
       break;
 
@@ -570,7 +545,7 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
       if (value == null) {
         unsetMaxImageValidityDays();
       } else {
-        setMaxImageValidityDays((Integer)value);
+        setMaxImageValidityDays((java.lang.Integer)value);
       }
       break;
 
@@ -578,7 +553,7 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
       if (value == null) {
         unsetMaxLectureValidityDays();
       } else {
-        setMaxLectureValidityDays((Integer)value);
+        setMaxLectureValidityDays((java.lang.Integer)value);
       }
       break;
 
@@ -586,7 +561,7 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
       if (value == null) {
         unsetMaxTransfers();
       } else {
-        setMaxTransfers((Integer)value);
+        setMaxTransfers((java.lang.Integer)value);
       }
       break;
 
@@ -594,7 +569,7 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
       if (value == null) {
         unsetMaxConnectionsPerTransfer();
       } else {
-        setMaxConnectionsPerTransfer((Integer)value);
+        setMaxConnectionsPerTransfer((java.lang.Integer)value);
       }
       break;
 
@@ -602,7 +577,7 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
       if (value == null) {
         unsetMaxLocationsPerLecture();
       } else {
-        setMaxLocationsPerLecture((Integer)value);
+        setMaxLocationsPerLecture((java.lang.Integer)value);
       }
       break;
 
@@ -610,7 +585,7 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
       if (value == null) {
         unsetAllowLoginByDefault();
       } else {
-        setAllowLoginByDefault((Boolean)value);
+        setAllowLoginByDefault((java.lang.Boolean)value);
       }
       break;
 
@@ -626,14 +601,15 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
       if (value == null) {
         unsetAllowStudentDownload();
       } else {
-        setAllowStudentDownload((Boolean)value);
+        setAllowStudentDownload((java.lang.Boolean)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case PAGE_SIZE:
       return getPageSize();
@@ -669,13 +645,13 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
       return isAllowStudentDownload();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -702,13 +678,11 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
     case ALLOW_STUDENT_DOWNLOAD:
       return isSetAllowStudentDownload();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
+  public boolean equals(java.lang.Object that) {
     if (that instanceof SatelliteConfig)
       return this.equals((SatelliteConfig)that);
     return false;
@@ -717,6 +691,8 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
   public boolean equals(SatelliteConfig that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_pageSize = true;
     boolean that_present_pageSize = true;
@@ -822,64 +798,47 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_pageSize = true;
-    list.add(present_pageSize);
-    if (present_pageSize)
-      list.add(pageSize);
-
-    boolean present_defaultImagePermissions = true && (isSetDefaultImagePermissions());
-    list.add(present_defaultImagePermissions);
-    if (present_defaultImagePermissions)
-      list.add(defaultImagePermissions);
-
-    boolean present_defaultLecturePermissions = true && (isSetDefaultLecturePermissions());
-    list.add(present_defaultLecturePermissions);
-    if (present_defaultLecturePermissions)
-      list.add(defaultLecturePermissions);
-
-    boolean present_maxImageValidityDays = true;
-    list.add(present_maxImageValidityDays);
-    if (present_maxImageValidityDays)
-      list.add(maxImageValidityDays);
-
-    boolean present_maxLectureValidityDays = true;
-    list.add(present_maxLectureValidityDays);
-    if (present_maxLectureValidityDays)
-      list.add(maxLectureValidityDays);
-
-    boolean present_maxTransfers = true && (isSetMaxTransfers());
-    list.add(present_maxTransfers);
-    if (present_maxTransfers)
-      list.add(maxTransfers);
-
-    boolean present_maxConnectionsPerTransfer = true && (isSetMaxConnectionsPerTransfer());
-    list.add(present_maxConnectionsPerTransfer);
-    if (present_maxConnectionsPerTransfer)
-      list.add(maxConnectionsPerTransfer);
-
-    boolean present_maxLocationsPerLecture = true && (isSetMaxLocationsPerLecture());
-    list.add(present_maxLocationsPerLecture);
-    if (present_maxLocationsPerLecture)
-      list.add(maxLocationsPerLecture);
-
-    boolean present_allowLoginByDefault = true && (isSetAllowLoginByDefault());
-    list.add(present_allowLoginByDefault);
-    if (present_allowLoginByDefault)
-      list.add(allowLoginByDefault);
-
-    boolean present_serverSideCopy = true && (isSetServerSideCopy());
-    list.add(present_serverSideCopy);
-    if (present_serverSideCopy)
-      list.add(serverSideCopy.getValue());
-
-    boolean present_allowStudentDownload = true && (isSetAllowStudentDownload());
-    list.add(present_allowStudentDownload);
-    if (present_allowStudentDownload)
-      list.add(allowStudentDownload);
-
-    return list.hashCode();
+    int hashCode = 1;
+
+    hashCode = hashCode * 8191 + pageSize;
+
+    hashCode = hashCode * 8191 + ((isSetDefaultImagePermissions()) ? 131071 : 524287);
+    if (isSetDefaultImagePermissions())
+      hashCode = hashCode * 8191 + defaultImagePermissions.hashCode();
+
+    hashCode = hashCode * 8191 + ((isSetDefaultLecturePermissions()) ? 131071 : 524287);
+    if (isSetDefaultLecturePermissions())
+      hashCode = hashCode * 8191 + defaultLecturePermissions.hashCode();
+
+    hashCode = hashCode * 8191 + maxImageValidityDays;
+
+    hashCode = hashCode * 8191 + maxLectureValidityDays;
+
+    hashCode = hashCode * 8191 + ((isSetMaxTransfers()) ? 131071 : 524287);
+    if (isSetMaxTransfers())
+      hashCode = hashCode * 8191 + maxTransfers;
+
+    hashCode = hashCode * 8191 + ((isSetMaxConnectionsPerTransfer()) ? 131071 : 524287);
+    if (isSetMaxConnectionsPerTransfer())
+      hashCode = hashCode * 8191 + maxConnectionsPerTransfer;
+
+    hashCode = hashCode * 8191 + ((isSetMaxLocationsPerLecture()) ? 131071 : 524287);
+    if (isSetMaxLocationsPerLecture())
+      hashCode = hashCode * 8191 + maxLocationsPerLecture;
+
+    hashCode = hashCode * 8191 + ((isSetAllowLoginByDefault()) ? 131071 : 524287);
+    if (isSetAllowLoginByDefault())
+      hashCode = hashCode * 8191 + ((allowLoginByDefault) ? 131071 : 524287);
+
+    hashCode = hashCode * 8191 + ((isSetServerSideCopy()) ? 131071 : 524287);
+    if (isSetServerSideCopy())
+      hashCode = hashCode * 8191 + serverSideCopy.getValue();
+
+    hashCode = hashCode * 8191 + ((isSetAllowStudentDownload()) ? 131071 : 524287);
+    if (isSetAllowStudentDownload())
+      hashCode = hashCode * 8191 + ((allowStudentDownload) ? 131071 : 524287);
+
+    return hashCode;
   }
 
   @Override
@@ -890,7 +849,7 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetPageSize()).compareTo(other.isSetPageSize());
+    lastComparison = java.lang.Boolean.compare(isSetPageSize(), other.isSetPageSize());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -900,7 +859,7 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetDefaultImagePermissions()).compareTo(other.isSetDefaultImagePermissions());
+    lastComparison = java.lang.Boolean.compare(isSetDefaultImagePermissions(), other.isSetDefaultImagePermissions());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -910,7 +869,7 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetDefaultLecturePermissions()).compareTo(other.isSetDefaultLecturePermissions());
+    lastComparison = java.lang.Boolean.compare(isSetDefaultLecturePermissions(), other.isSetDefaultLecturePermissions());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -920,7 +879,7 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMaxImageValidityDays()).compareTo(other.isSetMaxImageValidityDays());
+    lastComparison = java.lang.Boolean.compare(isSetMaxImageValidityDays(), other.isSetMaxImageValidityDays());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -930,7 +889,7 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMaxLectureValidityDays()).compareTo(other.isSetMaxLectureValidityDays());
+    lastComparison = java.lang.Boolean.compare(isSetMaxLectureValidityDays(), other.isSetMaxLectureValidityDays());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -940,7 +899,7 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMaxTransfers()).compareTo(other.isSetMaxTransfers());
+    lastComparison = java.lang.Boolean.compare(isSetMaxTransfers(), other.isSetMaxTransfers());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -950,7 +909,7 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMaxConnectionsPerTransfer()).compareTo(other.isSetMaxConnectionsPerTransfer());
+    lastComparison = java.lang.Boolean.compare(isSetMaxConnectionsPerTransfer(), other.isSetMaxConnectionsPerTransfer());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -960,7 +919,7 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMaxLocationsPerLecture()).compareTo(other.isSetMaxLocationsPerLecture());
+    lastComparison = java.lang.Boolean.compare(isSetMaxLocationsPerLecture(), other.isSetMaxLocationsPerLecture());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -970,7 +929,7 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetAllowLoginByDefault()).compareTo(other.isSetAllowLoginByDefault());
+    lastComparison = java.lang.Boolean.compare(isSetAllowLoginByDefault(), other.isSetAllowLoginByDefault());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -980,7 +939,7 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetServerSideCopy()).compareTo(other.isSetServerSideCopy());
+    lastComparison = java.lang.Boolean.compare(isSetServerSideCopy(), other.isSetServerSideCopy());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -990,7 +949,7 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetAllowStudentDownload()).compareTo(other.isSetAllowStudentDownload());
+    lastComparison = java.lang.Boolean.compare(isSetAllowStudentDownload(), other.isSetAllowStudentDownload());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -1003,21 +962,22 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
     return 0;
   }
 
+  @org.apache.thrift.annotation.Nullable
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("SatelliteConfig(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("SatelliteConfig(");
     boolean first = true;
 
     sb.append("pageSize:");
@@ -1110,7 +1070,7 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -1120,13 +1080,13 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
     }
   }
 
-  private static class SatelliteConfigStandardSchemeFactory implements SchemeFactory {
+  private static class SatelliteConfigStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public SatelliteConfigStandardScheme getScheme() {
       return new SatelliteConfigStandardScheme();
     }
   }
 
-  private static class SatelliteConfigStandardScheme extends StandardScheme<SatelliteConfig> {
+  private static class SatelliteConfigStandardScheme extends org.apache.thrift.scheme.StandardScheme<SatelliteConfig> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, SatelliteConfig struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -1300,18 +1260,18 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
 
   }
 
-  private static class SatelliteConfigTupleSchemeFactory implements SchemeFactory {
+  private static class SatelliteConfigTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public SatelliteConfigTupleScheme getScheme() {
       return new SatelliteConfigTupleScheme();
     }
   }
 
-  private static class SatelliteConfigTupleScheme extends TupleScheme<SatelliteConfig> {
+  private static class SatelliteConfigTupleScheme extends org.apache.thrift.scheme.TupleScheme<SatelliteConfig> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, SatelliteConfig struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetPageSize()) {
         optionals.set(0);
       }
@@ -1383,8 +1343,8 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, SatelliteConfig struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(11);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(11);
       if (incoming.get(0)) {
         struct.pageSize = iprot.readI32();
         struct.setPageSizeIsSet(true);
@@ -1434,5 +1394,8 @@ public class SatelliteConfig implements org.apache.thrift.TBase<SatelliteConfig,
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/SatelliteServer.java b/src/main/java/org/openslx/bwlp/thrift/iface/SatelliteServer.java
index 517614e..c81df2c 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/SatelliteServer.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/SatelliteServer.java
@@ -1,227 +1,200 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.openslx.bwlp.thrift.iface;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2018-11-23")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
 public class SatelliteServer {
 
   public interface Iface {
 
     public long getVersion(long clientVersion) throws org.apache.thrift.TException;
 
-    public String getSupportedFeatures() throws org.apache.thrift.TException;
+    public java.lang.String getSupportedFeatures() throws org.apache.thrift.TException;
 
     public SatelliteConfig getConfiguration() throws org.apache.thrift.TException;
 
-    public TransferInformation requestImageVersionUpload(String userToken, String imageBaseId, long fileSize, List<ByteBuffer> blockHashes, ByteBuffer machineDescription) throws TTransferRejectedException, TAuthorizationException, TInvocationException, TNotFoundException, org.apache.thrift.TException;
+    public TransferInformation requestImageVersionUpload(java.lang.String userToken, java.lang.String imageBaseId, long fileSize, java.util.List<java.nio.ByteBuffer> blockHashes, java.nio.ByteBuffer machineDescription) throws TTransferRejectedException, TAuthorizationException, TInvocationException, TNotFoundException, org.apache.thrift.TException;
 
-    public void updateBlockHashes(String uploadToken, List<ByteBuffer> blockHashes, String userToken) throws TInvalidTokenException, org.apache.thrift.TException;
+    public void updateBlockHashes(java.lang.String uploadToken, java.util.List<java.nio.ByteBuffer> blockHashes, java.lang.String userToken) throws TInvalidTokenException, org.apache.thrift.TException;
 
-    public UploadOptions setUploadOptions(String userToken, String uploadToken, UploadOptions options) throws TAuthorizationException, TInvalidTokenException, org.apache.thrift.TException;
+    public UploadOptions setUploadOptions(java.lang.String userToken, java.lang.String uploadToken, UploadOptions options) throws TAuthorizationException, TInvalidTokenException, org.apache.thrift.TException;
 
-    public void cancelUpload(String uploadToken) throws TInvalidTokenException, org.apache.thrift.TException;
+    public void cancelUpload(java.lang.String uploadToken) throws TInvalidTokenException, org.apache.thrift.TException;
 
-    public TransferStatus queryUploadStatus(String uploadToken) throws TInvalidTokenException, org.apache.thrift.TException;
+    public TransferStatus queryUploadStatus(java.lang.String uploadToken) throws TInvalidTokenException, org.apache.thrift.TException;
 
-    public TransferInformation requestDownload(String userToken, String imageVersionId) throws TTransferRejectedException, TAuthorizationException, TInvocationException, TNotFoundException, org.apache.thrift.TException;
+    public TransferInformation requestDownload(java.lang.String userToken, java.lang.String imageVersionId) throws TTransferRejectedException, TAuthorizationException, TInvocationException, TNotFoundException, org.apache.thrift.TException;
 
-    public void cancelDownload(String downloadToken) throws TInvalidTokenException, org.apache.thrift.TException;
+    public void cancelDownload(java.lang.String downloadToken) throws TInvalidTokenException, org.apache.thrift.TException;
 
-    public void isAuthenticated(String userToken) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException;
+    public void isAuthenticated(java.lang.String userToken) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException;
 
-    public WhoamiInfo whoami(String userToken) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException;
+    public WhoamiInfo whoami(java.lang.String userToken) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException;
 
-    public void invalidateSession(String userToken) throws TInvalidTokenException, org.apache.thrift.TException;
+    public void invalidateSession(java.lang.String userToken) throws TInvalidTokenException, org.apache.thrift.TException;
 
-    public List<UserInfo> getUserList(String userToken, int page) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException;
+    public java.util.List<UserInfo> getUserList(java.lang.String userToken, int page) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException;
 
-    public SatelliteUserConfig getUserConfig(String userToken) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException;
+    public SatelliteUserConfig getUserConfig(java.lang.String userToken) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException;
 
-    public void setUserConfig(String userToken, SatelliteUserConfig config) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException;
+    public void setUserConfig(java.lang.String userToken, SatelliteUserConfig config) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException;
 
-    public List<OperatingSystem> getOperatingSystems() throws org.apache.thrift.TException;
+    public java.util.List<OperatingSystem> getOperatingSystems() throws org.apache.thrift.TException;
 
-    public List<Virtualizer> getVirtualizers() throws org.apache.thrift.TException;
+    public java.util.List<Virtualizer> getVirtualizers() throws org.apache.thrift.TException;
 
-    public List<Organization> getAllOrganizations() throws org.apache.thrift.TException;
+    public java.util.List<Organization> getAllOrganizations() throws org.apache.thrift.TException;
 
-    public List<Location> getLocations() throws org.apache.thrift.TException;
+    public java.util.List<Location> getLocations() throws org.apache.thrift.TException;
 
     public SatelliteStatus getStatus() throws org.apache.thrift.TException;
 
-    public List<ImageSummaryRead> getImageList(String userToken, List<String> tagSearch, int page) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException;
+    public java.util.List<ImageSummaryRead> getImageList(java.lang.String userToken, java.util.List<java.lang.String> tagSearch, int page) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException;
 
-    public ImageDetailsRead getImageDetails(String userToken, String imageBaseId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException;
+    public ImageDetailsRead getImageDetails(java.lang.String userToken, java.lang.String imageBaseId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException;
 
-    public String createImage(String userToken, String imageName) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException;
+    public java.lang.String createImage(java.lang.String userToken, java.lang.String imageName) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException;
 
-    public void updateImageBase(String userToken, String imageBaseId, ImageBaseWrite image) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException;
+    public void updateImageBase(java.lang.String userToken, java.lang.String imageBaseId, ImageBaseWrite image) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException;
 
-    public void updateImageVersion(String userToken, String imageVersionId, ImageVersionWrite image) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException;
+    public void updateImageVersion(java.lang.String userToken, java.lang.String imageVersionId, ImageVersionWrite image) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException;
 
-    public void deleteImageVersion(String userToken, String imageVersionId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException;
+    public void deleteImageVersion(java.lang.String userToken, java.lang.String imageVersionId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException;
 
-    public void deleteImageBase(String userToken, String imageBaseId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException;
+    public void deleteImageBase(java.lang.String userToken, java.lang.String imageBaseId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException;
 
-    public void writeImagePermissions(String userToken, String imageBaseId, Map<String,ImagePermissions> permissions) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException;
+    public void writeImagePermissions(java.lang.String userToken, java.lang.String imageBaseId, java.util.Map<java.lang.String,ImagePermissions> permissions) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException;
 
-    public Map<String,ImagePermissions> getImagePermissions(String userToken, String imageBaseId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException;
+    public java.util.Map<java.lang.String,ImagePermissions> getImagePermissions(java.lang.String userToken, java.lang.String imageBaseId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException;
 
-    public void setImageOwner(String userToken, String imageBaseId, String newOwnerId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException;
+    public void setImageOwner(java.lang.String userToken, java.lang.String imageBaseId, java.lang.String newOwnerId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException;
 
-    public void setImageVersionExpiry(String userToken, String imageBaseId, long expireTime) throws TAuthorizationException, TNotFoundException, TInvocationException, TInvalidDateParam, org.apache.thrift.TException;
+    public void setImageVersionExpiry(java.lang.String userToken, java.lang.String imageBaseId, long expireTime) throws TAuthorizationException, TNotFoundException, TInvocationException, TInvalidDateParam, org.apache.thrift.TException;
 
-    public ByteBuffer getImageVersionVirtConfig(String userToken, String imageVersionId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException;
+    public java.nio.ByteBuffer getImageVersionVirtConfig(java.lang.String userToken, java.lang.String imageVersionId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException;
 
-    public void setImageVersionVirtConfig(String userToken, String imageVersionId, ByteBuffer meta) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException;
+    public void setImageVersionVirtConfig(java.lang.String userToken, java.lang.String imageVersionId, java.nio.ByteBuffer meta) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException;
 
-    public String requestImageReplication(String userToken, String imageVersionId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException;
+    public java.lang.String requestImageReplication(java.lang.String userToken, java.lang.String imageVersionId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException;
 
-    public String publishImageVersion(String userToken, String imageVersionId) throws TAuthorizationException, TNotFoundException, TInvocationException, TTransferRejectedException, org.apache.thrift.TException;
+    public java.lang.String publishImageVersion(java.lang.String userToken, java.lang.String imageVersionId) throws TAuthorizationException, TNotFoundException, TInvocationException, TTransferRejectedException, org.apache.thrift.TException;
 
-    public String createLecture(String userToken, LectureWrite lecture) throws TAuthorizationException, TInvocationException, TInvalidDateParam, TNotFoundException, org.apache.thrift.TException;
+    public java.lang.String createLecture(java.lang.String userToken, LectureWrite lecture) throws TAuthorizationException, TInvocationException, TInvalidDateParam, TNotFoundException, org.apache.thrift.TException;
 
-    public void updateLecture(String userToken, String lectureId, LectureWrite lecture) throws TAuthorizationException, TNotFoundException, TInvocationException, TInvalidDateParam, org.apache.thrift.TException;
+    public void updateLecture(java.lang.String userToken, java.lang.String lectureId, LectureWrite lecture) throws TAuthorizationException, TNotFoundException, TInvocationException, TInvalidDateParam, org.apache.thrift.TException;
 
-    public List<LectureSummary> getLectureList(String userToken, int page) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException;
+    public java.util.List<LectureSummary> getLectureList(java.lang.String userToken, int page) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException;
 
-    public LectureRead getLectureDetails(String userToken, String lectureId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException;
+    public LectureRead getLectureDetails(java.lang.String userToken, java.lang.String lectureId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException;
 
-    public void deleteLecture(String userToken, String lectureId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException;
+    public void deleteLecture(java.lang.String userToken, java.lang.String lectureId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException;
 
-    public void writeLecturePermissions(String userToken, String lectureId, Map<String,LecturePermissions> permissions) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException;
+    public void writeLecturePermissions(java.lang.String userToken, java.lang.String lectureId, java.util.Map<java.lang.String,LecturePermissions> permissions) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException;
 
-    public Map<String,LecturePermissions> getLecturePermissions(String userToken, String lectureId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException;
+    public java.util.Map<java.lang.String,LecturePermissions> getLecturePermissions(java.lang.String userToken, java.lang.String lectureId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException;
 
-    public void setLectureOwner(String userToken, String lectureId, String newOwnerId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException;
+    public void setLectureOwner(java.lang.String userToken, java.lang.String lectureId, java.lang.String newOwnerId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException;
 
-    public PredefinedData getPredefinedData(String userToken) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException;
+    public PredefinedData getPredefinedData(java.lang.String userToken) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException;
 
   }
 
   public interface AsyncIface {
 
-    public void getVersion(long clientVersion, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void getVersion(long clientVersion, org.apache.thrift.async.AsyncMethodCallback<java.lang.Long> resultHandler) throws org.apache.thrift.TException;
 
-    public void getSupportedFeatures(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void getSupportedFeatures(org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException;
 
-    public void getConfiguration(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void getConfiguration(org.apache.thrift.async.AsyncMethodCallback<SatelliteConfig> resultHandler) throws org.apache.thrift.TException;
 
-    public void requestImageVersionUpload(String userToken, String imageBaseId, long fileSize, List<ByteBuffer> blockHashes, ByteBuffer machineDescription, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void requestImageVersionUpload(java.lang.String userToken, java.lang.String imageBaseId, long fileSize, java.util.List<java.nio.ByteBuffer> blockHashes, java.nio.ByteBuffer machineDescription, org.apache.thrift.async.AsyncMethodCallback<TransferInformation> resultHandler) throws org.apache.thrift.TException;
 
-    public void updateBlockHashes(String uploadToken, List<ByteBuffer> blockHashes, String userToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void updateBlockHashes(java.lang.String uploadToken, java.util.List<java.nio.ByteBuffer> blockHashes, java.lang.String userToken, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
 
-    public void setUploadOptions(String userToken, String uploadToken, UploadOptions options, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void setUploadOptions(java.lang.String userToken, java.lang.String uploadToken, UploadOptions options, org.apache.thrift.async.AsyncMethodCallback<UploadOptions> resultHandler) throws org.apache.thrift.TException;
 
-    public void cancelUpload(String uploadToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void cancelUpload(java.lang.String uploadToken, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
 
-    public void queryUploadStatus(String uploadToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void queryUploadStatus(java.lang.String uploadToken, org.apache.thrift.async.AsyncMethodCallback<TransferStatus> resultHandler) throws org.apache.thrift.TException;
 
-    public void requestDownload(String userToken, String imageVersionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void requestDownload(java.lang.String userToken, java.lang.String imageVersionId, org.apache.thrift.async.AsyncMethodCallback<TransferInformation> resultHandler) throws org.apache.thrift.TException;
 
-    public void cancelDownload(String downloadToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void cancelDownload(java.lang.String downloadToken, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
 
-    public void isAuthenticated(String userToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void isAuthenticated(java.lang.String userToken, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
 
-    public void whoami(String userToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void whoami(java.lang.String userToken, org.apache.thrift.async.AsyncMethodCallback<WhoamiInfo> resultHandler) throws org.apache.thrift.TException;
 
-    public void invalidateSession(String userToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void invalidateSession(java.lang.String userToken, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
 
-    public void getUserList(String userToken, int page, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void getUserList(java.lang.String userToken, int page, org.apache.thrift.async.AsyncMethodCallback<java.util.List<UserInfo>> resultHandler) throws org.apache.thrift.TException;
 
-    public void getUserConfig(String userToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void getUserConfig(java.lang.String userToken, org.apache.thrift.async.AsyncMethodCallback<SatelliteUserConfig> resultHandler) throws org.apache.thrift.TException;
 
-    public void setUserConfig(String userToken, SatelliteUserConfig config, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void setUserConfig(java.lang.String userToken, SatelliteUserConfig config, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
 
-    public void getOperatingSystems(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void getOperatingSystems(org.apache.thrift.async.AsyncMethodCallback<java.util.List<OperatingSystem>> resultHandler) throws org.apache.thrift.TException;
 
-    public void getVirtualizers(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void getVirtualizers(org.apache.thrift.async.AsyncMethodCallback<java.util.List<Virtualizer>> resultHandler) throws org.apache.thrift.TException;
 
-    public void getAllOrganizations(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void getAllOrganizations(org.apache.thrift.async.AsyncMethodCallback<java.util.List<Organization>> resultHandler) throws org.apache.thrift.TException;
 
-    public void getLocations(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void getLocations(org.apache.thrift.async.AsyncMethodCallback<java.util.List<Location>> resultHandler) throws org.apache.thrift.TException;
 
-    public void getStatus(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void getStatus(org.apache.thrift.async.AsyncMethodCallback<SatelliteStatus> resultHandler) throws org.apache.thrift.TException;
 
-    public void getImageList(String userToken, List<String> tagSearch, int page, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void getImageList(java.lang.String userToken, java.util.List<java.lang.String> tagSearch, int page, org.apache.thrift.async.AsyncMethodCallback<java.util.List<ImageSummaryRead>> resultHandler) throws org.apache.thrift.TException;
 
-    public void getImageDetails(String userToken, String imageBaseId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void getImageDetails(java.lang.String userToken, java.lang.String imageBaseId, org.apache.thrift.async.AsyncMethodCallback<ImageDetailsRead> resultHandler) throws org.apache.thrift.TException;
 
-    public void createImage(String userToken, String imageName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void createImage(java.lang.String userToken, java.lang.String imageName, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException;
 
-    public void updateImageBase(String userToken, String imageBaseId, ImageBaseWrite image, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void updateImageBase(java.lang.String userToken, java.lang.String imageBaseId, ImageBaseWrite image, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
 
-    public void updateImageVersion(String userToken, String imageVersionId, ImageVersionWrite image, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void updateImageVersion(java.lang.String userToken, java.lang.String imageVersionId, ImageVersionWrite image, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
 
-    public void deleteImageVersion(String userToken, String imageVersionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void deleteImageVersion(java.lang.String userToken, java.lang.String imageVersionId, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
 
-    public void deleteImageBase(String userToken, String imageBaseId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void deleteImageBase(java.lang.String userToken, java.lang.String imageBaseId, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
 
-    public void writeImagePermissions(String userToken, String imageBaseId, Map<String,ImagePermissions> permissions, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void writeImagePermissions(java.lang.String userToken, java.lang.String imageBaseId, java.util.Map<java.lang.String,ImagePermissions> permissions, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
 
-    public void getImagePermissions(String userToken, String imageBaseId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void getImagePermissions(java.lang.String userToken, java.lang.String imageBaseId, org.apache.thrift.async.AsyncMethodCallback<java.util.Map<java.lang.String,ImagePermissions>> resultHandler) throws org.apache.thrift.TException;
 
-    public void setImageOwner(String userToken, String imageBaseId, String newOwnerId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void setImageOwner(java.lang.String userToken, java.lang.String imageBaseId, java.lang.String newOwnerId, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
 
-    public void setImageVersionExpiry(String userToken, String imageBaseId, long expireTime, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void setImageVersionExpiry(java.lang.String userToken, java.lang.String imageBaseId, long expireTime, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
 
-    public void getImageVersionVirtConfig(String userToken, String imageVersionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void getImageVersionVirtConfig(java.lang.String userToken, java.lang.String imageVersionId, org.apache.thrift.async.AsyncMethodCallback<java.nio.ByteBuffer> resultHandler) throws org.apache.thrift.TException;
 
-    public void setImageVersionVirtConfig(String userToken, String imageVersionId, ByteBuffer meta, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void setImageVersionVirtConfig(java.lang.String userToken, java.lang.String imageVersionId, java.nio.ByteBuffer meta, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
 
-    public void requestImageReplication(String userToken, String imageVersionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void requestImageReplication(java.lang.String userToken, java.lang.String imageVersionId, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException;
 
-    public void publishImageVersion(String userToken, String imageVersionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void publishImageVersion(java.lang.String userToken, java.lang.String imageVersionId, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException;
 
-    public void createLecture(String userToken, LectureWrite lecture, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void createLecture(java.lang.String userToken, LectureWrite lecture, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException;
 
-    public void updateLecture(String userToken, String lectureId, LectureWrite lecture, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void updateLecture(java.lang.String userToken, java.lang.String lectureId, LectureWrite lecture, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
 
-    public void getLectureList(String userToken, int page, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void getLectureList(java.lang.String userToken, int page, org.apache.thrift.async.AsyncMethodCallback<java.util.List<LectureSummary>> resultHandler) throws org.apache.thrift.TException;
 
-    public void getLectureDetails(String userToken, String lectureId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void getLectureDetails(java.lang.String userToken, java.lang.String lectureId, org.apache.thrift.async.AsyncMethodCallback<LectureRead> resultHandler) throws org.apache.thrift.TException;
 
-    public void deleteLecture(String userToken, String lectureId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void deleteLecture(java.lang.String userToken, java.lang.String lectureId, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
 
-    public void writeLecturePermissions(String userToken, String lectureId, Map<String,LecturePermissions> permissions, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void writeLecturePermissions(java.lang.String userToken, java.lang.String lectureId, java.util.Map<java.lang.String,LecturePermissions> permissions, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
 
-    public void getLecturePermissions(String userToken, String lectureId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void getLecturePermissions(java.lang.String userToken, java.lang.String lectureId, org.apache.thrift.async.AsyncMethodCallback<java.util.Map<java.lang.String,LecturePermissions>> resultHandler) throws org.apache.thrift.TException;
 
-    public void setLectureOwner(String userToken, String lectureId, String newOwnerId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void setLectureOwner(java.lang.String userToken, java.lang.String lectureId, java.lang.String newOwnerId, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
 
-    public void getPredefinedData(String userToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void getPredefinedData(java.lang.String userToken, org.apache.thrift.async.AsyncMethodCallback<PredefinedData> resultHandler) throws org.apache.thrift.TException;
 
   }
 
@@ -268,7 +241,7 @@ public class SatelliteServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getVersion failed: unknown result");
     }
 
-    public String getSupportedFeatures() throws org.apache.thrift.TException
+    public java.lang.String getSupportedFeatures() throws org.apache.thrift.TException
     {
       send_getSupportedFeatures();
       return recv_getSupportedFeatures();
@@ -280,7 +253,7 @@ public class SatelliteServer {
       sendBase("getSupportedFeatures", args);
     }
 
-    public String recv_getSupportedFeatures() throws org.apache.thrift.TException
+    public java.lang.String recv_getSupportedFeatures() throws org.apache.thrift.TException
     {
       getSupportedFeatures_result result = new getSupportedFeatures_result();
       receiveBase(result, "getSupportedFeatures");
@@ -312,13 +285,13 @@ public class SatelliteServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getConfiguration failed: unknown result");
     }
 
-    public TransferInformation requestImageVersionUpload(String userToken, String imageBaseId, long fileSize, List<ByteBuffer> blockHashes, ByteBuffer machineDescription) throws TTransferRejectedException, TAuthorizationException, TInvocationException, TNotFoundException, org.apache.thrift.TException
+    public TransferInformation requestImageVersionUpload(java.lang.String userToken, java.lang.String imageBaseId, long fileSize, java.util.List<java.nio.ByteBuffer> blockHashes, java.nio.ByteBuffer machineDescription) throws TTransferRejectedException, TAuthorizationException, TInvocationException, TNotFoundException, org.apache.thrift.TException
     {
       send_requestImageVersionUpload(userToken, imageBaseId, fileSize, blockHashes, machineDescription);
       return recv_requestImageVersionUpload();
     }
 
-    public void send_requestImageVersionUpload(String userToken, String imageBaseId, long fileSize, List<ByteBuffer> blockHashes, ByteBuffer machineDescription) throws org.apache.thrift.TException
+    public void send_requestImageVersionUpload(java.lang.String userToken, java.lang.String imageBaseId, long fileSize, java.util.List<java.nio.ByteBuffer> blockHashes, java.nio.ByteBuffer machineDescription) throws org.apache.thrift.TException
     {
       requestImageVersionUpload_args args = new requestImageVersionUpload_args();
       args.setUserToken(userToken);
@@ -351,13 +324,13 @@ public class SatelliteServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "requestImageVersionUpload failed: unknown result");
     }
 
-    public void updateBlockHashes(String uploadToken, List<ByteBuffer> blockHashes, String userToken) throws TInvalidTokenException, org.apache.thrift.TException
+    public void updateBlockHashes(java.lang.String uploadToken, java.util.List<java.nio.ByteBuffer> blockHashes, java.lang.String userToken) throws TInvalidTokenException, org.apache.thrift.TException
     {
       send_updateBlockHashes(uploadToken, blockHashes, userToken);
       recv_updateBlockHashes();
     }
 
-    public void send_updateBlockHashes(String uploadToken, List<ByteBuffer> blockHashes, String userToken) throws org.apache.thrift.TException
+    public void send_updateBlockHashes(java.lang.String uploadToken, java.util.List<java.nio.ByteBuffer> blockHashes, java.lang.String userToken) throws org.apache.thrift.TException
     {
       updateBlockHashes_args args = new updateBlockHashes_args();
       args.setUploadToken(uploadToken);
@@ -376,13 +349,13 @@ public class SatelliteServer {
       return;
     }
 
-    public UploadOptions setUploadOptions(String userToken, String uploadToken, UploadOptions options) throws TAuthorizationException, TInvalidTokenException, org.apache.thrift.TException
+    public UploadOptions setUploadOptions(java.lang.String userToken, java.lang.String uploadToken, UploadOptions options) throws TAuthorizationException, TInvalidTokenException, org.apache.thrift.TException
     {
       send_setUploadOptions(userToken, uploadToken, options);
       return recv_setUploadOptions();
     }
 
-    public void send_setUploadOptions(String userToken, String uploadToken, UploadOptions options) throws org.apache.thrift.TException
+    public void send_setUploadOptions(java.lang.String userToken, java.lang.String uploadToken, UploadOptions options) throws org.apache.thrift.TException
     {
       setUploadOptions_args args = new setUploadOptions_args();
       args.setUserToken(userToken);
@@ -407,13 +380,13 @@ public class SatelliteServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "setUploadOptions failed: unknown result");
     }
 
-    public void cancelUpload(String uploadToken) throws TInvalidTokenException, org.apache.thrift.TException
+    public void cancelUpload(java.lang.String uploadToken) throws TInvalidTokenException, org.apache.thrift.TException
     {
       send_cancelUpload(uploadToken);
       recv_cancelUpload();
     }
 
-    public void send_cancelUpload(String uploadToken) throws org.apache.thrift.TException
+    public void send_cancelUpload(java.lang.String uploadToken) throws org.apache.thrift.TException
     {
       cancelUpload_args args = new cancelUpload_args();
       args.setUploadToken(uploadToken);
@@ -430,13 +403,13 @@ public class SatelliteServer {
       return;
     }
 
-    public TransferStatus queryUploadStatus(String uploadToken) throws TInvalidTokenException, org.apache.thrift.TException
+    public TransferStatus queryUploadStatus(java.lang.String uploadToken) throws TInvalidTokenException, org.apache.thrift.TException
     {
       send_queryUploadStatus(uploadToken);
       return recv_queryUploadStatus();
     }
 
-    public void send_queryUploadStatus(String uploadToken) throws org.apache.thrift.TException
+    public void send_queryUploadStatus(java.lang.String uploadToken) throws org.apache.thrift.TException
     {
       queryUploadStatus_args args = new queryUploadStatus_args();
       args.setUploadToken(uploadToken);
@@ -456,13 +429,13 @@ public class SatelliteServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "queryUploadStatus failed: unknown result");
     }
 
-    public TransferInformation requestDownload(String userToken, String imageVersionId) throws TTransferRejectedException, TAuthorizationException, TInvocationException, TNotFoundException, org.apache.thrift.TException
+    public TransferInformation requestDownload(java.lang.String userToken, java.lang.String imageVersionId) throws TTransferRejectedException, TAuthorizationException, TInvocationException, TNotFoundException, org.apache.thrift.TException
     {
       send_requestDownload(userToken, imageVersionId);
       return recv_requestDownload();
     }
 
-    public void send_requestDownload(String userToken, String imageVersionId) throws org.apache.thrift.TException
+    public void send_requestDownload(java.lang.String userToken, java.lang.String imageVersionId) throws org.apache.thrift.TException
     {
       requestDownload_args args = new requestDownload_args();
       args.setUserToken(userToken);
@@ -492,13 +465,13 @@ public class SatelliteServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "requestDownload failed: unknown result");
     }
 
-    public void cancelDownload(String downloadToken) throws TInvalidTokenException, org.apache.thrift.TException
+    public void cancelDownload(java.lang.String downloadToken) throws TInvalidTokenException, org.apache.thrift.TException
     {
       send_cancelDownload(downloadToken);
       recv_cancelDownload();
     }
 
-    public void send_cancelDownload(String downloadToken) throws org.apache.thrift.TException
+    public void send_cancelDownload(java.lang.String downloadToken) throws org.apache.thrift.TException
     {
       cancelDownload_args args = new cancelDownload_args();
       args.setDownloadToken(downloadToken);
@@ -515,13 +488,13 @@ public class SatelliteServer {
       return;
     }
 
-    public void isAuthenticated(String userToken) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException
+    public void isAuthenticated(java.lang.String userToken) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException
     {
       send_isAuthenticated(userToken);
       recv_isAuthenticated();
     }
 
-    public void send_isAuthenticated(String userToken) throws org.apache.thrift.TException
+    public void send_isAuthenticated(java.lang.String userToken) throws org.apache.thrift.TException
     {
       isAuthenticated_args args = new isAuthenticated_args();
       args.setUserToken(userToken);
@@ -541,13 +514,13 @@ public class SatelliteServer {
       return;
     }
 
-    public WhoamiInfo whoami(String userToken) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException
+    public WhoamiInfo whoami(java.lang.String userToken) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException
     {
       send_whoami(userToken);
       return recv_whoami();
     }
 
-    public void send_whoami(String userToken) throws org.apache.thrift.TException
+    public void send_whoami(java.lang.String userToken) throws org.apache.thrift.TException
     {
       whoami_args args = new whoami_args();
       args.setUserToken(userToken);
@@ -570,13 +543,13 @@ public class SatelliteServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "whoami failed: unknown result");
     }
 
-    public void invalidateSession(String userToken) throws TInvalidTokenException, org.apache.thrift.TException
+    public void invalidateSession(java.lang.String userToken) throws TInvalidTokenException, org.apache.thrift.TException
     {
       send_invalidateSession(userToken);
       recv_invalidateSession();
     }
 
-    public void send_invalidateSession(String userToken) throws org.apache.thrift.TException
+    public void send_invalidateSession(java.lang.String userToken) throws org.apache.thrift.TException
     {
       invalidateSession_args args = new invalidateSession_args();
       args.setUserToken(userToken);
@@ -593,13 +566,13 @@ public class SatelliteServer {
       return;
     }
 
-    public List<UserInfo> getUserList(String userToken, int page) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException
+    public java.util.List<UserInfo> getUserList(java.lang.String userToken, int page) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException
     {
       send_getUserList(userToken, page);
       return recv_getUserList();
     }
 
-    public void send_getUserList(String userToken, int page) throws org.apache.thrift.TException
+    public void send_getUserList(java.lang.String userToken, int page) throws org.apache.thrift.TException
     {
       getUserList_args args = new getUserList_args();
       args.setUserToken(userToken);
@@ -607,7 +580,7 @@ public class SatelliteServer {
       sendBase("getUserList", args);
     }
 
-    public List<UserInfo> recv_getUserList() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException
+    public java.util.List<UserInfo> recv_getUserList() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException
     {
       getUserList_result result = new getUserList_result();
       receiveBase(result, "getUserList");
@@ -623,13 +596,13 @@ public class SatelliteServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getUserList failed: unknown result");
     }
 
-    public SatelliteUserConfig getUserConfig(String userToken) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException
+    public SatelliteUserConfig getUserConfig(java.lang.String userToken) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException
     {
       send_getUserConfig(userToken);
       return recv_getUserConfig();
     }
 
-    public void send_getUserConfig(String userToken) throws org.apache.thrift.TException
+    public void send_getUserConfig(java.lang.String userToken) throws org.apache.thrift.TException
     {
       getUserConfig_args args = new getUserConfig_args();
       args.setUserToken(userToken);
@@ -652,13 +625,13 @@ public class SatelliteServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getUserConfig failed: unknown result");
     }
 
-    public void setUserConfig(String userToken, SatelliteUserConfig config) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException
+    public void setUserConfig(java.lang.String userToken, SatelliteUserConfig config) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException
     {
       send_setUserConfig(userToken, config);
       recv_setUserConfig();
     }
 
-    public void send_setUserConfig(String userToken, SatelliteUserConfig config) throws org.apache.thrift.TException
+    public void send_setUserConfig(java.lang.String userToken, SatelliteUserConfig config) throws org.apache.thrift.TException
     {
       setUserConfig_args args = new setUserConfig_args();
       args.setUserToken(userToken);
@@ -679,7 +652,7 @@ public class SatelliteServer {
       return;
     }
 
-    public List<OperatingSystem> getOperatingSystems() throws org.apache.thrift.TException
+    public java.util.List<OperatingSystem> getOperatingSystems() throws org.apache.thrift.TException
     {
       send_getOperatingSystems();
       return recv_getOperatingSystems();
@@ -691,7 +664,7 @@ public class SatelliteServer {
       sendBase("getOperatingSystems", args);
     }
 
-    public List<OperatingSystem> recv_getOperatingSystems() throws org.apache.thrift.TException
+    public java.util.List<OperatingSystem> recv_getOperatingSystems() throws org.apache.thrift.TException
     {
       getOperatingSystems_result result = new getOperatingSystems_result();
       receiveBase(result, "getOperatingSystems");
@@ -701,7 +674,7 @@ public class SatelliteServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getOperatingSystems failed: unknown result");
     }
 
-    public List<Virtualizer> getVirtualizers() throws org.apache.thrift.TException
+    public java.util.List<Virtualizer> getVirtualizers() throws org.apache.thrift.TException
     {
       send_getVirtualizers();
       return recv_getVirtualizers();
@@ -713,7 +686,7 @@ public class SatelliteServer {
       sendBase("getVirtualizers", args);
     }
 
-    public List<Virtualizer> recv_getVirtualizers() throws org.apache.thrift.TException
+    public java.util.List<Virtualizer> recv_getVirtualizers() throws org.apache.thrift.TException
     {
       getVirtualizers_result result = new getVirtualizers_result();
       receiveBase(result, "getVirtualizers");
@@ -723,7 +696,7 @@ public class SatelliteServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getVirtualizers failed: unknown result");
     }
 
-    public List<Organization> getAllOrganizations() throws org.apache.thrift.TException
+    public java.util.List<Organization> getAllOrganizations() throws org.apache.thrift.TException
     {
       send_getAllOrganizations();
       return recv_getAllOrganizations();
@@ -735,7 +708,7 @@ public class SatelliteServer {
       sendBase("getAllOrganizations", args);
     }
 
-    public List<Organization> recv_getAllOrganizations() throws org.apache.thrift.TException
+    public java.util.List<Organization> recv_getAllOrganizations() throws org.apache.thrift.TException
     {
       getAllOrganizations_result result = new getAllOrganizations_result();
       receiveBase(result, "getAllOrganizations");
@@ -745,7 +718,7 @@ public class SatelliteServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getAllOrganizations failed: unknown result");
     }
 
-    public List<Location> getLocations() throws org.apache.thrift.TException
+    public java.util.List<Location> getLocations() throws org.apache.thrift.TException
     {
       send_getLocations();
       return recv_getLocations();
@@ -757,7 +730,7 @@ public class SatelliteServer {
       sendBase("getLocations", args);
     }
 
-    public List<Location> recv_getLocations() throws org.apache.thrift.TException
+    public java.util.List<Location> recv_getLocations() throws org.apache.thrift.TException
     {
       getLocations_result result = new getLocations_result();
       receiveBase(result, "getLocations");
@@ -789,13 +762,13 @@ public class SatelliteServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getStatus failed: unknown result");
     }
 
-    public List<ImageSummaryRead> getImageList(String userToken, List<String> tagSearch, int page) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException
+    public java.util.List<ImageSummaryRead> getImageList(java.lang.String userToken, java.util.List<java.lang.String> tagSearch, int page) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException
     {
       send_getImageList(userToken, tagSearch, page);
       return recv_getImageList();
     }
 
-    public void send_getImageList(String userToken, List<String> tagSearch, int page) throws org.apache.thrift.TException
+    public void send_getImageList(java.lang.String userToken, java.util.List<java.lang.String> tagSearch, int page) throws org.apache.thrift.TException
     {
       getImageList_args args = new getImageList_args();
       args.setUserToken(userToken);
@@ -804,7 +777,7 @@ public class SatelliteServer {
       sendBase("getImageList", args);
     }
 
-    public List<ImageSummaryRead> recv_getImageList() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException
+    public java.util.List<ImageSummaryRead> recv_getImageList() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException
     {
       getImageList_result result = new getImageList_result();
       receiveBase(result, "getImageList");
@@ -820,13 +793,13 @@ public class SatelliteServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getImageList failed: unknown result");
     }
 
-    public ImageDetailsRead getImageDetails(String userToken, String imageBaseId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException
+    public ImageDetailsRead getImageDetails(java.lang.String userToken, java.lang.String imageBaseId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException
     {
       send_getImageDetails(userToken, imageBaseId);
       return recv_getImageDetails();
     }
 
-    public void send_getImageDetails(String userToken, String imageBaseId) throws org.apache.thrift.TException
+    public void send_getImageDetails(java.lang.String userToken, java.lang.String imageBaseId) throws org.apache.thrift.TException
     {
       getImageDetails_args args = new getImageDetails_args();
       args.setUserToken(userToken);
@@ -853,13 +826,13 @@ public class SatelliteServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getImageDetails failed: unknown result");
     }
 
-    public String createImage(String userToken, String imageName) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException
+    public java.lang.String createImage(java.lang.String userToken, java.lang.String imageName) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException
     {
       send_createImage(userToken, imageName);
       return recv_createImage();
     }
 
-    public void send_createImage(String userToken, String imageName) throws org.apache.thrift.TException
+    public void send_createImage(java.lang.String userToken, java.lang.String imageName) throws org.apache.thrift.TException
     {
       createImage_args args = new createImage_args();
       args.setUserToken(userToken);
@@ -867,7 +840,7 @@ public class SatelliteServer {
       sendBase("createImage", args);
     }
 
-    public String recv_createImage() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException
+    public java.lang.String recv_createImage() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException
     {
       createImage_result result = new createImage_result();
       receiveBase(result, "createImage");
@@ -883,13 +856,13 @@ public class SatelliteServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "createImage failed: unknown result");
     }
 
-    public void updateImageBase(String userToken, String imageBaseId, ImageBaseWrite image) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException
+    public void updateImageBase(java.lang.String userToken, java.lang.String imageBaseId, ImageBaseWrite image) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException
     {
       send_updateImageBase(userToken, imageBaseId, image);
       recv_updateImageBase();
     }
 
-    public void send_updateImageBase(String userToken, String imageBaseId, ImageBaseWrite image) throws org.apache.thrift.TException
+    public void send_updateImageBase(java.lang.String userToken, java.lang.String imageBaseId, ImageBaseWrite image) throws org.apache.thrift.TException
     {
       updateImageBase_args args = new updateImageBase_args();
       args.setUserToken(userToken);
@@ -914,13 +887,13 @@ public class SatelliteServer {
       return;
     }
 
-    public void updateImageVersion(String userToken, String imageVersionId, ImageVersionWrite image) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException
+    public void updateImageVersion(java.lang.String userToken, java.lang.String imageVersionId, ImageVersionWrite image) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException
     {
       send_updateImageVersion(userToken, imageVersionId, image);
       recv_updateImageVersion();
     }
 
-    public void send_updateImageVersion(String userToken, String imageVersionId, ImageVersionWrite image) throws org.apache.thrift.TException
+    public void send_updateImageVersion(java.lang.String userToken, java.lang.String imageVersionId, ImageVersionWrite image) throws org.apache.thrift.TException
     {
       updateImageVersion_args args = new updateImageVersion_args();
       args.setUserToken(userToken);
@@ -945,13 +918,13 @@ public class SatelliteServer {
       return;
     }
 
-    public void deleteImageVersion(String userToken, String imageVersionId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException
+    public void deleteImageVersion(java.lang.String userToken, java.lang.String imageVersionId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException
     {
       send_deleteImageVersion(userToken, imageVersionId);
       recv_deleteImageVersion();
     }
 
-    public void send_deleteImageVersion(String userToken, String imageVersionId) throws org.apache.thrift.TException
+    public void send_deleteImageVersion(java.lang.String userToken, java.lang.String imageVersionId) throws org.apache.thrift.TException
     {
       deleteImageVersion_args args = new deleteImageVersion_args();
       args.setUserToken(userToken);
@@ -975,13 +948,13 @@ public class SatelliteServer {
       return;
     }
 
-    public void deleteImageBase(String userToken, String imageBaseId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException
+    public void deleteImageBase(java.lang.String userToken, java.lang.String imageBaseId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException
     {
       send_deleteImageBase(userToken, imageBaseId);
       recv_deleteImageBase();
     }
 
-    public void send_deleteImageBase(String userToken, String imageBaseId) throws org.apache.thrift.TException
+    public void send_deleteImageBase(java.lang.String userToken, java.lang.String imageBaseId) throws org.apache.thrift.TException
     {
       deleteImageBase_args args = new deleteImageBase_args();
       args.setUserToken(userToken);
@@ -1005,13 +978,13 @@ public class SatelliteServer {
       return;
     }
 
-    public void writeImagePermissions(String userToken, String imageBaseId, Map<String,ImagePermissions> permissions) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException
+    public void writeImagePermissions(java.lang.String userToken, java.lang.String imageBaseId, java.util.Map<java.lang.String,ImagePermissions> permissions) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException
     {
       send_writeImagePermissions(userToken, imageBaseId, permissions);
       recv_writeImagePermissions();
     }
 
-    public void send_writeImagePermissions(String userToken, String imageBaseId, Map<String,ImagePermissions> permissions) throws org.apache.thrift.TException
+    public void send_writeImagePermissions(java.lang.String userToken, java.lang.String imageBaseId, java.util.Map<java.lang.String,ImagePermissions> permissions) throws org.apache.thrift.TException
     {
       writeImagePermissions_args args = new writeImagePermissions_args();
       args.setUserToken(userToken);
@@ -1036,13 +1009,13 @@ public class SatelliteServer {
       return;
     }
 
-    public Map<String,ImagePermissions> getImagePermissions(String userToken, String imageBaseId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException
+    public java.util.Map<java.lang.String,ImagePermissions> getImagePermissions(java.lang.String userToken, java.lang.String imageBaseId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException
     {
       send_getImagePermissions(userToken, imageBaseId);
       return recv_getImagePermissions();
     }
 
-    public void send_getImagePermissions(String userToken, String imageBaseId) throws org.apache.thrift.TException
+    public void send_getImagePermissions(java.lang.String userToken, java.lang.String imageBaseId) throws org.apache.thrift.TException
     {
       getImagePermissions_args args = new getImagePermissions_args();
       args.setUserToken(userToken);
@@ -1050,7 +1023,7 @@ public class SatelliteServer {
       sendBase("getImagePermissions", args);
     }
 
-    public Map<String,ImagePermissions> recv_getImagePermissions() throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException
+    public java.util.Map<java.lang.String,ImagePermissions> recv_getImagePermissions() throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException
     {
       getImagePermissions_result result = new getImagePermissions_result();
       receiveBase(result, "getImagePermissions");
@@ -1069,13 +1042,13 @@ public class SatelliteServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getImagePermissions failed: unknown result");
     }
 
-    public void setImageOwner(String userToken, String imageBaseId, String newOwnerId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException
+    public void setImageOwner(java.lang.String userToken, java.lang.String imageBaseId, java.lang.String newOwnerId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException
     {
       send_setImageOwner(userToken, imageBaseId, newOwnerId);
       recv_setImageOwner();
     }
 
-    public void send_setImageOwner(String userToken, String imageBaseId, String newOwnerId) throws org.apache.thrift.TException
+    public void send_setImageOwner(java.lang.String userToken, java.lang.String imageBaseId, java.lang.String newOwnerId) throws org.apache.thrift.TException
     {
       setImageOwner_args args = new setImageOwner_args();
       args.setUserToken(userToken);
@@ -1100,13 +1073,13 @@ public class SatelliteServer {
       return;
     }
 
-    public void setImageVersionExpiry(String userToken, String imageBaseId, long expireTime) throws TAuthorizationException, TNotFoundException, TInvocationException, TInvalidDateParam, org.apache.thrift.TException
+    public void setImageVersionExpiry(java.lang.String userToken, java.lang.String imageBaseId, long expireTime) throws TAuthorizationException, TNotFoundException, TInvocationException, TInvalidDateParam, org.apache.thrift.TException
     {
       send_setImageVersionExpiry(userToken, imageBaseId, expireTime);
       recv_setImageVersionExpiry();
     }
 
-    public void send_setImageVersionExpiry(String userToken, String imageBaseId, long expireTime) throws org.apache.thrift.TException
+    public void send_setImageVersionExpiry(java.lang.String userToken, java.lang.String imageBaseId, long expireTime) throws org.apache.thrift.TException
     {
       setImageVersionExpiry_args args = new setImageVersionExpiry_args();
       args.setUserToken(userToken);
@@ -1134,13 +1107,13 @@ public class SatelliteServer {
       return;
     }
 
-    public ByteBuffer getImageVersionVirtConfig(String userToken, String imageVersionId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException
+    public java.nio.ByteBuffer getImageVersionVirtConfig(java.lang.String userToken, java.lang.String imageVersionId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException
     {
       send_getImageVersionVirtConfig(userToken, imageVersionId);
       return recv_getImageVersionVirtConfig();
     }
 
-    public void send_getImageVersionVirtConfig(String userToken, String imageVersionId) throws org.apache.thrift.TException
+    public void send_getImageVersionVirtConfig(java.lang.String userToken, java.lang.String imageVersionId) throws org.apache.thrift.TException
     {
       getImageVersionVirtConfig_args args = new getImageVersionVirtConfig_args();
       args.setUserToken(userToken);
@@ -1148,7 +1121,7 @@ public class SatelliteServer {
       sendBase("getImageVersionVirtConfig", args);
     }
 
-    public ByteBuffer recv_getImageVersionVirtConfig() throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException
+    public java.nio.ByteBuffer recv_getImageVersionVirtConfig() throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException
     {
       getImageVersionVirtConfig_result result = new getImageVersionVirtConfig_result();
       receiveBase(result, "getImageVersionVirtConfig");
@@ -1167,13 +1140,13 @@ public class SatelliteServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getImageVersionVirtConfig failed: unknown result");
     }
 
-    public void setImageVersionVirtConfig(String userToken, String imageVersionId, ByteBuffer meta) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException
+    public void setImageVersionVirtConfig(java.lang.String userToken, java.lang.String imageVersionId, java.nio.ByteBuffer meta) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException
     {
       send_setImageVersionVirtConfig(userToken, imageVersionId, meta);
       recv_setImageVersionVirtConfig();
     }
 
-    public void send_setImageVersionVirtConfig(String userToken, String imageVersionId, ByteBuffer meta) throws org.apache.thrift.TException
+    public void send_setImageVersionVirtConfig(java.lang.String userToken, java.lang.String imageVersionId, java.nio.ByteBuffer meta) throws org.apache.thrift.TException
     {
       setImageVersionVirtConfig_args args = new setImageVersionVirtConfig_args();
       args.setUserToken(userToken);
@@ -1198,13 +1171,13 @@ public class SatelliteServer {
       return;
     }
 
-    public String requestImageReplication(String userToken, String imageVersionId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException
+    public java.lang.String requestImageReplication(java.lang.String userToken, java.lang.String imageVersionId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException
     {
       send_requestImageReplication(userToken, imageVersionId);
       return recv_requestImageReplication();
     }
 
-    public void send_requestImageReplication(String userToken, String imageVersionId) throws org.apache.thrift.TException
+    public void send_requestImageReplication(java.lang.String userToken, java.lang.String imageVersionId) throws org.apache.thrift.TException
     {
       requestImageReplication_args args = new requestImageReplication_args();
       args.setUserToken(userToken);
@@ -1212,7 +1185,7 @@ public class SatelliteServer {
       sendBase("requestImageReplication", args);
     }
 
-    public String recv_requestImageReplication() throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException
+    public java.lang.String recv_requestImageReplication() throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException
     {
       requestImageReplication_result result = new requestImageReplication_result();
       receiveBase(result, "requestImageReplication");
@@ -1231,13 +1204,13 @@ public class SatelliteServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "requestImageReplication failed: unknown result");
     }
 
-    public String publishImageVersion(String userToken, String imageVersionId) throws TAuthorizationException, TNotFoundException, TInvocationException, TTransferRejectedException, org.apache.thrift.TException
+    public java.lang.String publishImageVersion(java.lang.String userToken, java.lang.String imageVersionId) throws TAuthorizationException, TNotFoundException, TInvocationException, TTransferRejectedException, org.apache.thrift.TException
     {
       send_publishImageVersion(userToken, imageVersionId);
       return recv_publishImageVersion();
     }
 
-    public void send_publishImageVersion(String userToken, String imageVersionId) throws org.apache.thrift.TException
+    public void send_publishImageVersion(java.lang.String userToken, java.lang.String imageVersionId) throws org.apache.thrift.TException
     {
       publishImageVersion_args args = new publishImageVersion_args();
       args.setUserToken(userToken);
@@ -1245,7 +1218,7 @@ public class SatelliteServer {
       sendBase("publishImageVersion", args);
     }
 
-    public String recv_publishImageVersion() throws TAuthorizationException, TNotFoundException, TInvocationException, TTransferRejectedException, org.apache.thrift.TException
+    public java.lang.String recv_publishImageVersion() throws TAuthorizationException, TNotFoundException, TInvocationException, TTransferRejectedException, org.apache.thrift.TException
     {
       publishImageVersion_result result = new publishImageVersion_result();
       receiveBase(result, "publishImageVersion");
@@ -1267,13 +1240,13 @@ public class SatelliteServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "publishImageVersion failed: unknown result");
     }
 
-    public String createLecture(String userToken, LectureWrite lecture) throws TAuthorizationException, TInvocationException, TInvalidDateParam, TNotFoundException, org.apache.thrift.TException
+    public java.lang.String createLecture(java.lang.String userToken, LectureWrite lecture) throws TAuthorizationException, TInvocationException, TInvalidDateParam, TNotFoundException, org.apache.thrift.TException
     {
       send_createLecture(userToken, lecture);
       return recv_createLecture();
     }
 
-    public void send_createLecture(String userToken, LectureWrite lecture) throws org.apache.thrift.TException
+    public void send_createLecture(java.lang.String userToken, LectureWrite lecture) throws org.apache.thrift.TException
     {
       createLecture_args args = new createLecture_args();
       args.setUserToken(userToken);
@@ -1281,7 +1254,7 @@ public class SatelliteServer {
       sendBase("createLecture", args);
     }
 
-    public String recv_createLecture() throws TAuthorizationException, TInvocationException, TInvalidDateParam, TNotFoundException, org.apache.thrift.TException
+    public java.lang.String recv_createLecture() throws TAuthorizationException, TInvocationException, TInvalidDateParam, TNotFoundException, org.apache.thrift.TException
     {
       createLecture_result result = new createLecture_result();
       receiveBase(result, "createLecture");
@@ -1303,13 +1276,13 @@ public class SatelliteServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "createLecture failed: unknown result");
     }
 
-    public void updateLecture(String userToken, String lectureId, LectureWrite lecture) throws TAuthorizationException, TNotFoundException, TInvocationException, TInvalidDateParam, org.apache.thrift.TException
+    public void updateLecture(java.lang.String userToken, java.lang.String lectureId, LectureWrite lecture) throws TAuthorizationException, TNotFoundException, TInvocationException, TInvalidDateParam, org.apache.thrift.TException
     {
       send_updateLecture(userToken, lectureId, lecture);
       recv_updateLecture();
     }
 
-    public void send_updateLecture(String userToken, String lectureId, LectureWrite lecture) throws org.apache.thrift.TException
+    public void send_updateLecture(java.lang.String userToken, java.lang.String lectureId, LectureWrite lecture) throws org.apache.thrift.TException
     {
       updateLecture_args args = new updateLecture_args();
       args.setUserToken(userToken);
@@ -1337,13 +1310,13 @@ public class SatelliteServer {
       return;
     }
 
-    public List<LectureSummary> getLectureList(String userToken, int page) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException
+    public java.util.List<LectureSummary> getLectureList(java.lang.String userToken, int page) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException
     {
       send_getLectureList(userToken, page);
       return recv_getLectureList();
     }
 
-    public void send_getLectureList(String userToken, int page) throws org.apache.thrift.TException
+    public void send_getLectureList(java.lang.String userToken, int page) throws org.apache.thrift.TException
     {
       getLectureList_args args = new getLectureList_args();
       args.setUserToken(userToken);
@@ -1351,7 +1324,7 @@ public class SatelliteServer {
       sendBase("getLectureList", args);
     }
 
-    public List<LectureSummary> recv_getLectureList() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException
+    public java.util.List<LectureSummary> recv_getLectureList() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException
     {
       getLectureList_result result = new getLectureList_result();
       receiveBase(result, "getLectureList");
@@ -1367,13 +1340,13 @@ public class SatelliteServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getLectureList failed: unknown result");
     }
 
-    public LectureRead getLectureDetails(String userToken, String lectureId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException
+    public LectureRead getLectureDetails(java.lang.String userToken, java.lang.String lectureId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException
     {
       send_getLectureDetails(userToken, lectureId);
       return recv_getLectureDetails();
     }
 
-    public void send_getLectureDetails(String userToken, String lectureId) throws org.apache.thrift.TException
+    public void send_getLectureDetails(java.lang.String userToken, java.lang.String lectureId) throws org.apache.thrift.TException
     {
       getLectureDetails_args args = new getLectureDetails_args();
       args.setUserToken(userToken);
@@ -1400,13 +1373,13 @@ public class SatelliteServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getLectureDetails failed: unknown result");
     }
 
-    public void deleteLecture(String userToken, String lectureId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException
+    public void deleteLecture(java.lang.String userToken, java.lang.String lectureId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException
     {
       send_deleteLecture(userToken, lectureId);
       recv_deleteLecture();
     }
 
-    public void send_deleteLecture(String userToken, String lectureId) throws org.apache.thrift.TException
+    public void send_deleteLecture(java.lang.String userToken, java.lang.String lectureId) throws org.apache.thrift.TException
     {
       deleteLecture_args args = new deleteLecture_args();
       args.setUserToken(userToken);
@@ -1430,13 +1403,13 @@ public class SatelliteServer {
       return;
     }
 
-    public void writeLecturePermissions(String userToken, String lectureId, Map<String,LecturePermissions> permissions) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException
+    public void writeLecturePermissions(java.lang.String userToken, java.lang.String lectureId, java.util.Map<java.lang.String,LecturePermissions> permissions) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException
     {
       send_writeLecturePermissions(userToken, lectureId, permissions);
       recv_writeLecturePermissions();
     }
 
-    public void send_writeLecturePermissions(String userToken, String lectureId, Map<String,LecturePermissions> permissions) throws org.apache.thrift.TException
+    public void send_writeLecturePermissions(java.lang.String userToken, java.lang.String lectureId, java.util.Map<java.lang.String,LecturePermissions> permissions) throws org.apache.thrift.TException
     {
       writeLecturePermissions_args args = new writeLecturePermissions_args();
       args.setUserToken(userToken);
@@ -1461,13 +1434,13 @@ public class SatelliteServer {
       return;
     }
 
-    public Map<String,LecturePermissions> getLecturePermissions(String userToken, String lectureId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException
+    public java.util.Map<java.lang.String,LecturePermissions> getLecturePermissions(java.lang.String userToken, java.lang.String lectureId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException
     {
       send_getLecturePermissions(userToken, lectureId);
       return recv_getLecturePermissions();
     }
 
-    public void send_getLecturePermissions(String userToken, String lectureId) throws org.apache.thrift.TException
+    public void send_getLecturePermissions(java.lang.String userToken, java.lang.String lectureId) throws org.apache.thrift.TException
     {
       getLecturePermissions_args args = new getLecturePermissions_args();
       args.setUserToken(userToken);
@@ -1475,7 +1448,7 @@ public class SatelliteServer {
       sendBase("getLecturePermissions", args);
     }
 
-    public Map<String,LecturePermissions> recv_getLecturePermissions() throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException
+    public java.util.Map<java.lang.String,LecturePermissions> recv_getLecturePermissions() throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException
     {
       getLecturePermissions_result result = new getLecturePermissions_result();
       receiveBase(result, "getLecturePermissions");
@@ -1494,13 +1467,13 @@ public class SatelliteServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getLecturePermissions failed: unknown result");
     }
 
-    public void setLectureOwner(String userToken, String lectureId, String newOwnerId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException
+    public void setLectureOwner(java.lang.String userToken, java.lang.String lectureId, java.lang.String newOwnerId) throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException
     {
       send_setLectureOwner(userToken, lectureId, newOwnerId);
       recv_setLectureOwner();
     }
 
-    public void send_setLectureOwner(String userToken, String lectureId, String newOwnerId) throws org.apache.thrift.TException
+    public void send_setLectureOwner(java.lang.String userToken, java.lang.String lectureId, java.lang.String newOwnerId) throws org.apache.thrift.TException
     {
       setLectureOwner_args args = new setLectureOwner_args();
       args.setUserToken(userToken);
@@ -1525,13 +1498,13 @@ public class SatelliteServer {
       return;
     }
 
-    public PredefinedData getPredefinedData(String userToken) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException
+    public PredefinedData getPredefinedData(java.lang.String userToken) throws TAuthorizationException, TInvocationException, org.apache.thrift.TException
     {
       send_getPredefinedData(userToken);
       return recv_getPredefinedData();
     }
 
-    public void send_getPredefinedData(String userToken) throws org.apache.thrift.TException
+    public void send_getPredefinedData(java.lang.String userToken) throws org.apache.thrift.TException
     {
       getPredefinedData_args args = new getPredefinedData_args();
       args.setUserToken(userToken);
@@ -1572,16 +1545,16 @@ public class SatelliteServer {
       super(protocolFactory, clientManager, transport);
     }
 
-    public void getVersion(long clientVersion, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void getVersion(long clientVersion, org.apache.thrift.async.AsyncMethodCallback<java.lang.Long> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       getVersion_call method_call = new getVersion_call(clientVersion, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class getVersion_call extends org.apache.thrift.async.TAsyncMethodCall {
+    public static class getVersion_call extends org.apache.thrift.async.TAsyncMethodCall<java.lang.Long> {
       private long clientVersion;
-      public getVersion_call(long clientVersion, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public getVersion_call(long clientVersion, org.apache.thrift.async.AsyncMethodCallback<java.lang.Long> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.clientVersion = clientVersion;
       }
@@ -1594,9 +1567,9 @@ public class SatelliteServer {
         prot.writeMessageEnd();
       }
 
-      public long getResult() throws org.apache.thrift.TException {
+      public java.lang.Long getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
@@ -1604,15 +1577,15 @@ public class SatelliteServer {
       }
     }
 
-    public void getSupportedFeatures(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void getSupportedFeatures(org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       getSupportedFeatures_call method_call = new getSupportedFeatures_call(resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class getSupportedFeatures_call extends org.apache.thrift.async.TAsyncMethodCall {
-      public getSupportedFeatures_call(org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class getSupportedFeatures_call extends org.apache.thrift.async.TAsyncMethodCall<java.lang.String> {
+      public getSupportedFeatures_call(org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
       }
 
@@ -1623,9 +1596,9 @@ public class SatelliteServer {
         prot.writeMessageEnd();
       }
 
-      public String getResult() throws org.apache.thrift.TException {
+      public java.lang.String getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
@@ -1633,15 +1606,15 @@ public class SatelliteServer {
       }
     }
 
-    public void getConfiguration(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void getConfiguration(org.apache.thrift.async.AsyncMethodCallback<SatelliteConfig> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       getConfiguration_call method_call = new getConfiguration_call(resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class getConfiguration_call extends org.apache.thrift.async.TAsyncMethodCall {
-      public getConfiguration_call(org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class getConfiguration_call extends org.apache.thrift.async.TAsyncMethodCall<SatelliteConfig> {
+      public getConfiguration_call(org.apache.thrift.async.AsyncMethodCallback<SatelliteConfig> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
       }
 
@@ -1654,7 +1627,7 @@ public class SatelliteServer {
 
       public SatelliteConfig getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
@@ -1662,20 +1635,20 @@ public class SatelliteServer {
       }
     }
 
-    public void requestImageVersionUpload(String userToken, String imageBaseId, long fileSize, List<ByteBuffer> blockHashes, ByteBuffer machineDescription, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void requestImageVersionUpload(java.lang.String userToken, java.lang.String imageBaseId, long fileSize, java.util.List<java.nio.ByteBuffer> blockHashes, java.nio.ByteBuffer machineDescription, org.apache.thrift.async.AsyncMethodCallback<TransferInformation> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       requestImageVersionUpload_call method_call = new requestImageVersionUpload_call(userToken, imageBaseId, fileSize, blockHashes, machineDescription, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class requestImageVersionUpload_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String userToken;
-      private String imageBaseId;
+    public static class requestImageVersionUpload_call extends org.apache.thrift.async.TAsyncMethodCall<TransferInformation> {
+      private java.lang.String userToken;
+      private java.lang.String imageBaseId;
       private long fileSize;
-      private List<ByteBuffer> blockHashes;
-      private ByteBuffer machineDescription;
-      public requestImageVersionUpload_call(String userToken, String imageBaseId, long fileSize, List<ByteBuffer> blockHashes, ByteBuffer machineDescription, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      private java.util.List<java.nio.ByteBuffer> blockHashes;
+      private java.nio.ByteBuffer machineDescription;
+      public requestImageVersionUpload_call(java.lang.String userToken, java.lang.String imageBaseId, long fileSize, java.util.List<java.nio.ByteBuffer> blockHashes, java.nio.ByteBuffer machineDescription, org.apache.thrift.async.AsyncMethodCallback<TransferInformation> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.userToken = userToken;
         this.imageBaseId = imageBaseId;
@@ -1698,7 +1671,7 @@ public class SatelliteServer {
 
       public TransferInformation getResult() throws TTransferRejectedException, TAuthorizationException, TInvocationException, TNotFoundException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
@@ -1706,18 +1679,18 @@ public class SatelliteServer {
       }
     }
 
-    public void updateBlockHashes(String uploadToken, List<ByteBuffer> blockHashes, String userToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void updateBlockHashes(java.lang.String uploadToken, java.util.List<java.nio.ByteBuffer> blockHashes, java.lang.String userToken, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       updateBlockHashes_call method_call = new updateBlockHashes_call(uploadToken, blockHashes, userToken, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class updateBlockHashes_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String uploadToken;
-      private List<ByteBuffer> blockHashes;
-      private String userToken;
-      public updateBlockHashes_call(String uploadToken, List<ByteBuffer> blockHashes, String userToken, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class updateBlockHashes_call extends org.apache.thrift.async.TAsyncMethodCall<Void> {
+      private java.lang.String uploadToken;
+      private java.util.List<java.nio.ByteBuffer> blockHashes;
+      private java.lang.String userToken;
+      public updateBlockHashes_call(java.lang.String uploadToken, java.util.List<java.nio.ByteBuffer> blockHashes, java.lang.String userToken, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.uploadToken = uploadToken;
         this.blockHashes = blockHashes;
@@ -1734,28 +1707,28 @@ public class SatelliteServer {
         prot.writeMessageEnd();
       }
 
-      public void getResult() throws TInvalidTokenException, org.apache.thrift.TException {
+      public Void getResult() throws TInvalidTokenException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
-        (new Client(prot)).recv_updateBlockHashes();
+        return null;
       }
     }
 
-    public void setUploadOptions(String userToken, String uploadToken, UploadOptions options, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void setUploadOptions(java.lang.String userToken, java.lang.String uploadToken, UploadOptions options, org.apache.thrift.async.AsyncMethodCallback<UploadOptions> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       setUploadOptions_call method_call = new setUploadOptions_call(userToken, uploadToken, options, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class setUploadOptions_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String userToken;
-      private String uploadToken;
+    public static class setUploadOptions_call extends org.apache.thrift.async.TAsyncMethodCall<UploadOptions> {
+      private java.lang.String userToken;
+      private java.lang.String uploadToken;
       private UploadOptions options;
-      public setUploadOptions_call(String userToken, String uploadToken, UploadOptions options, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public setUploadOptions_call(java.lang.String userToken, java.lang.String uploadToken, UploadOptions options, org.apache.thrift.async.AsyncMethodCallback<UploadOptions> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.userToken = userToken;
         this.uploadToken = uploadToken;
@@ -1774,7 +1747,7 @@ public class SatelliteServer {
 
       public UploadOptions getResult() throws TAuthorizationException, TInvalidTokenException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
@@ -1782,16 +1755,16 @@ public class SatelliteServer {
       }
     }
 
-    public void cancelUpload(String uploadToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void cancelUpload(java.lang.String uploadToken, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       cancelUpload_call method_call = new cancelUpload_call(uploadToken, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class cancelUpload_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String uploadToken;
-      public cancelUpload_call(String uploadToken, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class cancelUpload_call extends org.apache.thrift.async.TAsyncMethodCall<Void> {
+      private java.lang.String uploadToken;
+      public cancelUpload_call(java.lang.String uploadToken, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.uploadToken = uploadToken;
       }
@@ -1804,26 +1777,26 @@ public class SatelliteServer {
         prot.writeMessageEnd();
       }
 
-      public void getResult() throws TInvalidTokenException, org.apache.thrift.TException {
+      public Void getResult() throws TInvalidTokenException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
-        (new Client(prot)).recv_cancelUpload();
+        return null;
       }
     }
 
-    public void queryUploadStatus(String uploadToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void queryUploadStatus(java.lang.String uploadToken, org.apache.thrift.async.AsyncMethodCallback<TransferStatus> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       queryUploadStatus_call method_call = new queryUploadStatus_call(uploadToken, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class queryUploadStatus_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String uploadToken;
-      public queryUploadStatus_call(String uploadToken, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class queryUploadStatus_call extends org.apache.thrift.async.TAsyncMethodCall<TransferStatus> {
+      private java.lang.String uploadToken;
+      public queryUploadStatus_call(java.lang.String uploadToken, org.apache.thrift.async.AsyncMethodCallback<TransferStatus> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.uploadToken = uploadToken;
       }
@@ -1838,7 +1811,7 @@ public class SatelliteServer {
 
       public TransferStatus getResult() throws TInvalidTokenException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
@@ -1846,17 +1819,17 @@ public class SatelliteServer {
       }
     }
 
-    public void requestDownload(String userToken, String imageVersionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void requestDownload(java.lang.String userToken, java.lang.String imageVersionId, org.apache.thrift.async.AsyncMethodCallback<TransferInformation> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       requestDownload_call method_call = new requestDownload_call(userToken, imageVersionId, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class requestDownload_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String userToken;
-      private String imageVersionId;
-      public requestDownload_call(String userToken, String imageVersionId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class requestDownload_call extends org.apache.thrift.async.TAsyncMethodCall<TransferInformation> {
+      private java.lang.String userToken;
+      private java.lang.String imageVersionId;
+      public requestDownload_call(java.lang.String userToken, java.lang.String imageVersionId, org.apache.thrift.async.AsyncMethodCallback<TransferInformation> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.userToken = userToken;
         this.imageVersionId = imageVersionId;
@@ -1873,7 +1846,7 @@ public class SatelliteServer {
 
       public TransferInformation getResult() throws TTransferRejectedException, TAuthorizationException, TInvocationException, TNotFoundException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
@@ -1881,16 +1854,16 @@ public class SatelliteServer {
       }
     }
 
-    public void cancelDownload(String downloadToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void cancelDownload(java.lang.String downloadToken, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       cancelDownload_call method_call = new cancelDownload_call(downloadToken, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class cancelDownload_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String downloadToken;
-      public cancelDownload_call(String downloadToken, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class cancelDownload_call extends org.apache.thrift.async.TAsyncMethodCall<Void> {
+      private java.lang.String downloadToken;
+      public cancelDownload_call(java.lang.String downloadToken, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.downloadToken = downloadToken;
       }
@@ -1903,26 +1876,26 @@ public class SatelliteServer {
         prot.writeMessageEnd();
       }
 
-      public void getResult() throws TInvalidTokenException, org.apache.thrift.TException {
+      public Void getResult() throws TInvalidTokenException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
-        (new Client(prot)).recv_cancelDownload();
+        return null;
       }
     }
 
-    public void isAuthenticated(String userToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void isAuthenticated(java.lang.String userToken, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       isAuthenticated_call method_call = new isAuthenticated_call(userToken, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class isAuthenticated_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String userToken;
-      public isAuthenticated_call(String userToken, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class isAuthenticated_call extends org.apache.thrift.async.TAsyncMethodCall<Void> {
+      private java.lang.String userToken;
+      public isAuthenticated_call(java.lang.String userToken, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.userToken = userToken;
       }
@@ -1935,26 +1908,26 @@ public class SatelliteServer {
         prot.writeMessageEnd();
       }
 
-      public void getResult() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException {
+      public Void getResult() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
-        (new Client(prot)).recv_isAuthenticated();
+        return null;
       }
     }
 
-    public void whoami(String userToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void whoami(java.lang.String userToken, org.apache.thrift.async.AsyncMethodCallback<WhoamiInfo> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       whoami_call method_call = new whoami_call(userToken, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class whoami_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String userToken;
-      public whoami_call(String userToken, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class whoami_call extends org.apache.thrift.async.TAsyncMethodCall<WhoamiInfo> {
+      private java.lang.String userToken;
+      public whoami_call(java.lang.String userToken, org.apache.thrift.async.AsyncMethodCallback<WhoamiInfo> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.userToken = userToken;
       }
@@ -1969,7 +1942,7 @@ public class SatelliteServer {
 
       public WhoamiInfo getResult() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
@@ -1977,16 +1950,16 @@ public class SatelliteServer {
       }
     }
 
-    public void invalidateSession(String userToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void invalidateSession(java.lang.String userToken, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       invalidateSession_call method_call = new invalidateSession_call(userToken, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class invalidateSession_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String userToken;
-      public invalidateSession_call(String userToken, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class invalidateSession_call extends org.apache.thrift.async.TAsyncMethodCall<Void> {
+      private java.lang.String userToken;
+      public invalidateSession_call(java.lang.String userToken, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.userToken = userToken;
       }
@@ -1999,27 +1972,27 @@ public class SatelliteServer {
         prot.writeMessageEnd();
       }
 
-      public void getResult() throws TInvalidTokenException, org.apache.thrift.TException {
+      public Void getResult() throws TInvalidTokenException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
-        (new Client(prot)).recv_invalidateSession();
+        return null;
       }
     }
 
-    public void getUserList(String userToken, int page, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void getUserList(java.lang.String userToken, int page, org.apache.thrift.async.AsyncMethodCallback<java.util.List<UserInfo>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       getUserList_call method_call = new getUserList_call(userToken, page, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class getUserList_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String userToken;
+    public static class getUserList_call extends org.apache.thrift.async.TAsyncMethodCall<java.util.List<UserInfo>> {
+      private java.lang.String userToken;
       private int page;
-      public getUserList_call(String userToken, int page, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public getUserList_call(java.lang.String userToken, int page, org.apache.thrift.async.AsyncMethodCallback<java.util.List<UserInfo>> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.userToken = userToken;
         this.page = page;
@@ -2034,9 +2007,9 @@ public class SatelliteServer {
         prot.writeMessageEnd();
       }
 
-      public List<UserInfo> getResult() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException {
+      public java.util.List<UserInfo> getResult() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
@@ -2044,16 +2017,16 @@ public class SatelliteServer {
       }
     }
 
-    public void getUserConfig(String userToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void getUserConfig(java.lang.String userToken, org.apache.thrift.async.AsyncMethodCallback<SatelliteUserConfig> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       getUserConfig_call method_call = new getUserConfig_call(userToken, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class getUserConfig_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String userToken;
-      public getUserConfig_call(String userToken, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class getUserConfig_call extends org.apache.thrift.async.TAsyncMethodCall<SatelliteUserConfig> {
+      private java.lang.String userToken;
+      public getUserConfig_call(java.lang.String userToken, org.apache.thrift.async.AsyncMethodCallback<SatelliteUserConfig> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.userToken = userToken;
       }
@@ -2068,7 +2041,7 @@ public class SatelliteServer {
 
       public SatelliteUserConfig getResult() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
@@ -2076,17 +2049,17 @@ public class SatelliteServer {
       }
     }
 
-    public void setUserConfig(String userToken, SatelliteUserConfig config, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void setUserConfig(java.lang.String userToken, SatelliteUserConfig config, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       setUserConfig_call method_call = new setUserConfig_call(userToken, config, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class setUserConfig_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String userToken;
+    public static class setUserConfig_call extends org.apache.thrift.async.TAsyncMethodCall<Void> {
+      private java.lang.String userToken;
       private SatelliteUserConfig config;
-      public setUserConfig_call(String userToken, SatelliteUserConfig config, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public setUserConfig_call(java.lang.String userToken, SatelliteUserConfig config, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.userToken = userToken;
         this.config = config;
@@ -2101,25 +2074,25 @@ public class SatelliteServer {
         prot.writeMessageEnd();
       }
 
-      public void getResult() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException {
+      public Void getResult() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
-        (new Client(prot)).recv_setUserConfig();
+        return null;
       }
     }
 
-    public void getOperatingSystems(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void getOperatingSystems(org.apache.thrift.async.AsyncMethodCallback<java.util.List<OperatingSystem>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       getOperatingSystems_call method_call = new getOperatingSystems_call(resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class getOperatingSystems_call extends org.apache.thrift.async.TAsyncMethodCall {
-      public getOperatingSystems_call(org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class getOperatingSystems_call extends org.apache.thrift.async.TAsyncMethodCall<java.util.List<OperatingSystem>> {
+      public getOperatingSystems_call(org.apache.thrift.async.AsyncMethodCallback<java.util.List<OperatingSystem>> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
       }
 
@@ -2130,9 +2103,9 @@ public class SatelliteServer {
         prot.writeMessageEnd();
       }
 
-      public List<OperatingSystem> getResult() throws org.apache.thrift.TException {
+      public java.util.List<OperatingSystem> getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
@@ -2140,15 +2113,15 @@ public class SatelliteServer {
       }
     }
 
-    public void getVirtualizers(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void getVirtualizers(org.apache.thrift.async.AsyncMethodCallback<java.util.List<Virtualizer>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       getVirtualizers_call method_call = new getVirtualizers_call(resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class getVirtualizers_call extends org.apache.thrift.async.TAsyncMethodCall {
-      public getVirtualizers_call(org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class getVirtualizers_call extends org.apache.thrift.async.TAsyncMethodCall<java.util.List<Virtualizer>> {
+      public getVirtualizers_call(org.apache.thrift.async.AsyncMethodCallback<java.util.List<Virtualizer>> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
       }
 
@@ -2159,9 +2132,9 @@ public class SatelliteServer {
         prot.writeMessageEnd();
       }
 
-      public List<Virtualizer> getResult() throws org.apache.thrift.TException {
+      public java.util.List<Virtualizer> getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
@@ -2169,15 +2142,15 @@ public class SatelliteServer {
       }
     }
 
-    public void getAllOrganizations(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void getAllOrganizations(org.apache.thrift.async.AsyncMethodCallback<java.util.List<Organization>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       getAllOrganizations_call method_call = new getAllOrganizations_call(resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class getAllOrganizations_call extends org.apache.thrift.async.TAsyncMethodCall {
-      public getAllOrganizations_call(org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class getAllOrganizations_call extends org.apache.thrift.async.TAsyncMethodCall<java.util.List<Organization>> {
+      public getAllOrganizations_call(org.apache.thrift.async.AsyncMethodCallback<java.util.List<Organization>> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
       }
 
@@ -2188,9 +2161,9 @@ public class SatelliteServer {
         prot.writeMessageEnd();
       }
 
-      public List<Organization> getResult() throws org.apache.thrift.TException {
+      public java.util.List<Organization> getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
@@ -2198,15 +2171,15 @@ public class SatelliteServer {
       }
     }
 
-    public void getLocations(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void getLocations(org.apache.thrift.async.AsyncMethodCallback<java.util.List<Location>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       getLocations_call method_call = new getLocations_call(resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class getLocations_call extends org.apache.thrift.async.TAsyncMethodCall {
-      public getLocations_call(org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class getLocations_call extends org.apache.thrift.async.TAsyncMethodCall<java.util.List<Location>> {
+      public getLocations_call(org.apache.thrift.async.AsyncMethodCallback<java.util.List<Location>> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
       }
 
@@ -2217,9 +2190,9 @@ public class SatelliteServer {
         prot.writeMessageEnd();
       }
 
-      public List<Location> getResult() throws org.apache.thrift.TException {
+      public java.util.List<Location> getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
@@ -2227,15 +2200,15 @@ public class SatelliteServer {
       }
     }
 
-    public void getStatus(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void getStatus(org.apache.thrift.async.AsyncMethodCallback<SatelliteStatus> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       getStatus_call method_call = new getStatus_call(resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class getStatus_call extends org.apache.thrift.async.TAsyncMethodCall {
-      public getStatus_call(org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class getStatus_call extends org.apache.thrift.async.TAsyncMethodCall<SatelliteStatus> {
+      public getStatus_call(org.apache.thrift.async.AsyncMethodCallback<SatelliteStatus> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
       }
 
@@ -2248,7 +2221,7 @@ public class SatelliteServer {
 
       public SatelliteStatus getResult() throws org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
@@ -2256,18 +2229,18 @@ public class SatelliteServer {
       }
     }
 
-    public void getImageList(String userToken, List<String> tagSearch, int page, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void getImageList(java.lang.String userToken, java.util.List<java.lang.String> tagSearch, int page, org.apache.thrift.async.AsyncMethodCallback<java.util.List<ImageSummaryRead>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       getImageList_call method_call = new getImageList_call(userToken, tagSearch, page, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class getImageList_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String userToken;
-      private List<String> tagSearch;
+    public static class getImageList_call extends org.apache.thrift.async.TAsyncMethodCall<java.util.List<ImageSummaryRead>> {
+      private java.lang.String userToken;
+      private java.util.List<java.lang.String> tagSearch;
       private int page;
-      public getImageList_call(String userToken, List<String> tagSearch, int page, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public getImageList_call(java.lang.String userToken, java.util.List<java.lang.String> tagSearch, int page, org.apache.thrift.async.AsyncMethodCallback<java.util.List<ImageSummaryRead>> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.userToken = userToken;
         this.tagSearch = tagSearch;
@@ -2284,9 +2257,9 @@ public class SatelliteServer {
         prot.writeMessageEnd();
       }
 
-      public List<ImageSummaryRead> getResult() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException {
+      public java.util.List<ImageSummaryRead> getResult() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
@@ -2294,17 +2267,17 @@ public class SatelliteServer {
       }
     }
 
-    public void getImageDetails(String userToken, String imageBaseId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void getImageDetails(java.lang.String userToken, java.lang.String imageBaseId, org.apache.thrift.async.AsyncMethodCallback<ImageDetailsRead> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       getImageDetails_call method_call = new getImageDetails_call(userToken, imageBaseId, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class getImageDetails_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String userToken;
-      private String imageBaseId;
-      public getImageDetails_call(String userToken, String imageBaseId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class getImageDetails_call extends org.apache.thrift.async.TAsyncMethodCall<ImageDetailsRead> {
+      private java.lang.String userToken;
+      private java.lang.String imageBaseId;
+      public getImageDetails_call(java.lang.String userToken, java.lang.String imageBaseId, org.apache.thrift.async.AsyncMethodCallback<ImageDetailsRead> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.userToken = userToken;
         this.imageBaseId = imageBaseId;
@@ -2321,7 +2294,7 @@ public class SatelliteServer {
 
       public ImageDetailsRead getResult() throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
@@ -2329,17 +2302,17 @@ public class SatelliteServer {
       }
     }
 
-    public void createImage(String userToken, String imageName, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void createImage(java.lang.String userToken, java.lang.String imageName, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       createImage_call method_call = new createImage_call(userToken, imageName, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class createImage_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String userToken;
-      private String imageName;
-      public createImage_call(String userToken, String imageName, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class createImage_call extends org.apache.thrift.async.TAsyncMethodCall<java.lang.String> {
+      private java.lang.String userToken;
+      private java.lang.String imageName;
+      public createImage_call(java.lang.String userToken, java.lang.String imageName, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.userToken = userToken;
         this.imageName = imageName;
@@ -2354,9 +2327,9 @@ public class SatelliteServer {
         prot.writeMessageEnd();
       }
 
-      public String getResult() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException {
+      public java.lang.String getResult() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
@@ -2364,18 +2337,18 @@ public class SatelliteServer {
       }
     }
 
-    public void updateImageBase(String userToken, String imageBaseId, ImageBaseWrite image, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void updateImageBase(java.lang.String userToken, java.lang.String imageBaseId, ImageBaseWrite image, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       updateImageBase_call method_call = new updateImageBase_call(userToken, imageBaseId, image, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class updateImageBase_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String userToken;
-      private String imageBaseId;
+    public static class updateImageBase_call extends org.apache.thrift.async.TAsyncMethodCall<Void> {
+      private java.lang.String userToken;
+      private java.lang.String imageBaseId;
       private ImageBaseWrite image;
-      public updateImageBase_call(String userToken, String imageBaseId, ImageBaseWrite image, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public updateImageBase_call(java.lang.String userToken, java.lang.String imageBaseId, ImageBaseWrite image, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.userToken = userToken;
         this.imageBaseId = imageBaseId;
@@ -2392,28 +2365,28 @@ public class SatelliteServer {
         prot.writeMessageEnd();
       }
 
-      public void getResult() throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException {
+      public Void getResult() throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
-        (new Client(prot)).recv_updateImageBase();
+        return null;
       }
     }
 
-    public void updateImageVersion(String userToken, String imageVersionId, ImageVersionWrite image, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void updateImageVersion(java.lang.String userToken, java.lang.String imageVersionId, ImageVersionWrite image, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       updateImageVersion_call method_call = new updateImageVersion_call(userToken, imageVersionId, image, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class updateImageVersion_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String userToken;
-      private String imageVersionId;
+    public static class updateImageVersion_call extends org.apache.thrift.async.TAsyncMethodCall<Void> {
+      private java.lang.String userToken;
+      private java.lang.String imageVersionId;
       private ImageVersionWrite image;
-      public updateImageVersion_call(String userToken, String imageVersionId, ImageVersionWrite image, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public updateImageVersion_call(java.lang.String userToken, java.lang.String imageVersionId, ImageVersionWrite image, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.userToken = userToken;
         this.imageVersionId = imageVersionId;
@@ -2430,27 +2403,27 @@ public class SatelliteServer {
         prot.writeMessageEnd();
       }
 
-      public void getResult() throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException {
+      public Void getResult() throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
-        (new Client(prot)).recv_updateImageVersion();
+        return null;
       }
     }
 
-    public void deleteImageVersion(String userToken, String imageVersionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void deleteImageVersion(java.lang.String userToken, java.lang.String imageVersionId, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       deleteImageVersion_call method_call = new deleteImageVersion_call(userToken, imageVersionId, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class deleteImageVersion_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String userToken;
-      private String imageVersionId;
-      public deleteImageVersion_call(String userToken, String imageVersionId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class deleteImageVersion_call extends org.apache.thrift.async.TAsyncMethodCall<Void> {
+      private java.lang.String userToken;
+      private java.lang.String imageVersionId;
+      public deleteImageVersion_call(java.lang.String userToken, java.lang.String imageVersionId, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.userToken = userToken;
         this.imageVersionId = imageVersionId;
@@ -2465,27 +2438,27 @@ public class SatelliteServer {
         prot.writeMessageEnd();
       }
 
-      public void getResult() throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException {
+      public Void getResult() throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
-        (new Client(prot)).recv_deleteImageVersion();
+        return null;
       }
     }
 
-    public void deleteImageBase(String userToken, String imageBaseId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void deleteImageBase(java.lang.String userToken, java.lang.String imageBaseId, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       deleteImageBase_call method_call = new deleteImageBase_call(userToken, imageBaseId, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class deleteImageBase_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String userToken;
-      private String imageBaseId;
-      public deleteImageBase_call(String userToken, String imageBaseId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class deleteImageBase_call extends org.apache.thrift.async.TAsyncMethodCall<Void> {
+      private java.lang.String userToken;
+      private java.lang.String imageBaseId;
+      public deleteImageBase_call(java.lang.String userToken, java.lang.String imageBaseId, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.userToken = userToken;
         this.imageBaseId = imageBaseId;
@@ -2500,28 +2473,28 @@ public class SatelliteServer {
         prot.writeMessageEnd();
       }
 
-      public void getResult() throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException {
+      public Void getResult() throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
-        (new Client(prot)).recv_deleteImageBase();
+        return null;
       }
     }
 
-    public void writeImagePermissions(String userToken, String imageBaseId, Map<String,ImagePermissions> permissions, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void writeImagePermissions(java.lang.String userToken, java.lang.String imageBaseId, java.util.Map<java.lang.String,ImagePermissions> permissions, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       writeImagePermissions_call method_call = new writeImagePermissions_call(userToken, imageBaseId, permissions, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class writeImagePermissions_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String userToken;
-      private String imageBaseId;
-      private Map<String,ImagePermissions> permissions;
-      public writeImagePermissions_call(String userToken, String imageBaseId, Map<String,ImagePermissions> permissions, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class writeImagePermissions_call extends org.apache.thrift.async.TAsyncMethodCall<Void> {
+      private java.lang.String userToken;
+      private java.lang.String imageBaseId;
+      private java.util.Map<java.lang.String,ImagePermissions> permissions;
+      public writeImagePermissions_call(java.lang.String userToken, java.lang.String imageBaseId, java.util.Map<java.lang.String,ImagePermissions> permissions, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.userToken = userToken;
         this.imageBaseId = imageBaseId;
@@ -2538,27 +2511,27 @@ public class SatelliteServer {
         prot.writeMessageEnd();
       }
 
-      public void getResult() throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException {
+      public Void getResult() throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
-        (new Client(prot)).recv_writeImagePermissions();
+        return null;
       }
     }
 
-    public void getImagePermissions(String userToken, String imageBaseId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void getImagePermissions(java.lang.String userToken, java.lang.String imageBaseId, org.apache.thrift.async.AsyncMethodCallback<java.util.Map<java.lang.String,ImagePermissions>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       getImagePermissions_call method_call = new getImagePermissions_call(userToken, imageBaseId, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class getImagePermissions_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String userToken;
-      private String imageBaseId;
-      public getImagePermissions_call(String userToken, String imageBaseId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class getImagePermissions_call extends org.apache.thrift.async.TAsyncMethodCall<java.util.Map<java.lang.String,ImagePermissions>> {
+      private java.lang.String userToken;
+      private java.lang.String imageBaseId;
+      public getImagePermissions_call(java.lang.String userToken, java.lang.String imageBaseId, org.apache.thrift.async.AsyncMethodCallback<java.util.Map<java.lang.String,ImagePermissions>> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.userToken = userToken;
         this.imageBaseId = imageBaseId;
@@ -2573,9 +2546,9 @@ public class SatelliteServer {
         prot.writeMessageEnd();
       }
 
-      public Map<String,ImagePermissions> getResult() throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException {
+      public java.util.Map<java.lang.String,ImagePermissions> getResult() throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
@@ -2583,18 +2556,18 @@ public class SatelliteServer {
       }
     }
 
-    public void setImageOwner(String userToken, String imageBaseId, String newOwnerId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void setImageOwner(java.lang.String userToken, java.lang.String imageBaseId, java.lang.String newOwnerId, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       setImageOwner_call method_call = new setImageOwner_call(userToken, imageBaseId, newOwnerId, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class setImageOwner_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String userToken;
-      private String imageBaseId;
-      private String newOwnerId;
-      public setImageOwner_call(String userToken, String imageBaseId, String newOwnerId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class setImageOwner_call extends org.apache.thrift.async.TAsyncMethodCall<Void> {
+      private java.lang.String userToken;
+      private java.lang.String imageBaseId;
+      private java.lang.String newOwnerId;
+      public setImageOwner_call(java.lang.String userToken, java.lang.String imageBaseId, java.lang.String newOwnerId, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.userToken = userToken;
         this.imageBaseId = imageBaseId;
@@ -2611,28 +2584,28 @@ public class SatelliteServer {
         prot.writeMessageEnd();
       }
 
-      public void getResult() throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException {
+      public Void getResult() throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
-        (new Client(prot)).recv_setImageOwner();
+        return null;
       }
     }
 
-    public void setImageVersionExpiry(String userToken, String imageBaseId, long expireTime, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void setImageVersionExpiry(java.lang.String userToken, java.lang.String imageBaseId, long expireTime, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       setImageVersionExpiry_call method_call = new setImageVersionExpiry_call(userToken, imageBaseId, expireTime, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class setImageVersionExpiry_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String userToken;
-      private String imageBaseId;
+    public static class setImageVersionExpiry_call extends org.apache.thrift.async.TAsyncMethodCall<Void> {
+      private java.lang.String userToken;
+      private java.lang.String imageBaseId;
       private long expireTime;
-      public setImageVersionExpiry_call(String userToken, String imageBaseId, long expireTime, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public setImageVersionExpiry_call(java.lang.String userToken, java.lang.String imageBaseId, long expireTime, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.userToken = userToken;
         this.imageBaseId = imageBaseId;
@@ -2649,27 +2622,27 @@ public class SatelliteServer {
         prot.writeMessageEnd();
       }
 
-      public void getResult() throws TAuthorizationException, TNotFoundException, TInvocationException, TInvalidDateParam, org.apache.thrift.TException {
+      public Void getResult() throws TAuthorizationException, TNotFoundException, TInvocationException, TInvalidDateParam, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
-        (new Client(prot)).recv_setImageVersionExpiry();
+        return null;
       }
     }
 
-    public void getImageVersionVirtConfig(String userToken, String imageVersionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void getImageVersionVirtConfig(java.lang.String userToken, java.lang.String imageVersionId, org.apache.thrift.async.AsyncMethodCallback<java.nio.ByteBuffer> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       getImageVersionVirtConfig_call method_call = new getImageVersionVirtConfig_call(userToken, imageVersionId, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class getImageVersionVirtConfig_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String userToken;
-      private String imageVersionId;
-      public getImageVersionVirtConfig_call(String userToken, String imageVersionId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class getImageVersionVirtConfig_call extends org.apache.thrift.async.TAsyncMethodCall<java.nio.ByteBuffer> {
+      private java.lang.String userToken;
+      private java.lang.String imageVersionId;
+      public getImageVersionVirtConfig_call(java.lang.String userToken, java.lang.String imageVersionId, org.apache.thrift.async.AsyncMethodCallback<java.nio.ByteBuffer> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.userToken = userToken;
         this.imageVersionId = imageVersionId;
@@ -2684,9 +2657,9 @@ public class SatelliteServer {
         prot.writeMessageEnd();
       }
 
-      public ByteBuffer getResult() throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException {
+      public java.nio.ByteBuffer getResult() throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
@@ -2694,18 +2667,18 @@ public class SatelliteServer {
       }
     }
 
-    public void setImageVersionVirtConfig(String userToken, String imageVersionId, ByteBuffer meta, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void setImageVersionVirtConfig(java.lang.String userToken, java.lang.String imageVersionId, java.nio.ByteBuffer meta, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       setImageVersionVirtConfig_call method_call = new setImageVersionVirtConfig_call(userToken, imageVersionId, meta, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class setImageVersionVirtConfig_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String userToken;
-      private String imageVersionId;
-      private ByteBuffer meta;
-      public setImageVersionVirtConfig_call(String userToken, String imageVersionId, ByteBuffer meta, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class setImageVersionVirtConfig_call extends org.apache.thrift.async.TAsyncMethodCall<Void> {
+      private java.lang.String userToken;
+      private java.lang.String imageVersionId;
+      private java.nio.ByteBuffer meta;
+      public setImageVersionVirtConfig_call(java.lang.String userToken, java.lang.String imageVersionId, java.nio.ByteBuffer meta, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.userToken = userToken;
         this.imageVersionId = imageVersionId;
@@ -2722,27 +2695,27 @@ public class SatelliteServer {
         prot.writeMessageEnd();
       }
 
-      public void getResult() throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException {
+      public Void getResult() throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
-        (new Client(prot)).recv_setImageVersionVirtConfig();
+        return null;
       }
     }
 
-    public void requestImageReplication(String userToken, String imageVersionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void requestImageReplication(java.lang.String userToken, java.lang.String imageVersionId, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       requestImageReplication_call method_call = new requestImageReplication_call(userToken, imageVersionId, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class requestImageReplication_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String userToken;
-      private String imageVersionId;
-      public requestImageReplication_call(String userToken, String imageVersionId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class requestImageReplication_call extends org.apache.thrift.async.TAsyncMethodCall<java.lang.String> {
+      private java.lang.String userToken;
+      private java.lang.String imageVersionId;
+      public requestImageReplication_call(java.lang.String userToken, java.lang.String imageVersionId, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.userToken = userToken;
         this.imageVersionId = imageVersionId;
@@ -2757,9 +2730,9 @@ public class SatelliteServer {
         prot.writeMessageEnd();
       }
 
-      public String getResult() throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException {
+      public java.lang.String getResult() throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
@@ -2767,17 +2740,17 @@ public class SatelliteServer {
       }
     }
 
-    public void publishImageVersion(String userToken, String imageVersionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void publishImageVersion(java.lang.String userToken, java.lang.String imageVersionId, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       publishImageVersion_call method_call = new publishImageVersion_call(userToken, imageVersionId, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class publishImageVersion_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String userToken;
-      private String imageVersionId;
-      public publishImageVersion_call(String userToken, String imageVersionId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class publishImageVersion_call extends org.apache.thrift.async.TAsyncMethodCall<java.lang.String> {
+      private java.lang.String userToken;
+      private java.lang.String imageVersionId;
+      public publishImageVersion_call(java.lang.String userToken, java.lang.String imageVersionId, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.userToken = userToken;
         this.imageVersionId = imageVersionId;
@@ -2792,9 +2765,9 @@ public class SatelliteServer {
         prot.writeMessageEnd();
       }
 
-      public String getResult() throws TAuthorizationException, TNotFoundException, TInvocationException, TTransferRejectedException, org.apache.thrift.TException {
+      public java.lang.String getResult() throws TAuthorizationException, TNotFoundException, TInvocationException, TTransferRejectedException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
@@ -2802,17 +2775,17 @@ public class SatelliteServer {
       }
     }
 
-    public void createLecture(String userToken, LectureWrite lecture, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void createLecture(java.lang.String userToken, LectureWrite lecture, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       createLecture_call method_call = new createLecture_call(userToken, lecture, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class createLecture_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String userToken;
+    public static class createLecture_call extends org.apache.thrift.async.TAsyncMethodCall<java.lang.String> {
+      private java.lang.String userToken;
       private LectureWrite lecture;
-      public createLecture_call(String userToken, LectureWrite lecture, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public createLecture_call(java.lang.String userToken, LectureWrite lecture, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.userToken = userToken;
         this.lecture = lecture;
@@ -2827,9 +2800,9 @@ public class SatelliteServer {
         prot.writeMessageEnd();
       }
 
-      public String getResult() throws TAuthorizationException, TInvocationException, TInvalidDateParam, TNotFoundException, org.apache.thrift.TException {
+      public java.lang.String getResult() throws TAuthorizationException, TInvocationException, TInvalidDateParam, TNotFoundException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
@@ -2837,18 +2810,18 @@ public class SatelliteServer {
       }
     }
 
-    public void updateLecture(String userToken, String lectureId, LectureWrite lecture, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void updateLecture(java.lang.String userToken, java.lang.String lectureId, LectureWrite lecture, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       updateLecture_call method_call = new updateLecture_call(userToken, lectureId, lecture, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class updateLecture_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String userToken;
-      private String lectureId;
+    public static class updateLecture_call extends org.apache.thrift.async.TAsyncMethodCall<Void> {
+      private java.lang.String userToken;
+      private java.lang.String lectureId;
       private LectureWrite lecture;
-      public updateLecture_call(String userToken, String lectureId, LectureWrite lecture, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public updateLecture_call(java.lang.String userToken, java.lang.String lectureId, LectureWrite lecture, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.userToken = userToken;
         this.lectureId = lectureId;
@@ -2865,27 +2838,27 @@ public class SatelliteServer {
         prot.writeMessageEnd();
       }
 
-      public void getResult() throws TAuthorizationException, TNotFoundException, TInvocationException, TInvalidDateParam, org.apache.thrift.TException {
+      public Void getResult() throws TAuthorizationException, TNotFoundException, TInvocationException, TInvalidDateParam, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
-        (new Client(prot)).recv_updateLecture();
+        return null;
       }
     }
 
-    public void getLectureList(String userToken, int page, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void getLectureList(java.lang.String userToken, int page, org.apache.thrift.async.AsyncMethodCallback<java.util.List<LectureSummary>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       getLectureList_call method_call = new getLectureList_call(userToken, page, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class getLectureList_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String userToken;
+    public static class getLectureList_call extends org.apache.thrift.async.TAsyncMethodCall<java.util.List<LectureSummary>> {
+      private java.lang.String userToken;
       private int page;
-      public getLectureList_call(String userToken, int page, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public getLectureList_call(java.lang.String userToken, int page, org.apache.thrift.async.AsyncMethodCallback<java.util.List<LectureSummary>> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.userToken = userToken;
         this.page = page;
@@ -2900,9 +2873,9 @@ public class SatelliteServer {
         prot.writeMessageEnd();
       }
 
-      public List<LectureSummary> getResult() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException {
+      public java.util.List<LectureSummary> getResult() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
@@ -2910,17 +2883,17 @@ public class SatelliteServer {
       }
     }
 
-    public void getLectureDetails(String userToken, String lectureId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void getLectureDetails(java.lang.String userToken, java.lang.String lectureId, org.apache.thrift.async.AsyncMethodCallback<LectureRead> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       getLectureDetails_call method_call = new getLectureDetails_call(userToken, lectureId, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class getLectureDetails_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String userToken;
-      private String lectureId;
-      public getLectureDetails_call(String userToken, String lectureId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class getLectureDetails_call extends org.apache.thrift.async.TAsyncMethodCall<LectureRead> {
+      private java.lang.String userToken;
+      private java.lang.String lectureId;
+      public getLectureDetails_call(java.lang.String userToken, java.lang.String lectureId, org.apache.thrift.async.AsyncMethodCallback<LectureRead> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.userToken = userToken;
         this.lectureId = lectureId;
@@ -2937,7 +2910,7 @@ public class SatelliteServer {
 
       public LectureRead getResult() throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
@@ -2945,17 +2918,17 @@ public class SatelliteServer {
       }
     }
 
-    public void deleteLecture(String userToken, String lectureId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void deleteLecture(java.lang.String userToken, java.lang.String lectureId, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       deleteLecture_call method_call = new deleteLecture_call(userToken, lectureId, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class deleteLecture_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String userToken;
-      private String lectureId;
-      public deleteLecture_call(String userToken, String lectureId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class deleteLecture_call extends org.apache.thrift.async.TAsyncMethodCall<Void> {
+      private java.lang.String userToken;
+      private java.lang.String lectureId;
+      public deleteLecture_call(java.lang.String userToken, java.lang.String lectureId, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.userToken = userToken;
         this.lectureId = lectureId;
@@ -2970,28 +2943,28 @@ public class SatelliteServer {
         prot.writeMessageEnd();
       }
 
-      public void getResult() throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException {
+      public Void getResult() throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
-        (new Client(prot)).recv_deleteLecture();
+        return null;
       }
     }
 
-    public void writeLecturePermissions(String userToken, String lectureId, Map<String,LecturePermissions> permissions, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void writeLecturePermissions(java.lang.String userToken, java.lang.String lectureId, java.util.Map<java.lang.String,LecturePermissions> permissions, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       writeLecturePermissions_call method_call = new writeLecturePermissions_call(userToken, lectureId, permissions, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class writeLecturePermissions_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String userToken;
-      private String lectureId;
-      private Map<String,LecturePermissions> permissions;
-      public writeLecturePermissions_call(String userToken, String lectureId, Map<String,LecturePermissions> permissions, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class writeLecturePermissions_call extends org.apache.thrift.async.TAsyncMethodCall<Void> {
+      private java.lang.String userToken;
+      private java.lang.String lectureId;
+      private java.util.Map<java.lang.String,LecturePermissions> permissions;
+      public writeLecturePermissions_call(java.lang.String userToken, java.lang.String lectureId, java.util.Map<java.lang.String,LecturePermissions> permissions, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.userToken = userToken;
         this.lectureId = lectureId;
@@ -3008,27 +2981,27 @@ public class SatelliteServer {
         prot.writeMessageEnd();
       }
 
-      public void getResult() throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException {
+      public Void getResult() throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
-        (new Client(prot)).recv_writeLecturePermissions();
+        return null;
       }
     }
 
-    public void getLecturePermissions(String userToken, String lectureId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void getLecturePermissions(java.lang.String userToken, java.lang.String lectureId, org.apache.thrift.async.AsyncMethodCallback<java.util.Map<java.lang.String,LecturePermissions>> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       getLecturePermissions_call method_call = new getLecturePermissions_call(userToken, lectureId, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class getLecturePermissions_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String userToken;
-      private String lectureId;
-      public getLecturePermissions_call(String userToken, String lectureId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class getLecturePermissions_call extends org.apache.thrift.async.TAsyncMethodCall<java.util.Map<java.lang.String,LecturePermissions>> {
+      private java.lang.String userToken;
+      private java.lang.String lectureId;
+      public getLecturePermissions_call(java.lang.String userToken, java.lang.String lectureId, org.apache.thrift.async.AsyncMethodCallback<java.util.Map<java.lang.String,LecturePermissions>> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.userToken = userToken;
         this.lectureId = lectureId;
@@ -3043,9 +3016,9 @@ public class SatelliteServer {
         prot.writeMessageEnd();
       }
 
-      public Map<String,LecturePermissions> getResult() throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException {
+      public java.util.Map<java.lang.String,LecturePermissions> getResult() throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
@@ -3053,18 +3026,18 @@ public class SatelliteServer {
       }
     }
 
-    public void setLectureOwner(String userToken, String lectureId, String newOwnerId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void setLectureOwner(java.lang.String userToken, java.lang.String lectureId, java.lang.String newOwnerId, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       setLectureOwner_call method_call = new setLectureOwner_call(userToken, lectureId, newOwnerId, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class setLectureOwner_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String userToken;
-      private String lectureId;
-      private String newOwnerId;
-      public setLectureOwner_call(String userToken, String lectureId, String newOwnerId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class setLectureOwner_call extends org.apache.thrift.async.TAsyncMethodCall<Void> {
+      private java.lang.String userToken;
+      private java.lang.String lectureId;
+      private java.lang.String newOwnerId;
+      public setLectureOwner_call(java.lang.String userToken, java.lang.String lectureId, java.lang.String newOwnerId, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.userToken = userToken;
         this.lectureId = lectureId;
@@ -3081,26 +3054,26 @@ public class SatelliteServer {
         prot.writeMessageEnd();
       }
 
-      public void getResult() throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException {
+      public Void getResult() throws TAuthorizationException, TNotFoundException, TInvocationException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
-        (new Client(prot)).recv_setLectureOwner();
+        return null;
       }
     }
 
-    public void getPredefinedData(String userToken, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void getPredefinedData(java.lang.String userToken, org.apache.thrift.async.AsyncMethodCallback<PredefinedData> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       getPredefinedData_call method_call = new getPredefinedData_call(userToken, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
-    public static class getPredefinedData_call extends org.apache.thrift.async.TAsyncMethodCall {
-      private String userToken;
-      public getPredefinedData_call(String userToken, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+    public static class getPredefinedData_call extends org.apache.thrift.async.TAsyncMethodCall<PredefinedData> {
+      private java.lang.String userToken;
+      public getPredefinedData_call(java.lang.String userToken, org.apache.thrift.async.AsyncMethodCallback<PredefinedData> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.userToken = userToken;
       }
@@ -3115,7 +3088,7 @@ public class SatelliteServer {
 
       public PredefinedData getResult() throws TAuthorizationException, TInvocationException, org.apache.thrift.TException {
         if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
-          throw new IllegalStateException("Method call not finished!");
+          throw new java.lang.IllegalStateException("Method call not finished!");
         }
         org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
         org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
@@ -3126,16 +3099,16 @@ public class SatelliteServer {
   }
 
   public static class Processor<I extends Iface> extends org.apache.thrift.TBaseProcessor<I> implements org.apache.thrift.TProcessor {
-    private static final Logger LOGGER = LoggerFactory.getLogger(Processor.class.getName());
+    private static final org.slf4j.Logger _LOGGER = org.slf4j.LoggerFactory.getLogger(Processor.class.getName());
     public Processor(I iface) {
-      super(iface, getProcessMap(new HashMap<String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>>()));
+      super(iface, getProcessMap(new java.util.HashMap<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>>()));
     }
 
-    protected Processor(I iface, Map<String,  org.apache.thrift.ProcessFunction<I, ? extends  org.apache.thrift.TBase>> processMap) {
+    protected Processor(I iface, java.util.Map<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>> processMap) {
       super(iface, getProcessMap(processMap));
     }
 
-    private static <I extends Iface> Map<String,  org.apache.thrift.ProcessFunction<I, ? extends  org.apache.thrift.TBase>> getProcessMap(Map<String,  org.apache.thrift.ProcessFunction<I, ? extends  org.apache.thrift.TBase>> processMap) {
+    private static <I extends Iface> java.util.Map<java.lang.String,  org.apache.thrift.ProcessFunction<I, ? extends org.apache.thrift.TBase>> getProcessMap(java.util.Map<java.lang.String, org.apache.thrift.ProcessFunction<I, ? extends  org.apache.thrift.TBase>> processMap) {
       processMap.put("getVersion", new getVersion());
       processMap.put("getSupportedFeatures", new getSupportedFeatures());
       processMap.put("getConfiguration", new getConfiguration());
@@ -3197,6 +3170,11 @@ public class SatelliteServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public getVersion_result getResult(I iface, getVersion_args args) throws org.apache.thrift.TException {
         getVersion_result result = new getVersion_result();
         result.success = iface.getVersion(args.clientVersion);
@@ -3218,6 +3196,11 @@ public class SatelliteServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public getSupportedFeatures_result getResult(I iface, getSupportedFeatures_args args) throws org.apache.thrift.TException {
         getSupportedFeatures_result result = new getSupportedFeatures_result();
         result.success = iface.getSupportedFeatures();
@@ -3238,6 +3221,11 @@ public class SatelliteServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public getConfiguration_result getResult(I iface, getConfiguration_args args) throws org.apache.thrift.TException {
         getConfiguration_result result = new getConfiguration_result();
         result.success = iface.getConfiguration();
@@ -3258,6 +3246,11 @@ public class SatelliteServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public requestImageVersionUpload_result getResult(I iface, requestImageVersionUpload_args args) throws org.apache.thrift.TException {
         requestImageVersionUpload_result result = new requestImageVersionUpload_result();
         try {
@@ -3288,6 +3281,11 @@ public class SatelliteServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public updateBlockHashes_result getResult(I iface, updateBlockHashes_args args) throws org.apache.thrift.TException {
         updateBlockHashes_result result = new updateBlockHashes_result();
         try {
@@ -3312,6 +3310,11 @@ public class SatelliteServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public setUploadOptions_result getResult(I iface, setUploadOptions_args args) throws org.apache.thrift.TException {
         setUploadOptions_result result = new setUploadOptions_result();
         try {
@@ -3338,6 +3341,11 @@ public class SatelliteServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public cancelUpload_result getResult(I iface, cancelUpload_args args) throws org.apache.thrift.TException {
         cancelUpload_result result = new cancelUpload_result();
         try {
@@ -3362,6 +3370,11 @@ public class SatelliteServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public queryUploadStatus_result getResult(I iface, queryUploadStatus_args args) throws org.apache.thrift.TException {
         queryUploadStatus_result result = new queryUploadStatus_result();
         try {
@@ -3386,6 +3399,11 @@ public class SatelliteServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public requestDownload_result getResult(I iface, requestDownload_args args) throws org.apache.thrift.TException {
         requestDownload_result result = new requestDownload_result();
         try {
@@ -3416,6 +3434,11 @@ public class SatelliteServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public cancelDownload_result getResult(I iface, cancelDownload_args args) throws org.apache.thrift.TException {
         cancelDownload_result result = new cancelDownload_result();
         try {
@@ -3440,6 +3463,11 @@ public class SatelliteServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public isAuthenticated_result getResult(I iface, isAuthenticated_args args) throws org.apache.thrift.TException {
         isAuthenticated_result result = new isAuthenticated_result();
         try {
@@ -3466,6 +3494,11 @@ public class SatelliteServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public whoami_result getResult(I iface, whoami_args args) throws org.apache.thrift.TException {
         whoami_result result = new whoami_result();
         try {
@@ -3492,6 +3525,11 @@ public class SatelliteServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public invalidateSession_result getResult(I iface, invalidateSession_args args) throws org.apache.thrift.TException {
         invalidateSession_result result = new invalidateSession_result();
         try {
@@ -3516,6 +3554,11 @@ public class SatelliteServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public getUserList_result getResult(I iface, getUserList_args args) throws org.apache.thrift.TException {
         getUserList_result result = new getUserList_result();
         try {
@@ -3542,6 +3585,11 @@ public class SatelliteServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public getUserConfig_result getResult(I iface, getUserConfig_args args) throws org.apache.thrift.TException {
         getUserConfig_result result = new getUserConfig_result();
         try {
@@ -3568,6 +3616,11 @@ public class SatelliteServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public setUserConfig_result getResult(I iface, setUserConfig_args args) throws org.apache.thrift.TException {
         setUserConfig_result result = new setUserConfig_result();
         try {
@@ -3594,6 +3647,11 @@ public class SatelliteServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public getOperatingSystems_result getResult(I iface, getOperatingSystems_args args) throws org.apache.thrift.TException {
         getOperatingSystems_result result = new getOperatingSystems_result();
         result.success = iface.getOperatingSystems();
@@ -3614,6 +3672,11 @@ public class SatelliteServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public getVirtualizers_result getResult(I iface, getVirtualizers_args args) throws org.apache.thrift.TException {
         getVirtualizers_result result = new getVirtualizers_result();
         result.success = iface.getVirtualizers();
@@ -3634,6 +3697,11 @@ public class SatelliteServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public getAllOrganizations_result getResult(I iface, getAllOrganizations_args args) throws org.apache.thrift.TException {
         getAllOrganizations_result result = new getAllOrganizations_result();
         result.success = iface.getAllOrganizations();
@@ -3654,6 +3722,11 @@ public class SatelliteServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public getLocations_result getResult(I iface, getLocations_args args) throws org.apache.thrift.TException {
         getLocations_result result = new getLocations_result();
         result.success = iface.getLocations();
@@ -3674,6 +3747,11 @@ public class SatelliteServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public getStatus_result getResult(I iface, getStatus_args args) throws org.apache.thrift.TException {
         getStatus_result result = new getStatus_result();
         result.success = iface.getStatus();
@@ -3694,6 +3772,11 @@ public class SatelliteServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public getImageList_result getResult(I iface, getImageList_args args) throws org.apache.thrift.TException {
         getImageList_result result = new getImageList_result();
         try {
@@ -3720,6 +3803,11 @@ public class SatelliteServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public getImageDetails_result getResult(I iface, getImageDetails_args args) throws org.apache.thrift.TException {
         getImageDetails_result result = new getImageDetails_result();
         try {
@@ -3748,6 +3836,11 @@ public class SatelliteServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public createImage_result getResult(I iface, createImage_args args) throws org.apache.thrift.TException {
         createImage_result result = new createImage_result();
         try {
@@ -3774,6 +3867,11 @@ public class SatelliteServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public updateImageBase_result getResult(I iface, updateImageBase_args args) throws org.apache.thrift.TException {
         updateImageBase_result result = new updateImageBase_result();
         try {
@@ -3802,6 +3900,11 @@ public class SatelliteServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public updateImageVersion_result getResult(I iface, updateImageVersion_args args) throws org.apache.thrift.TException {
         updateImageVersion_result result = new updateImageVersion_result();
         try {
@@ -3830,6 +3933,11 @@ public class SatelliteServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public deleteImageVersion_result getResult(I iface, deleteImageVersion_args args) throws org.apache.thrift.TException {
         deleteImageVersion_result result = new deleteImageVersion_result();
         try {
@@ -3858,6 +3966,11 @@ public class SatelliteServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public deleteImageBase_result getResult(I iface, deleteImageBase_args args) throws org.apache.thrift.TException {
         deleteImageBase_result result = new deleteImageBase_result();
         try {
@@ -3886,6 +3999,11 @@ public class SatelliteServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public writeImagePermissions_result getResult(I iface, writeImagePermissions_args args) throws org.apache.thrift.TException {
         writeImagePermissions_result result = new writeImagePermissions_result();
         try {
@@ -3914,6 +4032,11 @@ public class SatelliteServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public getImagePermissions_result getResult(I iface, getImagePermissions_args args) throws org.apache.thrift.TException {
         getImagePermissions_result result = new getImagePermissions_result();
         try {
@@ -3942,6 +4065,11 @@ public class SatelliteServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public setImageOwner_result getResult(I iface, setImageOwner_args args) throws org.apache.thrift.TException {
         setImageOwner_result result = new setImageOwner_result();
         try {
@@ -3970,6 +4098,11 @@ public class SatelliteServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public setImageVersionExpiry_result getResult(I iface, setImageVersionExpiry_args args) throws org.apache.thrift.TException {
         setImageVersionExpiry_result result = new setImageVersionExpiry_result();
         try {
@@ -4000,6 +4133,11 @@ public class SatelliteServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public getImageVersionVirtConfig_result getResult(I iface, getImageVersionVirtConfig_args args) throws org.apache.thrift.TException {
         getImageVersionVirtConfig_result result = new getImageVersionVirtConfig_result();
         try {
@@ -4028,6 +4166,11 @@ public class SatelliteServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public setImageVersionVirtConfig_result getResult(I iface, setImageVersionVirtConfig_args args) throws org.apache.thrift.TException {
         setImageVersionVirtConfig_result result = new setImageVersionVirtConfig_result();
         try {
@@ -4056,6 +4199,11 @@ public class SatelliteServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public requestImageReplication_result getResult(I iface, requestImageReplication_args args) throws org.apache.thrift.TException {
         requestImageReplication_result result = new requestImageReplication_result();
         try {
@@ -4084,6 +4232,11 @@ public class SatelliteServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public publishImageVersion_result getResult(I iface, publishImageVersion_args args) throws org.apache.thrift.TException {
         publishImageVersion_result result = new publishImageVersion_result();
         try {
@@ -4114,6 +4267,11 @@ public class SatelliteServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public createLecture_result getResult(I iface, createLecture_args args) throws org.apache.thrift.TException {
         createLecture_result result = new createLecture_result();
         try {
@@ -4144,6 +4302,11 @@ public class SatelliteServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public updateLecture_result getResult(I iface, updateLecture_args args) throws org.apache.thrift.TException {
         updateLecture_result result = new updateLecture_result();
         try {
@@ -4174,6 +4337,11 @@ public class SatelliteServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public getLectureList_result getResult(I iface, getLectureList_args args) throws org.apache.thrift.TException {
         getLectureList_result result = new getLectureList_result();
         try {
@@ -4200,6 +4368,11 @@ public class SatelliteServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public getLectureDetails_result getResult(I iface, getLectureDetails_args args) throws org.apache.thrift.TException {
         getLectureDetails_result result = new getLectureDetails_result();
         try {
@@ -4228,6 +4401,11 @@ public class SatelliteServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public deleteLecture_result getResult(I iface, deleteLecture_args args) throws org.apache.thrift.TException {
         deleteLecture_result result = new deleteLecture_result();
         try {
@@ -4256,6 +4434,11 @@ public class SatelliteServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public writeLecturePermissions_result getResult(I iface, writeLecturePermissions_args args) throws org.apache.thrift.TException {
         writeLecturePermissions_result result = new writeLecturePermissions_result();
         try {
@@ -4284,6 +4467,11 @@ public class SatelliteServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public getLecturePermissions_result getResult(I iface, getLecturePermissions_args args) throws org.apache.thrift.TException {
         getLecturePermissions_result result = new getLecturePermissions_result();
         try {
@@ -4312,6 +4500,11 @@ public class SatelliteServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public setLectureOwner_result getResult(I iface, setLectureOwner_args args) throws org.apache.thrift.TException {
         setLectureOwner_result result = new setLectureOwner_result();
         try {
@@ -4340,6 +4533,11 @@ public class SatelliteServer {
         return false;
       }
 
+      @Override
+      protected boolean rethrowUnhandledExceptions() {
+        return false;
+      }
+
       public getPredefinedData_result getResult(I iface, getPredefinedData_args args) throws org.apache.thrift.TException {
         getPredefinedData_result result = new getPredefinedData_result();
         try {
@@ -4356,16 +4554,16 @@ public class SatelliteServer {
   }
 
   public static class AsyncProcessor<I extends AsyncIface> extends org.apache.thrift.TBaseAsyncProcessor<I> {
-    private static final Logger LOGGER = LoggerFactory.getLogger(AsyncProcessor.class.getName());
+    private static final org.slf4j.Logger _LOGGER = org.slf4j.LoggerFactory.getLogger(AsyncProcessor.class.getName());
     public AsyncProcessor(I iface) {
-      super(iface, getProcessMap(new HashMap<String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase, ?>>()));
+      super(iface, getProcessMap(new java.util.HashMap<java.lang.String, org.apache.thrift.AsyncProcessFunction<I, ? extends org.apache.thrift.TBase, ?>>()));
     }
 
-    protected AsyncProcessor(I iface, Map<String,  org.apache.thrift.AsyncProcessFunction<I, ? extends  org.apache.thrift.TBase, ?>> processMap) {
+    protected AsyncProcessor(I iface, java.util.Map<java.lang.String,  org.apache.thrift.AsyncProcessFunction<I, ? extends  org.apache.thrift.TBase, ?>> processMap) {
       super(iface, getProcessMap(processMap));
     }
 
-    private static <I extends AsyncIface> Map<String,  org.apache.thrift.AsyncProcessFunction<I, ? extends  org.apache.thrift.TBase,?>> getProcessMap(Map<String,  org.apache.thrift.AsyncProcessFunction<I, ? extends  org.apache.thrift.TBase, ?>> processMap) {
+    private static <I extends AsyncIface> java.util.Map<java.lang.String,  org.apache.thrift.AsyncProcessFunction<I, ? extends  org.apache.thrift.TBase,?>> getProcessMap(java.util.Map<java.lang.String,  org.apache.thrift.AsyncProcessFunction<I, ? extends  org.apache.thrift.TBase, ?>> processMap) {
       processMap.put("getVersion", new getVersion());
       processMap.put("getSupportedFeatures", new getSupportedFeatures());
       processMap.put("getConfiguration", new getConfiguration());
@@ -4414,7 +4612,7 @@ public class SatelliteServer {
       return processMap;
     }
 
-    public static class getVersion<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getVersion_args, Long> {
+    public static class getVersion<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getVersion_args, java.lang.Long> {
       public getVersion() {
         super("getVersion");
       }
@@ -4423,36 +4621,46 @@ public class SatelliteServer {
         return new getVersion_args();
       }
 
-      public AsyncMethodCallback<Long> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<java.lang.Long> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<Long>() { 
-          public void onComplete(Long o) {
+        return new org.apache.thrift.async.AsyncMethodCallback<java.lang.Long>() { 
+          public void onComplete(java.lang.Long o) {
             getVersion_result result = new getVersion_result();
             result.success = o;
             result.setSuccessIsSet(true);
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             getVersion_result result = new getVersion_result();
-            {
+            if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -4461,12 +4669,12 @@ public class SatelliteServer {
         return false;
       }
 
-      public void start(I iface, getVersion_args args, org.apache.thrift.async.AsyncMethodCallback<Long> resultHandler) throws TException {
+      public void start(I iface, getVersion_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.Long> resultHandler) throws org.apache.thrift.TException {
         iface.getVersion(args.clientVersion,resultHandler);
       }
     }
 
-    public static class getSupportedFeatures<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getSupportedFeatures_args, String> {
+    public static class getSupportedFeatures<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getSupportedFeatures_args, java.lang.String> {
       public getSupportedFeatures() {
         super("getSupportedFeatures");
       }
@@ -4475,35 +4683,45 @@ public class SatelliteServer {
         return new getSupportedFeatures_args();
       }
 
-      public AsyncMethodCallback<String> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<java.lang.String> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<String>() { 
-          public void onComplete(String o) {
+        return new org.apache.thrift.async.AsyncMethodCallback<java.lang.String>() { 
+          public void onComplete(java.lang.String o) {
             getSupportedFeatures_result result = new getSupportedFeatures_result();
             result.success = o;
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             getSupportedFeatures_result result = new getSupportedFeatures_result();
-            {
+            if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -4512,7 +4730,7 @@ public class SatelliteServer {
         return false;
       }
 
-      public void start(I iface, getSupportedFeatures_args args, org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws TException {
+      public void start(I iface, getSupportedFeatures_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException {
         iface.getSupportedFeatures(resultHandler);
       }
     }
@@ -4526,35 +4744,45 @@ public class SatelliteServer {
         return new getConfiguration_args();
       }
 
-      public AsyncMethodCallback<SatelliteConfig> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<SatelliteConfig> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<SatelliteConfig>() { 
+        return new org.apache.thrift.async.AsyncMethodCallback<SatelliteConfig>() { 
           public void onComplete(SatelliteConfig o) {
             getConfiguration_result result = new getConfiguration_result();
             result.success = o;
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             getConfiguration_result result = new getConfiguration_result();
-            {
+            if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -4563,7 +4791,7 @@ public class SatelliteServer {
         return false;
       }
 
-      public void start(I iface, getConfiguration_args args, org.apache.thrift.async.AsyncMethodCallback<SatelliteConfig> resultHandler) throws TException {
+      public void start(I iface, getConfiguration_args args, org.apache.thrift.async.AsyncMethodCallback<SatelliteConfig> resultHandler) throws org.apache.thrift.TException {
         iface.getConfiguration(resultHandler);
       }
     }
@@ -4577,56 +4805,61 @@ public class SatelliteServer {
         return new requestImageVersionUpload_args();
       }
 
-      public AsyncMethodCallback<TransferInformation> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<TransferInformation> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<TransferInformation>() { 
+        return new org.apache.thrift.async.AsyncMethodCallback<TransferInformation>() { 
           public void onComplete(TransferInformation o) {
             requestImageVersionUpload_result result = new requestImageVersionUpload_result();
             result.success = o;
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             requestImageVersionUpload_result result = new requestImageVersionUpload_result();
             if (e instanceof TTransferRejectedException) {
-                        result.rejection = (TTransferRejectedException) e;
-                        result.setRejectionIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TAuthorizationException) {
-                        result.authError = (TAuthorizationException) e;
-                        result.setAuthErrorIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TInvocationException) {
-                        result.ffff = (TInvocationException) e;
-                        result.setFfffIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TNotFoundException) {
-                        result.sdf = (TNotFoundException) e;
-                        result.setSdfIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.rejection = (TTransferRejectedException) e;
+              result.setRejectionIsSet(true);
+              msg = result;
+            } else if (e instanceof TAuthorizationException) {
+              result.authError = (TAuthorizationException) e;
+              result.setAuthErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof TInvocationException) {
+              result.ffff = (TInvocationException) e;
+              result.setFfffIsSet(true);
+              msg = result;
+            } else if (e instanceof TNotFoundException) {
+              result.sdf = (TNotFoundException) e;
+              result.setSdfIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -4635,7 +4868,7 @@ public class SatelliteServer {
         return false;
       }
 
-      public void start(I iface, requestImageVersionUpload_args args, org.apache.thrift.async.AsyncMethodCallback<TransferInformation> resultHandler) throws TException {
+      public void start(I iface, requestImageVersionUpload_args args, org.apache.thrift.async.AsyncMethodCallback<TransferInformation> resultHandler) throws org.apache.thrift.TException {
         iface.requestImageVersionUpload(args.userToken, args.imageBaseId, args.fileSize, args.blockHashes, args.machineDescription,resultHandler);
       }
     }
@@ -4649,40 +4882,48 @@ public class SatelliteServer {
         return new updateBlockHashes_args();
       }
 
-      public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<Void> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<Void>() { 
+        return new org.apache.thrift.async.AsyncMethodCallback<Void>() { 
           public void onComplete(Void o) {
             updateBlockHashes_result result = new updateBlockHashes_result();
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             updateBlockHashes_result result = new updateBlockHashes_result();
             if (e instanceof TInvalidTokenException) {
-                        result.ex1 = (TInvalidTokenException) e;
-                        result.setEx1IsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.ex1 = (TInvalidTokenException) e;
+              result.setEx1IsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -4691,7 +4932,7 @@ public class SatelliteServer {
         return false;
       }
 
-      public void start(I iface, updateBlockHashes_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
+      public void start(I iface, updateBlockHashes_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.updateBlockHashes(args.uploadToken, args.blockHashes, args.userToken,resultHandler);
       }
     }
@@ -4705,46 +4946,53 @@ public class SatelliteServer {
         return new setUploadOptions_args();
       }
 
-      public AsyncMethodCallback<UploadOptions> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<UploadOptions> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<UploadOptions>() { 
+        return new org.apache.thrift.async.AsyncMethodCallback<UploadOptions>() { 
           public void onComplete(UploadOptions o) {
             setUploadOptions_result result = new setUploadOptions_result();
             result.success = o;
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             setUploadOptions_result result = new setUploadOptions_result();
             if (e instanceof TAuthorizationException) {
-                        result.frootloops = (TAuthorizationException) e;
-                        result.setFrootloopsIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TInvalidTokenException) {
-                        result.imcyborgbutthatsok = (TInvalidTokenException) e;
-                        result.setImcyborgbutthatsokIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.frootloops = (TAuthorizationException) e;
+              result.setFrootloopsIsSet(true);
+              msg = result;
+            } else if (e instanceof TInvalidTokenException) {
+              result.imcyborgbutthatsok = (TInvalidTokenException) e;
+              result.setImcyborgbutthatsokIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -4753,7 +5001,7 @@ public class SatelliteServer {
         return false;
       }
 
-      public void start(I iface, setUploadOptions_args args, org.apache.thrift.async.AsyncMethodCallback<UploadOptions> resultHandler) throws TException {
+      public void start(I iface, setUploadOptions_args args, org.apache.thrift.async.AsyncMethodCallback<UploadOptions> resultHandler) throws org.apache.thrift.TException {
         iface.setUploadOptions(args.userToken, args.uploadToken, args.options,resultHandler);
       }
     }
@@ -4767,40 +5015,48 @@ public class SatelliteServer {
         return new cancelUpload_args();
       }
 
-      public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<Void> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<Void>() { 
+        return new org.apache.thrift.async.AsyncMethodCallback<Void>() { 
           public void onComplete(Void o) {
             cancelUpload_result result = new cancelUpload_result();
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             cancelUpload_result result = new cancelUpload_result();
             if (e instanceof TInvalidTokenException) {
-                        result.ex1 = (TInvalidTokenException) e;
-                        result.setEx1IsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.ex1 = (TInvalidTokenException) e;
+              result.setEx1IsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -4809,7 +5065,7 @@ public class SatelliteServer {
         return false;
       }
 
-      public void start(I iface, cancelUpload_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
+      public void start(I iface, cancelUpload_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.cancelUpload(args.uploadToken,resultHandler);
       }
     }
@@ -4823,41 +5079,49 @@ public class SatelliteServer {
         return new queryUploadStatus_args();
       }
 
-      public AsyncMethodCallback<TransferStatus> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<TransferStatus> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<TransferStatus>() { 
+        return new org.apache.thrift.async.AsyncMethodCallback<TransferStatus>() { 
           public void onComplete(TransferStatus o) {
             queryUploadStatus_result result = new queryUploadStatus_result();
             result.success = o;
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             queryUploadStatus_result result = new queryUploadStatus_result();
             if (e instanceof TInvalidTokenException) {
-                        result.ex1 = (TInvalidTokenException) e;
-                        result.setEx1IsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.ex1 = (TInvalidTokenException) e;
+              result.setEx1IsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -4866,7 +5130,7 @@ public class SatelliteServer {
         return false;
       }
 
-      public void start(I iface, queryUploadStatus_args args, org.apache.thrift.async.AsyncMethodCallback<TransferStatus> resultHandler) throws TException {
+      public void start(I iface, queryUploadStatus_args args, org.apache.thrift.async.AsyncMethodCallback<TransferStatus> resultHandler) throws org.apache.thrift.TException {
         iface.queryUploadStatus(args.uploadToken,resultHandler);
       }
     }
@@ -4880,56 +5144,61 @@ public class SatelliteServer {
         return new requestDownload_args();
       }
 
-      public AsyncMethodCallback<TransferInformation> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<TransferInformation> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<TransferInformation>() { 
+        return new org.apache.thrift.async.AsyncMethodCallback<TransferInformation>() { 
           public void onComplete(TransferInformation o) {
             requestDownload_result result = new requestDownload_result();
             result.success = o;
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             requestDownload_result result = new requestDownload_result();
             if (e instanceof TTransferRejectedException) {
-                        result.rejection = (TTransferRejectedException) e;
-                        result.setRejectionIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TAuthorizationException) {
-                        result.authError = (TAuthorizationException) e;
-                        result.setAuthErrorIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TInvocationException) {
-                        result.ffff = (TInvocationException) e;
-                        result.setFfffIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TNotFoundException) {
-                        result.sdf = (TNotFoundException) e;
-                        result.setSdfIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.rejection = (TTransferRejectedException) e;
+              result.setRejectionIsSet(true);
+              msg = result;
+            } else if (e instanceof TAuthorizationException) {
+              result.authError = (TAuthorizationException) e;
+              result.setAuthErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof TInvocationException) {
+              result.ffff = (TInvocationException) e;
+              result.setFfffIsSet(true);
+              msg = result;
+            } else if (e instanceof TNotFoundException) {
+              result.sdf = (TNotFoundException) e;
+              result.setSdfIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -4938,7 +5207,7 @@ public class SatelliteServer {
         return false;
       }
 
-      public void start(I iface, requestDownload_args args, org.apache.thrift.async.AsyncMethodCallback<TransferInformation> resultHandler) throws TException {
+      public void start(I iface, requestDownload_args args, org.apache.thrift.async.AsyncMethodCallback<TransferInformation> resultHandler) throws org.apache.thrift.TException {
         iface.requestDownload(args.userToken, args.imageVersionId,resultHandler);
       }
     }
@@ -4952,40 +5221,48 @@ public class SatelliteServer {
         return new cancelDownload_args();
       }
 
-      public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<Void> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<Void>() { 
+        return new org.apache.thrift.async.AsyncMethodCallback<Void>() { 
           public void onComplete(Void o) {
             cancelDownload_result result = new cancelDownload_result();
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             cancelDownload_result result = new cancelDownload_result();
             if (e instanceof TInvalidTokenException) {
-                        result.ex1 = (TInvalidTokenException) e;
-                        result.setEx1IsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.ex1 = (TInvalidTokenException) e;
+              result.setEx1IsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -4994,7 +5271,7 @@ public class SatelliteServer {
         return false;
       }
 
-      public void start(I iface, cancelDownload_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
+      public void start(I iface, cancelDownload_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.cancelDownload(args.downloadToken,resultHandler);
       }
     }
@@ -5008,45 +5285,52 @@ public class SatelliteServer {
         return new isAuthenticated_args();
       }
 
-      public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<Void> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<Void>() { 
+        return new org.apache.thrift.async.AsyncMethodCallback<Void>() { 
           public void onComplete(Void o) {
             isAuthenticated_result result = new isAuthenticated_result();
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             isAuthenticated_result result = new isAuthenticated_result();
             if (e instanceof TAuthorizationException) {
-                        result.authError = (TAuthorizationException) e;
-                        result.setAuthErrorIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TInvocationException) {
-                        result.serverError = (TInvocationException) e;
-                        result.setServerErrorIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.authError = (TAuthorizationException) e;
+              result.setAuthErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof TInvocationException) {
+              result.serverError = (TInvocationException) e;
+              result.setServerErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -5055,7 +5339,7 @@ public class SatelliteServer {
         return false;
       }
 
-      public void start(I iface, isAuthenticated_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
+      public void start(I iface, isAuthenticated_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.isAuthenticated(args.userToken,resultHandler);
       }
     }
@@ -5069,46 +5353,53 @@ public class SatelliteServer {
         return new whoami_args();
       }
 
-      public AsyncMethodCallback<WhoamiInfo> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<WhoamiInfo> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<WhoamiInfo>() { 
+        return new org.apache.thrift.async.AsyncMethodCallback<WhoamiInfo>() { 
           public void onComplete(WhoamiInfo o) {
             whoami_result result = new whoami_result();
             result.success = o;
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             whoami_result result = new whoami_result();
             if (e instanceof TAuthorizationException) {
-                        result.authError = (TAuthorizationException) e;
-                        result.setAuthErrorIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TInvocationException) {
-                        result.serverError = (TInvocationException) e;
-                        result.setServerErrorIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.authError = (TAuthorizationException) e;
+              result.setAuthErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof TInvocationException) {
+              result.serverError = (TInvocationException) e;
+              result.setServerErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -5117,7 +5408,7 @@ public class SatelliteServer {
         return false;
       }
 
-      public void start(I iface, whoami_args args, org.apache.thrift.async.AsyncMethodCallback<WhoamiInfo> resultHandler) throws TException {
+      public void start(I iface, whoami_args args, org.apache.thrift.async.AsyncMethodCallback<WhoamiInfo> resultHandler) throws org.apache.thrift.TException {
         iface.whoami(args.userToken,resultHandler);
       }
     }
@@ -5131,40 +5422,48 @@ public class SatelliteServer {
         return new invalidateSession_args();
       }
 
-      public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<Void> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<Void>() { 
+        return new org.apache.thrift.async.AsyncMethodCallback<Void>() { 
           public void onComplete(Void o) {
             invalidateSession_result result = new invalidateSession_result();
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             invalidateSession_result result = new invalidateSession_result();
             if (e instanceof TInvalidTokenException) {
-                        result.ex = (TInvalidTokenException) e;
-                        result.setExIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.ex = (TInvalidTokenException) e;
+              result.setExIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -5173,12 +5472,12 @@ public class SatelliteServer {
         return false;
       }
 
-      public void start(I iface, invalidateSession_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
+      public void start(I iface, invalidateSession_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.invalidateSession(args.userToken,resultHandler);
       }
     }
 
-    public static class getUserList<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getUserList_args, List<UserInfo>> {
+    public static class getUserList<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getUserList_args, java.util.List<UserInfo>> {
       public getUserList() {
         super("getUserList");
       }
@@ -5187,46 +5486,53 @@ public class SatelliteServer {
         return new getUserList_args();
       }
 
-      public AsyncMethodCallback<List<UserInfo>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<java.util.List<UserInfo>> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<List<UserInfo>>() { 
-          public void onComplete(List<UserInfo> o) {
+        return new org.apache.thrift.async.AsyncMethodCallback<java.util.List<UserInfo>>() { 
+          public void onComplete(java.util.List<UserInfo> o) {
             getUserList_result result = new getUserList_result();
             result.success = o;
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             getUserList_result result = new getUserList_result();
             if (e instanceof TAuthorizationException) {
-                        result.failure = (TAuthorizationException) e;
-                        result.setFailureIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TInvocationException) {
-                        result.serverError = (TInvocationException) e;
-                        result.setServerErrorIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.failure = (TAuthorizationException) e;
+              result.setFailureIsSet(true);
+              msg = result;
+            } else if (e instanceof TInvocationException) {
+              result.serverError = (TInvocationException) e;
+              result.setServerErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -5235,7 +5541,7 @@ public class SatelliteServer {
         return false;
       }
 
-      public void start(I iface, getUserList_args args, org.apache.thrift.async.AsyncMethodCallback<List<UserInfo>> resultHandler) throws TException {
+      public void start(I iface, getUserList_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<UserInfo>> resultHandler) throws org.apache.thrift.TException {
         iface.getUserList(args.userToken, args.page,resultHandler);
       }
     }
@@ -5249,46 +5555,53 @@ public class SatelliteServer {
         return new getUserConfig_args();
       }
 
-      public AsyncMethodCallback<SatelliteUserConfig> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<SatelliteUserConfig> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<SatelliteUserConfig>() { 
+        return new org.apache.thrift.async.AsyncMethodCallback<SatelliteUserConfig>() { 
           public void onComplete(SatelliteUserConfig o) {
             getUserConfig_result result = new getUserConfig_result();
             result.success = o;
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             getUserConfig_result result = new getUserConfig_result();
             if (e instanceof TAuthorizationException) {
-                        result.failure = (TAuthorizationException) e;
-                        result.setFailureIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TInvocationException) {
-                        result.serverError = (TInvocationException) e;
-                        result.setServerErrorIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.failure = (TAuthorizationException) e;
+              result.setFailureIsSet(true);
+              msg = result;
+            } else if (e instanceof TInvocationException) {
+              result.serverError = (TInvocationException) e;
+              result.setServerErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -5297,7 +5610,7 @@ public class SatelliteServer {
         return false;
       }
 
-      public void start(I iface, getUserConfig_args args, org.apache.thrift.async.AsyncMethodCallback<SatelliteUserConfig> resultHandler) throws TException {
+      public void start(I iface, getUserConfig_args args, org.apache.thrift.async.AsyncMethodCallback<SatelliteUserConfig> resultHandler) throws org.apache.thrift.TException {
         iface.getUserConfig(args.userToken,resultHandler);
       }
     }
@@ -5311,45 +5624,52 @@ public class SatelliteServer {
         return new setUserConfig_args();
       }
 
-      public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<Void> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<Void>() { 
+        return new org.apache.thrift.async.AsyncMethodCallback<Void>() { 
           public void onComplete(Void o) {
             setUserConfig_result result = new setUserConfig_result();
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             setUserConfig_result result = new setUserConfig_result();
             if (e instanceof TAuthorizationException) {
-                        result.failure = (TAuthorizationException) e;
-                        result.setFailureIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TInvocationException) {
-                        result.serverError = (TInvocationException) e;
-                        result.setServerErrorIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.failure = (TAuthorizationException) e;
+              result.setFailureIsSet(true);
+              msg = result;
+            } else if (e instanceof TInvocationException) {
+              result.serverError = (TInvocationException) e;
+              result.setServerErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -5358,12 +5678,12 @@ public class SatelliteServer {
         return false;
       }
 
-      public void start(I iface, setUserConfig_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
+      public void start(I iface, setUserConfig_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.setUserConfig(args.userToken, args.config,resultHandler);
       }
     }
 
-    public static class getOperatingSystems<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getOperatingSystems_args, List<OperatingSystem>> {
+    public static class getOperatingSystems<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getOperatingSystems_args, java.util.List<OperatingSystem>> {
       public getOperatingSystems() {
         super("getOperatingSystems");
       }
@@ -5372,35 +5692,45 @@ public class SatelliteServer {
         return new getOperatingSystems_args();
       }
 
-      public AsyncMethodCallback<List<OperatingSystem>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<java.util.List<OperatingSystem>> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<List<OperatingSystem>>() { 
-          public void onComplete(List<OperatingSystem> o) {
+        return new org.apache.thrift.async.AsyncMethodCallback<java.util.List<OperatingSystem>>() { 
+          public void onComplete(java.util.List<OperatingSystem> o) {
             getOperatingSystems_result result = new getOperatingSystems_result();
             result.success = o;
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             getOperatingSystems_result result = new getOperatingSystems_result();
-            {
+            if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -5409,12 +5739,12 @@ public class SatelliteServer {
         return false;
       }
 
-      public void start(I iface, getOperatingSystems_args args, org.apache.thrift.async.AsyncMethodCallback<List<OperatingSystem>> resultHandler) throws TException {
+      public void start(I iface, getOperatingSystems_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<OperatingSystem>> resultHandler) throws org.apache.thrift.TException {
         iface.getOperatingSystems(resultHandler);
       }
     }
 
-    public static class getVirtualizers<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getVirtualizers_args, List<Virtualizer>> {
+    public static class getVirtualizers<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getVirtualizers_args, java.util.List<Virtualizer>> {
       public getVirtualizers() {
         super("getVirtualizers");
       }
@@ -5423,35 +5753,45 @@ public class SatelliteServer {
         return new getVirtualizers_args();
       }
 
-      public AsyncMethodCallback<List<Virtualizer>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<java.util.List<Virtualizer>> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<List<Virtualizer>>() { 
-          public void onComplete(List<Virtualizer> o) {
+        return new org.apache.thrift.async.AsyncMethodCallback<java.util.List<Virtualizer>>() { 
+          public void onComplete(java.util.List<Virtualizer> o) {
             getVirtualizers_result result = new getVirtualizers_result();
             result.success = o;
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             getVirtualizers_result result = new getVirtualizers_result();
-            {
+            if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -5460,12 +5800,12 @@ public class SatelliteServer {
         return false;
       }
 
-      public void start(I iface, getVirtualizers_args args, org.apache.thrift.async.AsyncMethodCallback<List<Virtualizer>> resultHandler) throws TException {
+      public void start(I iface, getVirtualizers_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<Virtualizer>> resultHandler) throws org.apache.thrift.TException {
         iface.getVirtualizers(resultHandler);
       }
     }
 
-    public static class getAllOrganizations<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getAllOrganizations_args, List<Organization>> {
+    public static class getAllOrganizations<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getAllOrganizations_args, java.util.List<Organization>> {
       public getAllOrganizations() {
         super("getAllOrganizations");
       }
@@ -5474,35 +5814,45 @@ public class SatelliteServer {
         return new getAllOrganizations_args();
       }
 
-      public AsyncMethodCallback<List<Organization>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<java.util.List<Organization>> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<List<Organization>>() { 
-          public void onComplete(List<Organization> o) {
+        return new org.apache.thrift.async.AsyncMethodCallback<java.util.List<Organization>>() { 
+          public void onComplete(java.util.List<Organization> o) {
             getAllOrganizations_result result = new getAllOrganizations_result();
             result.success = o;
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             getAllOrganizations_result result = new getAllOrganizations_result();
-            {
+            if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -5511,12 +5861,12 @@ public class SatelliteServer {
         return false;
       }
 
-      public void start(I iface, getAllOrganizations_args args, org.apache.thrift.async.AsyncMethodCallback<List<Organization>> resultHandler) throws TException {
+      public void start(I iface, getAllOrganizations_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<Organization>> resultHandler) throws org.apache.thrift.TException {
         iface.getAllOrganizations(resultHandler);
       }
     }
 
-    public static class getLocations<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getLocations_args, List<Location>> {
+    public static class getLocations<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getLocations_args, java.util.List<Location>> {
       public getLocations() {
         super("getLocations");
       }
@@ -5525,35 +5875,45 @@ public class SatelliteServer {
         return new getLocations_args();
       }
 
-      public AsyncMethodCallback<List<Location>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<java.util.List<Location>> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<List<Location>>() { 
-          public void onComplete(List<Location> o) {
+        return new org.apache.thrift.async.AsyncMethodCallback<java.util.List<Location>>() { 
+          public void onComplete(java.util.List<Location> o) {
             getLocations_result result = new getLocations_result();
             result.success = o;
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             getLocations_result result = new getLocations_result();
-            {
+            if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -5562,7 +5922,7 @@ public class SatelliteServer {
         return false;
       }
 
-      public void start(I iface, getLocations_args args, org.apache.thrift.async.AsyncMethodCallback<List<Location>> resultHandler) throws TException {
+      public void start(I iface, getLocations_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<Location>> resultHandler) throws org.apache.thrift.TException {
         iface.getLocations(resultHandler);
       }
     }
@@ -5576,35 +5936,45 @@ public class SatelliteServer {
         return new getStatus_args();
       }
 
-      public AsyncMethodCallback<SatelliteStatus> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<SatelliteStatus> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<SatelliteStatus>() { 
+        return new org.apache.thrift.async.AsyncMethodCallback<SatelliteStatus>() { 
           public void onComplete(SatelliteStatus o) {
             getStatus_result result = new getStatus_result();
             result.success = o;
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             getStatus_result result = new getStatus_result();
-            {
+            if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -5613,12 +5983,12 @@ public class SatelliteServer {
         return false;
       }
 
-      public void start(I iface, getStatus_args args, org.apache.thrift.async.AsyncMethodCallback<SatelliteStatus> resultHandler) throws TException {
+      public void start(I iface, getStatus_args args, org.apache.thrift.async.AsyncMethodCallback<SatelliteStatus> resultHandler) throws org.apache.thrift.TException {
         iface.getStatus(resultHandler);
       }
     }
 
-    public static class getImageList<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getImageList_args, List<ImageSummaryRead>> {
+    public static class getImageList<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getImageList_args, java.util.List<ImageSummaryRead>> {
       public getImageList() {
         super("getImageList");
       }
@@ -5627,46 +5997,53 @@ public class SatelliteServer {
         return new getImageList_args();
       }
 
-      public AsyncMethodCallback<List<ImageSummaryRead>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<java.util.List<ImageSummaryRead>> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<List<ImageSummaryRead>>() { 
-          public void onComplete(List<ImageSummaryRead> o) {
+        return new org.apache.thrift.async.AsyncMethodCallback<java.util.List<ImageSummaryRead>>() { 
+          public void onComplete(java.util.List<ImageSummaryRead> o) {
             getImageList_result result = new getImageList_result();
             result.success = o;
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             getImageList_result result = new getImageList_result();
             if (e instanceof TAuthorizationException) {
-                        result.authError = (TAuthorizationException) e;
-                        result.setAuthErrorIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TInvocationException) {
-                        result.serverError = (TInvocationException) e;
-                        result.setServerErrorIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.authError = (TAuthorizationException) e;
+              result.setAuthErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof TInvocationException) {
+              result.serverError = (TInvocationException) e;
+              result.setServerErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -5675,7 +6052,7 @@ public class SatelliteServer {
         return false;
       }
 
-      public void start(I iface, getImageList_args args, org.apache.thrift.async.AsyncMethodCallback<List<ImageSummaryRead>> resultHandler) throws TException {
+      public void start(I iface, getImageList_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<ImageSummaryRead>> resultHandler) throws org.apache.thrift.TException {
         iface.getImageList(args.userToken, args.tagSearch, args.page,resultHandler);
       }
     }
@@ -5689,51 +6066,57 @@ public class SatelliteServer {
         return new getImageDetails_args();
       }
 
-      public AsyncMethodCallback<ImageDetailsRead> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<ImageDetailsRead> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<ImageDetailsRead>() { 
+        return new org.apache.thrift.async.AsyncMethodCallback<ImageDetailsRead>() { 
           public void onComplete(ImageDetailsRead o) {
             getImageDetails_result result = new getImageDetails_result();
             result.success = o;
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             getImageDetails_result result = new getImageDetails_result();
             if (e instanceof TAuthorizationException) {
-                        result.authError = (TAuthorizationException) e;
-                        result.setAuthErrorIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TNotFoundException) {
-                        result.notFound = (TNotFoundException) e;
-                        result.setNotFoundIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TInvocationException) {
-                        result.serverError = (TInvocationException) e;
-                        result.setServerErrorIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.authError = (TAuthorizationException) e;
+              result.setAuthErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof TNotFoundException) {
+              result.notFound = (TNotFoundException) e;
+              result.setNotFoundIsSet(true);
+              msg = result;
+            } else if (e instanceof TInvocationException) {
+              result.serverError = (TInvocationException) e;
+              result.setServerErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -5742,12 +6125,12 @@ public class SatelliteServer {
         return false;
       }
 
-      public void start(I iface, getImageDetails_args args, org.apache.thrift.async.AsyncMethodCallback<ImageDetailsRead> resultHandler) throws TException {
+      public void start(I iface, getImageDetails_args args, org.apache.thrift.async.AsyncMethodCallback<ImageDetailsRead> resultHandler) throws org.apache.thrift.TException {
         iface.getImageDetails(args.userToken, args.imageBaseId,resultHandler);
       }
     }
 
-    public static class createImage<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, createImage_args, String> {
+    public static class createImage<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, createImage_args, java.lang.String> {
       public createImage() {
         super("createImage");
       }
@@ -5756,46 +6139,53 @@ public class SatelliteServer {
         return new createImage_args();
       }
 
-      public AsyncMethodCallback<String> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<java.lang.String> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<String>() { 
-          public void onComplete(String o) {
+        return new org.apache.thrift.async.AsyncMethodCallback<java.lang.String>() { 
+          public void onComplete(java.lang.String o) {
             createImage_result result = new createImage_result();
             result.success = o;
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             createImage_result result = new createImage_result();
             if (e instanceof TAuthorizationException) {
-                        result.authError = (TAuthorizationException) e;
-                        result.setAuthErrorIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TInvocationException) {
-                        result.error = (TInvocationException) e;
-                        result.setErrorIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.authError = (TAuthorizationException) e;
+              result.setAuthErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof TInvocationException) {
+              result.error = (TInvocationException) e;
+              result.setErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -5804,7 +6194,7 @@ public class SatelliteServer {
         return false;
       }
 
-      public void start(I iface, createImage_args args, org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws TException {
+      public void start(I iface, createImage_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException {
         iface.createImage(args.userToken, args.imageName,resultHandler);
       }
     }
@@ -5818,50 +6208,56 @@ public class SatelliteServer {
         return new updateImageBase_args();
       }
 
-      public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<Void> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<Void>() { 
+        return new org.apache.thrift.async.AsyncMethodCallback<Void>() { 
           public void onComplete(Void o) {
             updateImageBase_result result = new updateImageBase_result();
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             updateImageBase_result result = new updateImageBase_result();
             if (e instanceof TAuthorizationException) {
-                        result.authError = (TAuthorizationException) e;
-                        result.setAuthErrorIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TNotFoundException) {
-                        result.notFound = (TNotFoundException) e;
-                        result.setNotFoundIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TInvocationException) {
-                        result.imgError = (TInvocationException) e;
-                        result.setImgErrorIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.authError = (TAuthorizationException) e;
+              result.setAuthErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof TNotFoundException) {
+              result.notFound = (TNotFoundException) e;
+              result.setNotFoundIsSet(true);
+              msg = result;
+            } else if (e instanceof TInvocationException) {
+              result.imgError = (TInvocationException) e;
+              result.setImgErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -5870,7 +6266,7 @@ public class SatelliteServer {
         return false;
       }
 
-      public void start(I iface, updateImageBase_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
+      public void start(I iface, updateImageBase_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.updateImageBase(args.userToken, args.imageBaseId, args.image,resultHandler);
       }
     }
@@ -5884,50 +6280,56 @@ public class SatelliteServer {
         return new updateImageVersion_args();
       }
 
-      public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<Void> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<Void>() { 
+        return new org.apache.thrift.async.AsyncMethodCallback<Void>() { 
           public void onComplete(Void o) {
             updateImageVersion_result result = new updateImageVersion_result();
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             updateImageVersion_result result = new updateImageVersion_result();
             if (e instanceof TAuthorizationException) {
-                        result.authError = (TAuthorizationException) e;
-                        result.setAuthErrorIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TNotFoundException) {
-                        result.notFound = (TNotFoundException) e;
-                        result.setNotFoundIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TInvocationException) {
-                        result.imgError = (TInvocationException) e;
-                        result.setImgErrorIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.authError = (TAuthorizationException) e;
+              result.setAuthErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof TNotFoundException) {
+              result.notFound = (TNotFoundException) e;
+              result.setNotFoundIsSet(true);
+              msg = result;
+            } else if (e instanceof TInvocationException) {
+              result.imgError = (TInvocationException) e;
+              result.setImgErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -5936,7 +6338,7 @@ public class SatelliteServer {
         return false;
       }
 
-      public void start(I iface, updateImageVersion_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
+      public void start(I iface, updateImageVersion_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.updateImageVersion(args.userToken, args.imageVersionId, args.image,resultHandler);
       }
     }
@@ -5950,50 +6352,56 @@ public class SatelliteServer {
         return new deleteImageVersion_args();
       }
 
-      public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<Void> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<Void>() { 
+        return new org.apache.thrift.async.AsyncMethodCallback<Void>() { 
           public void onComplete(Void o) {
             deleteImageVersion_result result = new deleteImageVersion_result();
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             deleteImageVersion_result result = new deleteImageVersion_result();
             if (e instanceof TAuthorizationException) {
-                        result.authError = (TAuthorizationException) e;
-                        result.setAuthErrorIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TNotFoundException) {
-                        result.notFound = (TNotFoundException) e;
-                        result.setNotFoundIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TInvocationException) {
-                        result.serverError = (TInvocationException) e;
-                        result.setServerErrorIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.authError = (TAuthorizationException) e;
+              result.setAuthErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof TNotFoundException) {
+              result.notFound = (TNotFoundException) e;
+              result.setNotFoundIsSet(true);
+              msg = result;
+            } else if (e instanceof TInvocationException) {
+              result.serverError = (TInvocationException) e;
+              result.setServerErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -6002,7 +6410,7 @@ public class SatelliteServer {
         return false;
       }
 
-      public void start(I iface, deleteImageVersion_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
+      public void start(I iface, deleteImageVersion_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.deleteImageVersion(args.userToken, args.imageVersionId,resultHandler);
       }
     }
@@ -6016,50 +6424,56 @@ public class SatelliteServer {
         return new deleteImageBase_args();
       }
 
-      public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<Void> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<Void>() { 
+        return new org.apache.thrift.async.AsyncMethodCallback<Void>() { 
           public void onComplete(Void o) {
             deleteImageBase_result result = new deleteImageBase_result();
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             deleteImageBase_result result = new deleteImageBase_result();
             if (e instanceof TAuthorizationException) {
-                        result.authError = (TAuthorizationException) e;
-                        result.setAuthErrorIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TNotFoundException) {
-                        result.notFound = (TNotFoundException) e;
-                        result.setNotFoundIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TInvocationException) {
-                        result.serverError = (TInvocationException) e;
-                        result.setServerErrorIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.authError = (TAuthorizationException) e;
+              result.setAuthErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof TNotFoundException) {
+              result.notFound = (TNotFoundException) e;
+              result.setNotFoundIsSet(true);
+              msg = result;
+            } else if (e instanceof TInvocationException) {
+              result.serverError = (TInvocationException) e;
+              result.setServerErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -6068,7 +6482,7 @@ public class SatelliteServer {
         return false;
       }
 
-      public void start(I iface, deleteImageBase_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
+      public void start(I iface, deleteImageBase_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.deleteImageBase(args.userToken, args.imageBaseId,resultHandler);
       }
     }
@@ -6082,50 +6496,56 @@ public class SatelliteServer {
         return new writeImagePermissions_args();
       }
 
-      public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<Void> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<Void>() { 
+        return new org.apache.thrift.async.AsyncMethodCallback<Void>() { 
           public void onComplete(Void o) {
             writeImagePermissions_result result = new writeImagePermissions_result();
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             writeImagePermissions_result result = new writeImagePermissions_result();
             if (e instanceof TAuthorizationException) {
-                        result.authError = (TAuthorizationException) e;
-                        result.setAuthErrorIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TNotFoundException) {
-                        result.notFound = (TNotFoundException) e;
-                        result.setNotFoundIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TInvocationException) {
-                        result.serverError = (TInvocationException) e;
-                        result.setServerErrorIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.authError = (TAuthorizationException) e;
+              result.setAuthErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof TNotFoundException) {
+              result.notFound = (TNotFoundException) e;
+              result.setNotFoundIsSet(true);
+              msg = result;
+            } else if (e instanceof TInvocationException) {
+              result.serverError = (TInvocationException) e;
+              result.setServerErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -6134,12 +6554,12 @@ public class SatelliteServer {
         return false;
       }
 
-      public void start(I iface, writeImagePermissions_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
+      public void start(I iface, writeImagePermissions_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.writeImagePermissions(args.userToken, args.imageBaseId, args.permissions,resultHandler);
       }
     }
 
-    public static class getImagePermissions<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getImagePermissions_args, Map<String,ImagePermissions>> {
+    public static class getImagePermissions<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getImagePermissions_args, java.util.Map<java.lang.String,ImagePermissions>> {
       public getImagePermissions() {
         super("getImagePermissions");
       }
@@ -6148,51 +6568,57 @@ public class SatelliteServer {
         return new getImagePermissions_args();
       }
 
-      public AsyncMethodCallback<Map<String,ImagePermissions>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<java.util.Map<java.lang.String,ImagePermissions>> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<Map<String,ImagePermissions>>() { 
-          public void onComplete(Map<String,ImagePermissions> o) {
+        return new org.apache.thrift.async.AsyncMethodCallback<java.util.Map<java.lang.String,ImagePermissions>>() { 
+          public void onComplete(java.util.Map<java.lang.String,ImagePermissions> o) {
             getImagePermissions_result result = new getImagePermissions_result();
             result.success = o;
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             getImagePermissions_result result = new getImagePermissions_result();
             if (e instanceof TAuthorizationException) {
-                        result.authError = (TAuthorizationException) e;
-                        result.setAuthErrorIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TNotFoundException) {
-                        result.notFound = (TNotFoundException) e;
-                        result.setNotFoundIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TInvocationException) {
-                        result.serverError = (TInvocationException) e;
-                        result.setServerErrorIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.authError = (TAuthorizationException) e;
+              result.setAuthErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof TNotFoundException) {
+              result.notFound = (TNotFoundException) e;
+              result.setNotFoundIsSet(true);
+              msg = result;
+            } else if (e instanceof TInvocationException) {
+              result.serverError = (TInvocationException) e;
+              result.setServerErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -6201,7 +6627,7 @@ public class SatelliteServer {
         return false;
       }
 
-      public void start(I iface, getImagePermissions_args args, org.apache.thrift.async.AsyncMethodCallback<Map<String,ImagePermissions>> resultHandler) throws TException {
+      public void start(I iface, getImagePermissions_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.Map<java.lang.String,ImagePermissions>> resultHandler) throws org.apache.thrift.TException {
         iface.getImagePermissions(args.userToken, args.imageBaseId,resultHandler);
       }
     }
@@ -6215,50 +6641,56 @@ public class SatelliteServer {
         return new setImageOwner_args();
       }
 
-      public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<Void> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<Void>() { 
+        return new org.apache.thrift.async.AsyncMethodCallback<Void>() { 
           public void onComplete(Void o) {
             setImageOwner_result result = new setImageOwner_result();
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             setImageOwner_result result = new setImageOwner_result();
             if (e instanceof TAuthorizationException) {
-                        result.authError = (TAuthorizationException) e;
-                        result.setAuthErrorIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TNotFoundException) {
-                        result.notFound = (TNotFoundException) e;
-                        result.setNotFoundIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TInvocationException) {
-                        result.serverError = (TInvocationException) e;
-                        result.setServerErrorIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.authError = (TAuthorizationException) e;
+              result.setAuthErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof TNotFoundException) {
+              result.notFound = (TNotFoundException) e;
+              result.setNotFoundIsSet(true);
+              msg = result;
+            } else if (e instanceof TInvocationException) {
+              result.serverError = (TInvocationException) e;
+              result.setServerErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -6267,7 +6699,7 @@ public class SatelliteServer {
         return false;
       }
 
-      public void start(I iface, setImageOwner_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
+      public void start(I iface, setImageOwner_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.setImageOwner(args.userToken, args.imageBaseId, args.newOwnerId,resultHandler);
       }
     }
@@ -6281,55 +6713,60 @@ public class SatelliteServer {
         return new setImageVersionExpiry_args();
       }
 
-      public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<Void> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<Void>() { 
+        return new org.apache.thrift.async.AsyncMethodCallback<Void>() { 
           public void onComplete(Void o) {
             setImageVersionExpiry_result result = new setImageVersionExpiry_result();
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             setImageVersionExpiry_result result = new setImageVersionExpiry_result();
             if (e instanceof TAuthorizationException) {
-                        result.authError = (TAuthorizationException) e;
-                        result.setAuthErrorIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TNotFoundException) {
-                        result.notFound = (TNotFoundException) e;
-                        result.setNotFoundIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TInvocationException) {
-                        result.serverError = (TInvocationException) e;
-                        result.setServerErrorIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TInvalidDateParam) {
-                        result.dateError = (TInvalidDateParam) e;
-                        result.setDateErrorIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.authError = (TAuthorizationException) e;
+              result.setAuthErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof TNotFoundException) {
+              result.notFound = (TNotFoundException) e;
+              result.setNotFoundIsSet(true);
+              msg = result;
+            } else if (e instanceof TInvocationException) {
+              result.serverError = (TInvocationException) e;
+              result.setServerErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof TInvalidDateParam) {
+              result.dateError = (TInvalidDateParam) e;
+              result.setDateErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -6338,12 +6775,12 @@ public class SatelliteServer {
         return false;
       }
 
-      public void start(I iface, setImageVersionExpiry_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
+      public void start(I iface, setImageVersionExpiry_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.setImageVersionExpiry(args.userToken, args.imageBaseId, args.expireTime,resultHandler);
       }
     }
 
-    public static class getImageVersionVirtConfig<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getImageVersionVirtConfig_args, ByteBuffer> {
+    public static class getImageVersionVirtConfig<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getImageVersionVirtConfig_args, java.nio.ByteBuffer> {
       public getImageVersionVirtConfig() {
         super("getImageVersionVirtConfig");
       }
@@ -6352,51 +6789,57 @@ public class SatelliteServer {
         return new getImageVersionVirtConfig_args();
       }
 
-      public AsyncMethodCallback<ByteBuffer> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<java.nio.ByteBuffer> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<ByteBuffer>() { 
-          public void onComplete(ByteBuffer o) {
+        return new org.apache.thrift.async.AsyncMethodCallback<java.nio.ByteBuffer>() { 
+          public void onComplete(java.nio.ByteBuffer o) {
             getImageVersionVirtConfig_result result = new getImageVersionVirtConfig_result();
             result.success = o;
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             getImageVersionVirtConfig_result result = new getImageVersionVirtConfig_result();
             if (e instanceof TAuthorizationException) {
-                        result.authError = (TAuthorizationException) e;
-                        result.setAuthErrorIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TNotFoundException) {
-                        result.notFound = (TNotFoundException) e;
-                        result.setNotFoundIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TInvocationException) {
-                        result.serverError = (TInvocationException) e;
-                        result.setServerErrorIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.authError = (TAuthorizationException) e;
+              result.setAuthErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof TNotFoundException) {
+              result.notFound = (TNotFoundException) e;
+              result.setNotFoundIsSet(true);
+              msg = result;
+            } else if (e instanceof TInvocationException) {
+              result.serverError = (TInvocationException) e;
+              result.setServerErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -6405,7 +6848,7 @@ public class SatelliteServer {
         return false;
       }
 
-      public void start(I iface, getImageVersionVirtConfig_args args, org.apache.thrift.async.AsyncMethodCallback<ByteBuffer> resultHandler) throws TException {
+      public void start(I iface, getImageVersionVirtConfig_args args, org.apache.thrift.async.AsyncMethodCallback<java.nio.ByteBuffer> resultHandler) throws org.apache.thrift.TException {
         iface.getImageVersionVirtConfig(args.userToken, args.imageVersionId,resultHandler);
       }
     }
@@ -6419,50 +6862,56 @@ public class SatelliteServer {
         return new setImageVersionVirtConfig_args();
       }
 
-      public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<Void> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<Void>() { 
+        return new org.apache.thrift.async.AsyncMethodCallback<Void>() { 
           public void onComplete(Void o) {
             setImageVersionVirtConfig_result result = new setImageVersionVirtConfig_result();
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             setImageVersionVirtConfig_result result = new setImageVersionVirtConfig_result();
             if (e instanceof TAuthorizationException) {
-                        result.authError = (TAuthorizationException) e;
-                        result.setAuthErrorIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TNotFoundException) {
-                        result.notFound = (TNotFoundException) e;
-                        result.setNotFoundIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TInvocationException) {
-                        result.serverError = (TInvocationException) e;
-                        result.setServerErrorIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.authError = (TAuthorizationException) e;
+              result.setAuthErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof TNotFoundException) {
+              result.notFound = (TNotFoundException) e;
+              result.setNotFoundIsSet(true);
+              msg = result;
+            } else if (e instanceof TInvocationException) {
+              result.serverError = (TInvocationException) e;
+              result.setServerErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -6471,12 +6920,12 @@ public class SatelliteServer {
         return false;
       }
 
-      public void start(I iface, setImageVersionVirtConfig_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
+      public void start(I iface, setImageVersionVirtConfig_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.setImageVersionVirtConfig(args.userToken, args.imageVersionId, args.meta,resultHandler);
       }
     }
 
-    public static class requestImageReplication<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, requestImageReplication_args, String> {
+    public static class requestImageReplication<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, requestImageReplication_args, java.lang.String> {
       public requestImageReplication() {
         super("requestImageReplication");
       }
@@ -6485,51 +6934,57 @@ public class SatelliteServer {
         return new requestImageReplication_args();
       }
 
-      public AsyncMethodCallback<String> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<java.lang.String> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<String>() { 
-          public void onComplete(String o) {
+        return new org.apache.thrift.async.AsyncMethodCallback<java.lang.String>() { 
+          public void onComplete(java.lang.String o) {
             requestImageReplication_result result = new requestImageReplication_result();
             result.success = o;
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             requestImageReplication_result result = new requestImageReplication_result();
             if (e instanceof TAuthorizationException) {
-                        result.authError = (TAuthorizationException) e;
-                        result.setAuthErrorIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TNotFoundException) {
-                        result.notFound = (TNotFoundException) e;
-                        result.setNotFoundIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TInvocationException) {
-                        result.serverError = (TInvocationException) e;
-                        result.setServerErrorIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.authError = (TAuthorizationException) e;
+              result.setAuthErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof TNotFoundException) {
+              result.notFound = (TNotFoundException) e;
+              result.setNotFoundIsSet(true);
+              msg = result;
+            } else if (e instanceof TInvocationException) {
+              result.serverError = (TInvocationException) e;
+              result.setServerErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -6538,12 +6993,12 @@ public class SatelliteServer {
         return false;
       }
 
-      public void start(I iface, requestImageReplication_args args, org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws TException {
+      public void start(I iface, requestImageReplication_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException {
         iface.requestImageReplication(args.userToken, args.imageVersionId,resultHandler);
       }
     }
 
-    public static class publishImageVersion<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, publishImageVersion_args, String> {
+    public static class publishImageVersion<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, publishImageVersion_args, java.lang.String> {
       public publishImageVersion() {
         super("publishImageVersion");
       }
@@ -6552,56 +7007,61 @@ public class SatelliteServer {
         return new publishImageVersion_args();
       }
 
-      public AsyncMethodCallback<String> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<java.lang.String> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<String>() { 
-          public void onComplete(String o) {
+        return new org.apache.thrift.async.AsyncMethodCallback<java.lang.String>() { 
+          public void onComplete(java.lang.String o) {
             publishImageVersion_result result = new publishImageVersion_result();
             result.success = o;
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             publishImageVersion_result result = new publishImageVersion_result();
             if (e instanceof TAuthorizationException) {
-                        result.authError = (TAuthorizationException) e;
-                        result.setAuthErrorIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TNotFoundException) {
-                        result.notFound = (TNotFoundException) e;
-                        result.setNotFoundIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TInvocationException) {
-                        result.serverError = (TInvocationException) e;
-                        result.setServerErrorIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TTransferRejectedException) {
-                        result.tre = (TTransferRejectedException) e;
-                        result.setTreIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.authError = (TAuthorizationException) e;
+              result.setAuthErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof TNotFoundException) {
+              result.notFound = (TNotFoundException) e;
+              result.setNotFoundIsSet(true);
+              msg = result;
+            } else if (e instanceof TInvocationException) {
+              result.serverError = (TInvocationException) e;
+              result.setServerErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof TTransferRejectedException) {
+              result.tre = (TTransferRejectedException) e;
+              result.setTreIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -6610,12 +7070,12 @@ public class SatelliteServer {
         return false;
       }
 
-      public void start(I iface, publishImageVersion_args args, org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws TException {
+      public void start(I iface, publishImageVersion_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException {
         iface.publishImageVersion(args.userToken, args.imageVersionId,resultHandler);
       }
     }
 
-    public static class createLecture<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, createLecture_args, String> {
+    public static class createLecture<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, createLecture_args, java.lang.String> {
       public createLecture() {
         super("createLecture");
       }
@@ -6624,56 +7084,61 @@ public class SatelliteServer {
         return new createLecture_args();
       }
 
-      public AsyncMethodCallback<String> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<java.lang.String> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<String>() { 
-          public void onComplete(String o) {
+        return new org.apache.thrift.async.AsyncMethodCallback<java.lang.String>() { 
+          public void onComplete(java.lang.String o) {
             createLecture_result result = new createLecture_result();
             result.success = o;
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             createLecture_result result = new createLecture_result();
             if (e instanceof TAuthorizationException) {
-                        result.authError = (TAuthorizationException) e;
-                        result.setAuthErrorIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TInvocationException) {
-                        result.serverError = (TInvocationException) e;
-                        result.setServerErrorIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TInvalidDateParam) {
-                        result.dateError = (TInvalidDateParam) e;
-                        result.setDateErrorIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TNotFoundException) {
-                        result.notFound = (TNotFoundException) e;
-                        result.setNotFoundIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.authError = (TAuthorizationException) e;
+              result.setAuthErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof TInvocationException) {
+              result.serverError = (TInvocationException) e;
+              result.setServerErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof TInvalidDateParam) {
+              result.dateError = (TInvalidDateParam) e;
+              result.setDateErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof TNotFoundException) {
+              result.notFound = (TNotFoundException) e;
+              result.setNotFoundIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -6682,7 +7147,7 @@ public class SatelliteServer {
         return false;
       }
 
-      public void start(I iface, createLecture_args args, org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws TException {
+      public void start(I iface, createLecture_args args, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException {
         iface.createLecture(args.userToken, args.lecture,resultHandler);
       }
     }
@@ -6696,55 +7161,60 @@ public class SatelliteServer {
         return new updateLecture_args();
       }
 
-      public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<Void> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<Void>() { 
+        return new org.apache.thrift.async.AsyncMethodCallback<Void>() { 
           public void onComplete(Void o) {
             updateLecture_result result = new updateLecture_result();
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             updateLecture_result result = new updateLecture_result();
             if (e instanceof TAuthorizationException) {
-                        result.authError = (TAuthorizationException) e;
-                        result.setAuthErrorIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TNotFoundException) {
-                        result.notFound = (TNotFoundException) e;
-                        result.setNotFoundIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TInvocationException) {
-                        result.serverError = (TInvocationException) e;
-                        result.setServerErrorIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TInvalidDateParam) {
-                        result.dateError = (TInvalidDateParam) e;
-                        result.setDateErrorIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.authError = (TAuthorizationException) e;
+              result.setAuthErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof TNotFoundException) {
+              result.notFound = (TNotFoundException) e;
+              result.setNotFoundIsSet(true);
+              msg = result;
+            } else if (e instanceof TInvocationException) {
+              result.serverError = (TInvocationException) e;
+              result.setServerErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof TInvalidDateParam) {
+              result.dateError = (TInvalidDateParam) e;
+              result.setDateErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -6753,12 +7223,12 @@ public class SatelliteServer {
         return false;
       }
 
-      public void start(I iface, updateLecture_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
+      public void start(I iface, updateLecture_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.updateLecture(args.userToken, args.lectureId, args.lecture,resultHandler);
       }
     }
 
-    public static class getLectureList<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getLectureList_args, List<LectureSummary>> {
+    public static class getLectureList<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getLectureList_args, java.util.List<LectureSummary>> {
       public getLectureList() {
         super("getLectureList");
       }
@@ -6767,46 +7237,53 @@ public class SatelliteServer {
         return new getLectureList_args();
       }
 
-      public AsyncMethodCallback<List<LectureSummary>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<java.util.List<LectureSummary>> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<List<LectureSummary>>() { 
-          public void onComplete(List<LectureSummary> o) {
+        return new org.apache.thrift.async.AsyncMethodCallback<java.util.List<LectureSummary>>() { 
+          public void onComplete(java.util.List<LectureSummary> o) {
             getLectureList_result result = new getLectureList_result();
             result.success = o;
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             getLectureList_result result = new getLectureList_result();
             if (e instanceof TAuthorizationException) {
-                        result.authError = (TAuthorizationException) e;
-                        result.setAuthErrorIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TInvocationException) {
-                        result.serverError = (TInvocationException) e;
-                        result.setServerErrorIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.authError = (TAuthorizationException) e;
+              result.setAuthErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof TInvocationException) {
+              result.serverError = (TInvocationException) e;
+              result.setServerErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -6815,7 +7292,7 @@ public class SatelliteServer {
         return false;
       }
 
-      public void start(I iface, getLectureList_args args, org.apache.thrift.async.AsyncMethodCallback<List<LectureSummary>> resultHandler) throws TException {
+      public void start(I iface, getLectureList_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.List<LectureSummary>> resultHandler) throws org.apache.thrift.TException {
         iface.getLectureList(args.userToken, args.page,resultHandler);
       }
     }
@@ -6829,51 +7306,57 @@ public class SatelliteServer {
         return new getLectureDetails_args();
       }
 
-      public AsyncMethodCallback<LectureRead> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<LectureRead> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<LectureRead>() { 
+        return new org.apache.thrift.async.AsyncMethodCallback<LectureRead>() { 
           public void onComplete(LectureRead o) {
             getLectureDetails_result result = new getLectureDetails_result();
             result.success = o;
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             getLectureDetails_result result = new getLectureDetails_result();
             if (e instanceof TAuthorizationException) {
-                        result.authError = (TAuthorizationException) e;
-                        result.setAuthErrorIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TNotFoundException) {
-                        result.notFound = (TNotFoundException) e;
-                        result.setNotFoundIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TInvocationException) {
-                        result.serverError = (TInvocationException) e;
-                        result.setServerErrorIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.authError = (TAuthorizationException) e;
+              result.setAuthErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof TNotFoundException) {
+              result.notFound = (TNotFoundException) e;
+              result.setNotFoundIsSet(true);
+              msg = result;
+            } else if (e instanceof TInvocationException) {
+              result.serverError = (TInvocationException) e;
+              result.setServerErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -6882,7 +7365,7 @@ public class SatelliteServer {
         return false;
       }
 
-      public void start(I iface, getLectureDetails_args args, org.apache.thrift.async.AsyncMethodCallback<LectureRead> resultHandler) throws TException {
+      public void start(I iface, getLectureDetails_args args, org.apache.thrift.async.AsyncMethodCallback<LectureRead> resultHandler) throws org.apache.thrift.TException {
         iface.getLectureDetails(args.userToken, args.lectureId,resultHandler);
       }
     }
@@ -6896,50 +7379,56 @@ public class SatelliteServer {
         return new deleteLecture_args();
       }
 
-      public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<Void> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<Void>() { 
+        return new org.apache.thrift.async.AsyncMethodCallback<Void>() { 
           public void onComplete(Void o) {
             deleteLecture_result result = new deleteLecture_result();
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             deleteLecture_result result = new deleteLecture_result();
             if (e instanceof TAuthorizationException) {
-                        result.authError = (TAuthorizationException) e;
-                        result.setAuthErrorIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TNotFoundException) {
-                        result.notFound = (TNotFoundException) e;
-                        result.setNotFoundIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TInvocationException) {
-                        result.serverError = (TInvocationException) e;
-                        result.setServerErrorIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.authError = (TAuthorizationException) e;
+              result.setAuthErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof TNotFoundException) {
+              result.notFound = (TNotFoundException) e;
+              result.setNotFoundIsSet(true);
+              msg = result;
+            } else if (e instanceof TInvocationException) {
+              result.serverError = (TInvocationException) e;
+              result.setServerErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -6948,7 +7437,7 @@ public class SatelliteServer {
         return false;
       }
 
-      public void start(I iface, deleteLecture_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
+      public void start(I iface, deleteLecture_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.deleteLecture(args.userToken, args.lectureId,resultHandler);
       }
     }
@@ -6962,50 +7451,56 @@ public class SatelliteServer {
         return new writeLecturePermissions_args();
       }
 
-      public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<Void> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<Void>() { 
+        return new org.apache.thrift.async.AsyncMethodCallback<Void>() { 
           public void onComplete(Void o) {
             writeLecturePermissions_result result = new writeLecturePermissions_result();
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             writeLecturePermissions_result result = new writeLecturePermissions_result();
             if (e instanceof TAuthorizationException) {
-                        result.authError = (TAuthorizationException) e;
-                        result.setAuthErrorIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TNotFoundException) {
-                        result.notFound = (TNotFoundException) e;
-                        result.setNotFoundIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TInvocationException) {
-                        result.serverError = (TInvocationException) e;
-                        result.setServerErrorIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.authError = (TAuthorizationException) e;
+              result.setAuthErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof TNotFoundException) {
+              result.notFound = (TNotFoundException) e;
+              result.setNotFoundIsSet(true);
+              msg = result;
+            } else if (e instanceof TInvocationException) {
+              result.serverError = (TInvocationException) e;
+              result.setServerErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -7014,12 +7509,12 @@ public class SatelliteServer {
         return false;
       }
 
-      public void start(I iface, writeLecturePermissions_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
+      public void start(I iface, writeLecturePermissions_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.writeLecturePermissions(args.userToken, args.lectureId, args.permissions,resultHandler);
       }
     }
 
-    public static class getLecturePermissions<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getLecturePermissions_args, Map<String,LecturePermissions>> {
+    public static class getLecturePermissions<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getLecturePermissions_args, java.util.Map<java.lang.String,LecturePermissions>> {
       public getLecturePermissions() {
         super("getLecturePermissions");
       }
@@ -7028,51 +7523,57 @@ public class SatelliteServer {
         return new getLecturePermissions_args();
       }
 
-      public AsyncMethodCallback<Map<String,LecturePermissions>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<java.util.Map<java.lang.String,LecturePermissions>> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<Map<String,LecturePermissions>>() { 
-          public void onComplete(Map<String,LecturePermissions> o) {
+        return new org.apache.thrift.async.AsyncMethodCallback<java.util.Map<java.lang.String,LecturePermissions>>() { 
+          public void onComplete(java.util.Map<java.lang.String,LecturePermissions> o) {
             getLecturePermissions_result result = new getLecturePermissions_result();
             result.success = o;
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             getLecturePermissions_result result = new getLecturePermissions_result();
             if (e instanceof TAuthorizationException) {
-                        result.authError = (TAuthorizationException) e;
-                        result.setAuthErrorIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TNotFoundException) {
-                        result.notFound = (TNotFoundException) e;
-                        result.setNotFoundIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TInvocationException) {
-                        result.serverError = (TInvocationException) e;
-                        result.setServerErrorIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.authError = (TAuthorizationException) e;
+              result.setAuthErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof TNotFoundException) {
+              result.notFound = (TNotFoundException) e;
+              result.setNotFoundIsSet(true);
+              msg = result;
+            } else if (e instanceof TInvocationException) {
+              result.serverError = (TInvocationException) e;
+              result.setServerErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -7081,7 +7582,7 @@ public class SatelliteServer {
         return false;
       }
 
-      public void start(I iface, getLecturePermissions_args args, org.apache.thrift.async.AsyncMethodCallback<Map<String,LecturePermissions>> resultHandler) throws TException {
+      public void start(I iface, getLecturePermissions_args args, org.apache.thrift.async.AsyncMethodCallback<java.util.Map<java.lang.String,LecturePermissions>> resultHandler) throws org.apache.thrift.TException {
         iface.getLecturePermissions(args.userToken, args.lectureId,resultHandler);
       }
     }
@@ -7095,50 +7596,56 @@ public class SatelliteServer {
         return new setLectureOwner_args();
       }
 
-      public AsyncMethodCallback<Void> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<Void> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<Void>() { 
+        return new org.apache.thrift.async.AsyncMethodCallback<Void>() { 
           public void onComplete(Void o) {
             setLectureOwner_result result = new setLectureOwner_result();
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             setLectureOwner_result result = new setLectureOwner_result();
             if (e instanceof TAuthorizationException) {
-                        result.authError = (TAuthorizationException) e;
-                        result.setAuthErrorIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TNotFoundException) {
-                        result.notFound = (TNotFoundException) e;
-                        result.setNotFoundIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TInvocationException) {
-                        result.serverError = (TInvocationException) e;
-                        result.setServerErrorIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.authError = (TAuthorizationException) e;
+              result.setAuthErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof TNotFoundException) {
+              result.notFound = (TNotFoundException) e;
+              result.setNotFoundIsSet(true);
+              msg = result;
+            } else if (e instanceof TInvocationException) {
+              result.serverError = (TInvocationException) e;
+              result.setServerErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -7147,7 +7654,7 @@ public class SatelliteServer {
         return false;
       }
 
-      public void start(I iface, setLectureOwner_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws TException {
+      public void start(I iface, setLectureOwner_args args, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
         iface.setLectureOwner(args.userToken, args.lectureId, args.newOwnerId,resultHandler);
       }
     }
@@ -7161,46 +7668,53 @@ public class SatelliteServer {
         return new getPredefinedData_args();
       }
 
-      public AsyncMethodCallback<PredefinedData> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+      public org.apache.thrift.async.AsyncMethodCallback<PredefinedData> getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) {
         final org.apache.thrift.AsyncProcessFunction fcall = this;
-        return new AsyncMethodCallback<PredefinedData>() { 
+        return new org.apache.thrift.async.AsyncMethodCallback<PredefinedData>() { 
           public void onComplete(PredefinedData o) {
             getPredefinedData_result result = new getPredefinedData_result();
             result.success = o;
             try {
-              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
-              return;
-            } catch (Exception e) {
-              LOGGER.error("Exception writing to internal frame buffer", e);
+              fcall.sendResponse(fb, result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+            } catch (org.apache.thrift.transport.TTransportException e) {
+              _LOGGER.error("TTransportException writing to internal frame buffer", e);
+              fb.close();
+            } catch (java.lang.Exception e) {
+              _LOGGER.error("Exception writing to internal frame buffer", e);
+              onError(e);
             }
-            fb.close();
           }
-          public void onError(Exception e) {
+          public void onError(java.lang.Exception e) {
             byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
-            org.apache.thrift.TBase msg;
+            org.apache.thrift.TSerializable msg;
             getPredefinedData_result result = new getPredefinedData_result();
             if (e instanceof TAuthorizationException) {
-                        result.authError = (TAuthorizationException) e;
-                        result.setAuthErrorIsSet(true);
-                        msg = result;
-            }
-            else             if (e instanceof TInvocationException) {
-                        result.serverError = (TInvocationException) e;
-                        result.setServerErrorIsSet(true);
-                        msg = result;
-            }
-             else 
-            {
+              result.authError = (TAuthorizationException) e;
+              result.setAuthErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof TInvocationException) {
+              result.serverError = (TInvocationException) e;
+              result.setServerErrorIsSet(true);
+              msg = result;
+            } else if (e instanceof org.apache.thrift.transport.TTransportException) {
+              _LOGGER.error("TTransportException inside handler", e);
+              fb.close();
+              return;
+            } else if (e instanceof org.apache.thrift.TApplicationException) {
+              _LOGGER.error("TApplicationException inside handler", e);
+              msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
+              msg = (org.apache.thrift.TApplicationException)e;
+            } else {
+              _LOGGER.error("Exception inside handler", e);
               msgType = org.apache.thrift.protocol.TMessageType.EXCEPTION;
-              msg = (org.apache.thrift.TBase)new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
+              msg = new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.INTERNAL_ERROR, e.getMessage());
             }
             try {
               fcall.sendResponse(fb,msg,msgType,seqid);
-              return;
-            } catch (Exception ex) {
-              LOGGER.error("Exception writing to internal frame buffer", ex);
+            } catch (java.lang.Exception ex) {
+              _LOGGER.error("Exception writing to internal frame buffer", ex);
+              fb.close();
             }
-            fb.close();
           }
         };
       }
@@ -7209,7 +7723,7 @@ public class SatelliteServer {
         return false;
       }
 
-      public void start(I iface, getPredefinedData_args args, org.apache.thrift.async.AsyncMethodCallback<PredefinedData> resultHandler) throws TException {
+      public void start(I iface, getPredefinedData_args args, org.apache.thrift.async.AsyncMethodCallback<PredefinedData> resultHandler) throws org.apache.thrift.TException {
         iface.getPredefinedData(args.userToken,resultHandler);
       }
     }
@@ -7221,11 +7735,8 @@ public class SatelliteServer {
 
     private static final org.apache.thrift.protocol.TField CLIENT_VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("clientVersion", org.apache.thrift.protocol.TType.I64, (short)1);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getVersion_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getVersion_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getVersion_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getVersion_argsTupleSchemeFactory();
 
     public long clientVersion; // required
 
@@ -7233,10 +7744,10 @@ public class SatelliteServer {
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       CLIENT_VERSION((short)1, "clientVersion");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -7244,6 +7755,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // CLIENT_VERSION
@@ -7259,21 +7771,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -7282,7 +7795,7 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
@@ -7290,12 +7803,12 @@ public class SatelliteServer {
     // isset id assignments
     private static final int __CLIENTVERSION_ISSET_ID = 0;
     private byte __isset_bitfield = 0;
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.CLIENT_VERSION, new org.apache.thrift.meta_data.FieldMetaData("clientVersion", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64          , "int")));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getVersion_args.class, metaDataMap);
     }
 
@@ -7339,57 +7852,56 @@ public class SatelliteServer {
     }
 
     public void unsetClientVersion() {
-      __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __CLIENTVERSION_ISSET_ID);
+      __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __CLIENTVERSION_ISSET_ID);
     }
 
     /** Returns true if field clientVersion is set (has been assigned a value) and false otherwise */
     public boolean isSetClientVersion() {
-      return EncodingUtils.testBit(__isset_bitfield, __CLIENTVERSION_ISSET_ID);
+      return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __CLIENTVERSION_ISSET_ID);
     }
 
     public void setClientVersionIsSet(boolean value) {
-      __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __CLIENTVERSION_ISSET_ID, value);
+      __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __CLIENTVERSION_ISSET_ID, value);
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case CLIENT_VERSION:
         if (value == null) {
           unsetClientVersion();
         } else {
-          setClientVersion((Long)value);
+          setClientVersion((java.lang.Long)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case CLIENT_VERSION:
         return getClientVersion();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
       case CLIENT_VERSION:
         return isSetClientVersion();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getVersion_args)
         return this.equals((getVersion_args)that);
       return false;
@@ -7398,6 +7910,8 @@ public class SatelliteServer {
     public boolean equals(getVersion_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_clientVersion = true;
       boolean that_present_clientVersion = true;
@@ -7413,14 +7927,11 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_clientVersion = true;
-      list.add(present_clientVersion);
-      if (present_clientVersion)
-        list.add(clientVersion);
+      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(clientVersion);
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -7431,7 +7942,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetClientVersion()).compareTo(other.isSetClientVersion());
+      lastComparison = java.lang.Boolean.compare(isSetClientVersion(), other.isSetClientVersion());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -7444,21 +7955,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getVersion_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getVersion_args(");
       boolean first = true;
 
       sb.append("clientVersion:");
@@ -7481,7 +7993,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
         __isset_bitfield = 0;
@@ -7491,13 +8003,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class getVersion_argsStandardSchemeFactory implements SchemeFactory {
+    private static class getVersion_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getVersion_argsStandardScheme getScheme() {
         return new getVersion_argsStandardScheme();
       }
     }
 
-    private static class getVersion_argsStandardScheme extends StandardScheme<getVersion_args> {
+    private static class getVersion_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<getVersion_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getVersion_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -7541,18 +8053,18 @@ public class SatelliteServer {
 
     }
 
-    private static class getVersion_argsTupleSchemeFactory implements SchemeFactory {
+    private static class getVersion_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getVersion_argsTupleScheme getScheme() {
         return new getVersion_argsTupleScheme();
       }
     }
 
-    private static class getVersion_argsTupleScheme extends TupleScheme<getVersion_args> {
+    private static class getVersion_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<getVersion_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getVersion_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetClientVersion()) {
           optionals.set(0);
         }
@@ -7564,8 +8076,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getVersion_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(1);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
           struct.clientVersion = iprot.readI64();
           struct.setClientVersionIsSet(true);
@@ -7573,6 +8085,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getVersion_result implements org.apache.thrift.TBase<getVersion_result, getVersion_result._Fields>, java.io.Serializable, Cloneable, Comparable<getVersion_result>   {
@@ -7580,11 +8095,8 @@ public class SatelliteServer {
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.I64, (short)0);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getVersion_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getVersion_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getVersion_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getVersion_resultTupleSchemeFactory();
 
     public long success; // required
 
@@ -7592,10 +8104,10 @@ public class SatelliteServer {
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SUCCESS((short)0, "success");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -7603,6 +8115,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
@@ -7618,21 +8131,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -7641,7 +8155,7 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
@@ -7649,12 +8163,12 @@ public class SatelliteServer {
     // isset id assignments
     private static final int __SUCCESS_ISSET_ID = 0;
     private byte __isset_bitfield = 0;
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64          , "int")));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getVersion_result.class, metaDataMap);
     }
 
@@ -7698,57 +8212,56 @@ public class SatelliteServer {
     }
 
     public void unsetSuccess() {
-      __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID);
+      __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SUCCESS_ISSET_ID);
     }
 
     /** Returns true if field success is set (has been assigned a value) and false otherwise */
     public boolean isSetSuccess() {
-      return EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID);
+      return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SUCCESS_ISSET_ID);
     }
 
     public void setSuccessIsSet(boolean value) {
-      __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value);
+      __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SUCCESS_ISSET_ID, value);
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
           unsetSuccess();
         } else {
-          setSuccess((Long)value);
+          setSuccess((java.lang.Long)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
         return getSuccess();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
       case SUCCESS:
         return isSetSuccess();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getVersion_result)
         return this.equals((getVersion_result)that);
       return false;
@@ -7757,6 +8270,8 @@ public class SatelliteServer {
     public boolean equals(getVersion_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_success = true;
       boolean that_present_success = true;
@@ -7772,14 +8287,11 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_success = true;
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
+      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(success);
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -7790,7 +8302,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -7803,21 +8315,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getVersion_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getVersion_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -7840,7 +8353,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
         __isset_bitfield = 0;
@@ -7850,13 +8363,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class getVersion_resultStandardSchemeFactory implements SchemeFactory {
+    private static class getVersion_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getVersion_resultStandardScheme getScheme() {
         return new getVersion_resultStandardScheme();
       }
     }
 
-    private static class getVersion_resultStandardScheme extends StandardScheme<getVersion_result> {
+    private static class getVersion_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<getVersion_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getVersion_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -7902,18 +8415,18 @@ public class SatelliteServer {
 
     }
 
-    private static class getVersion_resultTupleSchemeFactory implements SchemeFactory {
+    private static class getVersion_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getVersion_resultTupleScheme getScheme() {
         return new getVersion_resultTupleScheme();
       }
     }
 
-    private static class getVersion_resultTupleScheme extends TupleScheme<getVersion_result> {
+    private static class getVersion_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<getVersion_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getVersion_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
           optionals.set(0);
         }
@@ -7925,8 +8438,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getVersion_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(1);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
           struct.success = iprot.readI64();
           struct.setSuccessIsSet(true);
@@ -7934,27 +8447,27 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getSupportedFeatures_args implements org.apache.thrift.TBase<getSupportedFeatures_args, getSupportedFeatures_args._Fields>, java.io.Serializable, Cloneable, Comparable<getSupportedFeatures_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getSupportedFeatures_args");
 
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getSupportedFeatures_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getSupportedFeatures_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getSupportedFeatures_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getSupportedFeatures_argsTupleSchemeFactory();
 
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
 ;
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -7962,6 +8475,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           default:
@@ -7975,21 +8489,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -7998,14 +8513,14 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getSupportedFeatures_args.class, metaDataMap);
     }
 
@@ -8026,32 +8541,31 @@ public class SatelliteServer {
     public void clear() {
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getSupportedFeatures_args)
         return this.equals((getSupportedFeatures_args)that);
       return false;
@@ -8060,15 +8574,17 @@ public class SatelliteServer {
     public boolean equals(getSupportedFeatures_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       return true;
     }
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -8082,21 +8598,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getSupportedFeatures_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getSupportedFeatures_args(");
       boolean first = true;
 
       sb.append(")");
@@ -8116,7 +8633,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -8124,13 +8641,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class getSupportedFeatures_argsStandardSchemeFactory implements SchemeFactory {
+    private static class getSupportedFeatures_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getSupportedFeatures_argsStandardScheme getScheme() {
         return new getSupportedFeatures_argsStandardScheme();
       }
     }
 
-    private static class getSupportedFeatures_argsStandardScheme extends StandardScheme<getSupportedFeatures_args> {
+    private static class getSupportedFeatures_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<getSupportedFeatures_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getSupportedFeatures_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -8163,25 +8680,28 @@ public class SatelliteServer {
 
     }
 
-    private static class getSupportedFeatures_argsTupleSchemeFactory implements SchemeFactory {
+    private static class getSupportedFeatures_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getSupportedFeatures_argsTupleScheme getScheme() {
         return new getSupportedFeatures_argsTupleScheme();
       }
     }
 
-    private static class getSupportedFeatures_argsTupleScheme extends TupleScheme<getSupportedFeatures_args> {
+    private static class getSupportedFeatures_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<getSupportedFeatures_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getSupportedFeatures_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
       }
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getSupportedFeatures_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getSupportedFeatures_result implements org.apache.thrift.TBase<getSupportedFeatures_result, getSupportedFeatures_result._Fields>, java.io.Serializable, Cloneable, Comparable<getSupportedFeatures_result>   {
@@ -8189,22 +8709,19 @@ public class SatelliteServer {
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRING, (short)0);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getSupportedFeatures_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getSupportedFeatures_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getSupportedFeatures_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getSupportedFeatures_resultTupleSchemeFactory();
 
-    public String success; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String success; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SUCCESS((short)0, "success");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -8212,6 +8729,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
@@ -8227,21 +8745,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -8250,18 +8769,18 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getSupportedFeatures_result.class, metaDataMap);
     }
 
@@ -8269,7 +8788,7 @@ public class SatelliteServer {
     }
 
     public getSupportedFeatures_result(
-      String success)
+      java.lang.String success)
     {
       this();
       this.success = success;
@@ -8293,11 +8812,12 @@ public class SatelliteServer {
       this.success = null;
     }
 
-    public String getSuccess() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getSuccess() {
       return this.success;
     }
 
-    public getSupportedFeatures_result setSuccess(String success) {
+    public getSupportedFeatures_result setSuccess(@org.apache.thrift.annotation.Nullable java.lang.String success) {
       this.success = success;
       return this;
     }
@@ -8317,45 +8837,44 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
           unsetSuccess();
         } else {
-          setSuccess((String)value);
+          setSuccess((java.lang.String)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
         return getSuccess();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
       case SUCCESS:
         return isSetSuccess();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getSupportedFeatures_result)
         return this.equals((getSupportedFeatures_result)that);
       return false;
@@ -8364,6 +8883,8 @@ public class SatelliteServer {
     public boolean equals(getSupportedFeatures_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_success = true && this.isSetSuccess();
       boolean that_present_success = true && that.isSetSuccess();
@@ -8379,14 +8900,13 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -8397,7 +8917,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -8410,21 +8930,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getSupportedFeatures_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getSupportedFeatures_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -8451,7 +8972,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -8459,13 +8980,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class getSupportedFeatures_resultStandardSchemeFactory implements SchemeFactory {
+    private static class getSupportedFeatures_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getSupportedFeatures_resultStandardScheme getScheme() {
         return new getSupportedFeatures_resultStandardScheme();
       }
     }
 
-    private static class getSupportedFeatures_resultStandardScheme extends StandardScheme<getSupportedFeatures_result> {
+    private static class getSupportedFeatures_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<getSupportedFeatures_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getSupportedFeatures_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -8511,18 +9032,18 @@ public class SatelliteServer {
 
     }
 
-    private static class getSupportedFeatures_resultTupleSchemeFactory implements SchemeFactory {
+    private static class getSupportedFeatures_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getSupportedFeatures_resultTupleScheme getScheme() {
         return new getSupportedFeatures_resultTupleScheme();
       }
     }
 
-    private static class getSupportedFeatures_resultTupleScheme extends TupleScheme<getSupportedFeatures_result> {
+    private static class getSupportedFeatures_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<getSupportedFeatures_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getSupportedFeatures_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
           optionals.set(0);
         }
@@ -8534,8 +9055,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getSupportedFeatures_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(1);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
           struct.success = iprot.readString();
           struct.setSuccessIsSet(true);
@@ -8543,27 +9064,27 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getConfiguration_args implements org.apache.thrift.TBase<getConfiguration_args, getConfiguration_args._Fields>, java.io.Serializable, Cloneable, Comparable<getConfiguration_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getConfiguration_args");
 
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getConfiguration_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getConfiguration_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getConfiguration_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getConfiguration_argsTupleSchemeFactory();
 
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
 ;
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -8571,6 +9092,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           default:
@@ -8584,21 +9106,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -8607,14 +9130,14 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getConfiguration_args.class, metaDataMap);
     }
 
@@ -8635,32 +9158,31 @@ public class SatelliteServer {
     public void clear() {
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getConfiguration_args)
         return this.equals((getConfiguration_args)that);
       return false;
@@ -8669,15 +9191,17 @@ public class SatelliteServer {
     public boolean equals(getConfiguration_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       return true;
     }
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -8691,21 +9215,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getConfiguration_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getConfiguration_args(");
       boolean first = true;
 
       sb.append(")");
@@ -8725,7 +9250,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -8733,13 +9258,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class getConfiguration_argsStandardSchemeFactory implements SchemeFactory {
+    private static class getConfiguration_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getConfiguration_argsStandardScheme getScheme() {
         return new getConfiguration_argsStandardScheme();
       }
     }
 
-    private static class getConfiguration_argsStandardScheme extends StandardScheme<getConfiguration_args> {
+    private static class getConfiguration_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<getConfiguration_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getConfiguration_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -8772,25 +9297,28 @@ public class SatelliteServer {
 
     }
 
-    private static class getConfiguration_argsTupleSchemeFactory implements SchemeFactory {
+    private static class getConfiguration_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getConfiguration_argsTupleScheme getScheme() {
         return new getConfiguration_argsTupleScheme();
       }
     }
 
-    private static class getConfiguration_argsTupleScheme extends TupleScheme<getConfiguration_args> {
+    private static class getConfiguration_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<getConfiguration_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getConfiguration_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
       }
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getConfiguration_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getConfiguration_result implements org.apache.thrift.TBase<getConfiguration_result, getConfiguration_result._Fields>, java.io.Serializable, Cloneable, Comparable<getConfiguration_result>   {
@@ -8798,22 +9326,19 @@ public class SatelliteServer {
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getConfiguration_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getConfiguration_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getConfiguration_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getConfiguration_resultTupleSchemeFactory();
 
-    public SatelliteConfig success; // required
+    public @org.apache.thrift.annotation.Nullable SatelliteConfig success; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SUCCESS((short)0, "success");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -8821,6 +9346,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
@@ -8836,21 +9362,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -8859,18 +9386,18 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, SatelliteConfig.class)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getConfiguration_result.class, metaDataMap);
     }
 
@@ -8902,11 +9429,12 @@ public class SatelliteServer {
       this.success = null;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public SatelliteConfig getSuccess() {
       return this.success;
     }
 
-    public getConfiguration_result setSuccess(SatelliteConfig success) {
+    public getConfiguration_result setSuccess(@org.apache.thrift.annotation.Nullable SatelliteConfig success) {
       this.success = success;
       return this;
     }
@@ -8926,7 +9454,7 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
@@ -8939,32 +9467,31 @@ public class SatelliteServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
         return getSuccess();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
       case SUCCESS:
         return isSetSuccess();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getConfiguration_result)
         return this.equals((getConfiguration_result)that);
       return false;
@@ -8973,6 +9500,8 @@ public class SatelliteServer {
     public boolean equals(getConfiguration_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_success = true && this.isSetSuccess();
       boolean that_present_success = true && that.isSetSuccess();
@@ -8988,14 +9517,13 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -9006,7 +9534,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -9019,21 +9547,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getConfiguration_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getConfiguration_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -9063,7 +9592,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -9071,13 +9600,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class getConfiguration_resultStandardSchemeFactory implements SchemeFactory {
+    private static class getConfiguration_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getConfiguration_resultStandardScheme getScheme() {
         return new getConfiguration_resultStandardScheme();
       }
     }
 
-    private static class getConfiguration_resultStandardScheme extends StandardScheme<getConfiguration_result> {
+    private static class getConfiguration_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<getConfiguration_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getConfiguration_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -9124,18 +9653,18 @@ public class SatelliteServer {
 
     }
 
-    private static class getConfiguration_resultTupleSchemeFactory implements SchemeFactory {
+    private static class getConfiguration_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getConfiguration_resultTupleScheme getScheme() {
         return new getConfiguration_resultTupleScheme();
       }
     }
 
-    private static class getConfiguration_resultTupleScheme extends TupleScheme<getConfiguration_result> {
+    private static class getConfiguration_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<getConfiguration_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getConfiguration_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
           optionals.set(0);
         }
@@ -9147,8 +9676,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getConfiguration_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(1);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
           struct.success = new SatelliteConfig();
           struct.success.read(iprot);
@@ -9157,6 +9686,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class requestImageVersionUpload_args implements org.apache.thrift.TBase<requestImageVersionUpload_args, requestImageVersionUpload_args._Fields>, java.io.Serializable, Cloneable, Comparable<requestImageVersionUpload_args>   {
@@ -9168,17 +9700,14 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField BLOCK_HASHES_FIELD_DESC = new org.apache.thrift.protocol.TField("blockHashes", org.apache.thrift.protocol.TType.LIST, (short)4);
     private static final org.apache.thrift.protocol.TField MACHINE_DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("machineDescription", org.apache.thrift.protocol.TType.STRING, (short)5);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new requestImageVersionUpload_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new requestImageVersionUpload_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new requestImageVersionUpload_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new requestImageVersionUpload_argsTupleSchemeFactory();
 
-    public String userToken; // required
-    public String imageBaseId; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String userToken; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String imageBaseId; // required
     public long fileSize; // required
-    public List<ByteBuffer> blockHashes; // required
-    public ByteBuffer machineDescription; // required
+    public @org.apache.thrift.annotation.Nullable java.util.List<java.nio.ByteBuffer> blockHashes; // required
+    public @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer machineDescription; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -9188,10 +9717,10 @@ public class SatelliteServer {
       BLOCK_HASHES((short)4, "blockHashes"),
       MACHINE_DESCRIPTION((short)5, "machineDescription");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -9199,6 +9728,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // USER_TOKEN
@@ -9222,21 +9752,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -9245,7 +9776,7 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
@@ -9253,9 +9784,9 @@ public class SatelliteServer {
     // isset id assignments
     private static final int __FILESIZE_ISSET_ID = 0;
     private byte __isset_bitfield = 0;
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.USER_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("userToken", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
       tmpMap.put(_Fields.IMAGE_BASE_ID, new org.apache.thrift.meta_data.FieldMetaData("imageBaseId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -9267,7 +9798,7 @@ public class SatelliteServer {
               new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING              , true))));
       tmpMap.put(_Fields.MACHINE_DESCRIPTION, new org.apache.thrift.meta_data.FieldMetaData("machineDescription", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , true)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(requestImageVersionUpload_args.class, metaDataMap);
     }
 
@@ -9275,11 +9806,11 @@ public class SatelliteServer {
     }
 
     public requestImageVersionUpload_args(
-      String userToken,
-      String imageBaseId,
+      java.lang.String userToken,
+      java.lang.String imageBaseId,
       long fileSize,
-      List<ByteBuffer> blockHashes,
-      ByteBuffer machineDescription)
+      java.util.List<java.nio.ByteBuffer> blockHashes,
+      java.nio.ByteBuffer machineDescription)
     {
       this();
       this.userToken = userToken;
@@ -9303,7 +9834,7 @@ public class SatelliteServer {
       }
       this.fileSize = other.fileSize;
       if (other.isSetBlockHashes()) {
-        List<ByteBuffer> __this__blockHashes = new ArrayList<ByteBuffer>(other.blockHashes);
+        java.util.List<java.nio.ByteBuffer> __this__blockHashes = new java.util.ArrayList<java.nio.ByteBuffer>(other.blockHashes);
         this.blockHashes = __this__blockHashes;
       }
       if (other.isSetMachineDescription()) {
@@ -9325,11 +9856,12 @@ public class SatelliteServer {
       this.machineDescription = null;
     }
 
-    public String getUserToken() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getUserToken() {
       return this.userToken;
     }
 
-    public requestImageVersionUpload_args setUserToken(String userToken) {
+    public requestImageVersionUpload_args setUserToken(@org.apache.thrift.annotation.Nullable java.lang.String userToken) {
       this.userToken = userToken;
       return this;
     }
@@ -9349,11 +9881,12 @@ public class SatelliteServer {
       }
     }
 
-    public String getImageBaseId() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getImageBaseId() {
       return this.imageBaseId;
     }
 
-    public requestImageVersionUpload_args setImageBaseId(String imageBaseId) {
+    public requestImageVersionUpload_args setImageBaseId(@org.apache.thrift.annotation.Nullable java.lang.String imageBaseId) {
       this.imageBaseId = imageBaseId;
       return this;
     }
@@ -9384,38 +9917,40 @@ public class SatelliteServer {
     }
 
     public void unsetFileSize() {
-      __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __FILESIZE_ISSET_ID);
+      __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __FILESIZE_ISSET_ID);
     }
 
     /** Returns true if field fileSize is set (has been assigned a value) and false otherwise */
     public boolean isSetFileSize() {
-      return EncodingUtils.testBit(__isset_bitfield, __FILESIZE_ISSET_ID);
+      return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __FILESIZE_ISSET_ID);
     }
 
     public void setFileSizeIsSet(boolean value) {
-      __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __FILESIZE_ISSET_ID, value);
+      __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __FILESIZE_ISSET_ID, value);
     }
 
     public int getBlockHashesSize() {
       return (this.blockHashes == null) ? 0 : this.blockHashes.size();
     }
 
-    public java.util.Iterator<ByteBuffer> getBlockHashesIterator() {
+    @org.apache.thrift.annotation.Nullable
+    public java.util.Iterator<java.nio.ByteBuffer> getBlockHashesIterator() {
       return (this.blockHashes == null) ? null : this.blockHashes.iterator();
     }
 
-    public void addToBlockHashes(ByteBuffer elem) {
+    public void addToBlockHashes(java.nio.ByteBuffer elem) {
       if (this.blockHashes == null) {
-        this.blockHashes = new ArrayList<ByteBuffer>();
+        this.blockHashes = new java.util.ArrayList<java.nio.ByteBuffer>();
       }
       this.blockHashes.add(elem);
     }
 
-    public List<ByteBuffer> getBlockHashes() {
+    @org.apache.thrift.annotation.Nullable
+    public java.util.List<java.nio.ByteBuffer> getBlockHashes() {
       return this.blockHashes;
     }
 
-    public requestImageVersionUpload_args setBlockHashes(List<ByteBuffer> blockHashes) {
+    public requestImageVersionUpload_args setBlockHashes(@org.apache.thrift.annotation.Nullable java.util.List<java.nio.ByteBuffer> blockHashes) {
       this.blockHashes = blockHashes;
       return this;
     }
@@ -9440,16 +9975,16 @@ public class SatelliteServer {
       return machineDescription == null ? null : machineDescription.array();
     }
 
-    public ByteBuffer bufferForMachineDescription() {
+    public java.nio.ByteBuffer bufferForMachineDescription() {
       return org.apache.thrift.TBaseHelper.copyBinary(machineDescription);
     }
 
     public requestImageVersionUpload_args setMachineDescription(byte[] machineDescription) {
-      this.machineDescription = machineDescription == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(machineDescription, machineDescription.length));
+      this.machineDescription = machineDescription == null ? (java.nio.ByteBuffer)null     : java.nio.ByteBuffer.wrap(machineDescription.clone());
       return this;
     }
 
-    public requestImageVersionUpload_args setMachineDescription(ByteBuffer machineDescription) {
+    public requestImageVersionUpload_args setMachineDescription(@org.apache.thrift.annotation.Nullable java.nio.ByteBuffer machineDescription) {
       this.machineDescription = org.apache.thrift.TBaseHelper.copyBinary(machineDescription);
       return this;
     }
@@ -9469,13 +10004,13 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case USER_TOKEN:
         if (value == null) {
           unsetUserToken();
         } else {
-          setUserToken((String)value);
+          setUserToken((java.lang.String)value);
         }
         break;
 
@@ -9483,7 +10018,7 @@ public class SatelliteServer {
         if (value == null) {
           unsetImageBaseId();
         } else {
-          setImageBaseId((String)value);
+          setImageBaseId((java.lang.String)value);
         }
         break;
 
@@ -9491,7 +10026,7 @@ public class SatelliteServer {
         if (value == null) {
           unsetFileSize();
         } else {
-          setFileSize((Long)value);
+          setFileSize((java.lang.Long)value);
         }
         break;
 
@@ -9499,7 +10034,7 @@ public class SatelliteServer {
         if (value == null) {
           unsetBlockHashes();
         } else {
-          setBlockHashes((List<ByteBuffer>)value);
+          setBlockHashes((java.util.List<java.nio.ByteBuffer>)value);
         }
         break;
 
@@ -9507,14 +10042,19 @@ public class SatelliteServer {
         if (value == null) {
           unsetMachineDescription();
         } else {
-          setMachineDescription((ByteBuffer)value);
+          if (value instanceof byte[]) {
+            setMachineDescription((byte[])value);
+          } else {
+            setMachineDescription((java.nio.ByteBuffer)value);
+          }
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case USER_TOKEN:
         return getUserToken();
@@ -9532,13 +10072,13 @@ public class SatelliteServer {
         return getMachineDescription();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -9553,13 +10093,11 @@ public class SatelliteServer {
       case MACHINE_DESCRIPTION:
         return isSetMachineDescription();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof requestImageVersionUpload_args)
         return this.equals((requestImageVersionUpload_args)that);
       return false;
@@ -9568,6 +10106,8 @@ public class SatelliteServer {
     public boolean equals(requestImageVersionUpload_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_userToken = true && this.isSetUserToken();
       boolean that_present_userToken = true && that.isSetUserToken();
@@ -9619,34 +10159,27 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_userToken = true && (isSetUserToken());
-      list.add(present_userToken);
-      if (present_userToken)
-        list.add(userToken);
+      hashCode = hashCode * 8191 + ((isSetUserToken()) ? 131071 : 524287);
+      if (isSetUserToken())
+        hashCode = hashCode * 8191 + userToken.hashCode();
 
-      boolean present_imageBaseId = true && (isSetImageBaseId());
-      list.add(present_imageBaseId);
-      if (present_imageBaseId)
-        list.add(imageBaseId);
+      hashCode = hashCode * 8191 + ((isSetImageBaseId()) ? 131071 : 524287);
+      if (isSetImageBaseId())
+        hashCode = hashCode * 8191 + imageBaseId.hashCode();
 
-      boolean present_fileSize = true;
-      list.add(present_fileSize);
-      if (present_fileSize)
-        list.add(fileSize);
+      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(fileSize);
 
-      boolean present_blockHashes = true && (isSetBlockHashes());
-      list.add(present_blockHashes);
-      if (present_blockHashes)
-        list.add(blockHashes);
+      hashCode = hashCode * 8191 + ((isSetBlockHashes()) ? 131071 : 524287);
+      if (isSetBlockHashes())
+        hashCode = hashCode * 8191 + blockHashes.hashCode();
 
-      boolean present_machineDescription = true && (isSetMachineDescription());
-      list.add(present_machineDescription);
-      if (present_machineDescription)
-        list.add(machineDescription);
+      hashCode = hashCode * 8191 + ((isSetMachineDescription()) ? 131071 : 524287);
+      if (isSetMachineDescription())
+        hashCode = hashCode * 8191 + machineDescription.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -9657,7 +10190,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetUserToken()).compareTo(other.isSetUserToken());
+      lastComparison = java.lang.Boolean.compare(isSetUserToken(), other.isSetUserToken());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -9667,7 +10200,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetImageBaseId()).compareTo(other.isSetImageBaseId());
+      lastComparison = java.lang.Boolean.compare(isSetImageBaseId(), other.isSetImageBaseId());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -9677,7 +10210,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFileSize()).compareTo(other.isSetFileSize());
+      lastComparison = java.lang.Boolean.compare(isSetFileSize(), other.isSetFileSize());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -9687,7 +10220,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetBlockHashes()).compareTo(other.isSetBlockHashes());
+      lastComparison = java.lang.Boolean.compare(isSetBlockHashes(), other.isSetBlockHashes());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -9697,7 +10230,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetMachineDescription()).compareTo(other.isSetMachineDescription());
+      lastComparison = java.lang.Boolean.compare(isSetMachineDescription(), other.isSetMachineDescription());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -9710,21 +10243,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("requestImageVersionUpload_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("requestImageVersionUpload_args(");
       boolean first = true;
 
       sb.append("userToken:");
@@ -9779,7 +10313,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
         __isset_bitfield = 0;
@@ -9789,13 +10323,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class requestImageVersionUpload_argsStandardSchemeFactory implements SchemeFactory {
+    private static class requestImageVersionUpload_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public requestImageVersionUpload_argsStandardScheme getScheme() {
         return new requestImageVersionUpload_argsStandardScheme();
       }
     }
 
-    private static class requestImageVersionUpload_argsStandardScheme extends StandardScheme<requestImageVersionUpload_args> {
+    private static class requestImageVersionUpload_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<requestImageVersionUpload_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, requestImageVersionUpload_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -9834,13 +10368,13 @@ public class SatelliteServer {
             case 4: // BLOCK_HASHES
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list218 = iprot.readListBegin();
-                  struct.blockHashes = new ArrayList<ByteBuffer>(_list218.size);
-                  ByteBuffer _elem219;
-                  for (int _i220 = 0; _i220 < _list218.size; ++_i220)
+                  org.apache.thrift.protocol.TList _list298 = iprot.readListBegin();
+                  struct.blockHashes = new java.util.ArrayList<java.nio.ByteBuffer>(_list298.size);
+                  @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer _elem299;
+                  for (int _i300 = 0; _i300 < _list298.size; ++_i300)
                   {
-                    _elem219 = iprot.readBinary();
-                    struct.blockHashes.add(_elem219);
+                    _elem299 = iprot.readBinary();
+                    struct.blockHashes.add(_elem299);
                   }
                   iprot.readListEnd();
                 }
@@ -9889,9 +10423,9 @@ public class SatelliteServer {
           oprot.writeFieldBegin(BLOCK_HASHES_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.blockHashes.size()));
-            for (ByteBuffer _iter221 : struct.blockHashes)
+            for (java.nio.ByteBuffer _iter301 : struct.blockHashes)
             {
-              oprot.writeBinary(_iter221);
+              oprot.writeBinary(_iter301);
             }
             oprot.writeListEnd();
           }
@@ -9908,18 +10442,18 @@ public class SatelliteServer {
 
     }
 
-    private static class requestImageVersionUpload_argsTupleSchemeFactory implements SchemeFactory {
+    private static class requestImageVersionUpload_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public requestImageVersionUpload_argsTupleScheme getScheme() {
         return new requestImageVersionUpload_argsTupleScheme();
       }
     }
 
-    private static class requestImageVersionUpload_argsTupleScheme extends TupleScheme<requestImageVersionUpload_args> {
+    private static class requestImageVersionUpload_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<requestImageVersionUpload_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, requestImageVersionUpload_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetUserToken()) {
           optionals.set(0);
         }
@@ -9948,9 +10482,9 @@ public class SatelliteServer {
         if (struct.isSetBlockHashes()) {
           {
             oprot.writeI32(struct.blockHashes.size());
-            for (ByteBuffer _iter222 : struct.blockHashes)
+            for (java.nio.ByteBuffer _iter302 : struct.blockHashes)
             {
-              oprot.writeBinary(_iter222);
+              oprot.writeBinary(_iter302);
             }
           }
         }
@@ -9961,8 +10495,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, requestImageVersionUpload_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(5);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(5);
         if (incoming.get(0)) {
           struct.userToken = iprot.readString();
           struct.setUserTokenIsSet(true);
@@ -9977,13 +10511,13 @@ public class SatelliteServer {
         }
         if (incoming.get(3)) {
           {
-            org.apache.thrift.protocol.TList _list223 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-            struct.blockHashes = new ArrayList<ByteBuffer>(_list223.size);
-            ByteBuffer _elem224;
-            for (int _i225 = 0; _i225 < _list223.size; ++_i225)
+            org.apache.thrift.protocol.TList _list303 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.blockHashes = new java.util.ArrayList<java.nio.ByteBuffer>(_list303.size);
+            @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer _elem304;
+            for (int _i305 = 0; _i305 < _list303.size; ++_i305)
             {
-              _elem224 = iprot.readBinary();
-              struct.blockHashes.add(_elem224);
+              _elem304 = iprot.readBinary();
+              struct.blockHashes.add(_elem304);
             }
           }
           struct.setBlockHashesIsSet(true);
@@ -9995,6 +10529,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class requestImageVersionUpload_result implements org.apache.thrift.TBase<requestImageVersionUpload_result, requestImageVersionUpload_result._Fields>, java.io.Serializable, Cloneable, Comparable<requestImageVersionUpload_result>   {
@@ -10006,17 +10543,14 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField FFFF_FIELD_DESC = new org.apache.thrift.protocol.TField("ffff", org.apache.thrift.protocol.TType.STRUCT, (short)3);
     private static final org.apache.thrift.protocol.TField SDF_FIELD_DESC = new org.apache.thrift.protocol.TField("sdf", org.apache.thrift.protocol.TType.STRUCT, (short)4);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new requestImageVersionUpload_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new requestImageVersionUpload_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new requestImageVersionUpload_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new requestImageVersionUpload_resultTupleSchemeFactory();
 
-    public TransferInformation success; // required
-    public TTransferRejectedException rejection; // required
-    public TAuthorizationException authError; // required
-    public TInvocationException ffff; // required
-    public TNotFoundException sdf; // required
+    public @org.apache.thrift.annotation.Nullable TransferInformation success; // required
+    public @org.apache.thrift.annotation.Nullable TTransferRejectedException rejection; // required
+    public @org.apache.thrift.annotation.Nullable TAuthorizationException authError; // required
+    public @org.apache.thrift.annotation.Nullable TInvocationException ffff; // required
+    public @org.apache.thrift.annotation.Nullable TNotFoundException sdf; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -10026,10 +10560,10 @@ public class SatelliteServer {
       FFFF((short)3, "ffff"),
       SDF((short)4, "sdf");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -10037,6 +10571,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
@@ -10060,21 +10595,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -10083,26 +10619,26 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TransferInformation.class)));
       tmpMap.put(_Fields.REJECTION, new org.apache.thrift.meta_data.FieldMetaData("rejection", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TTransferRejectedException.class)));
       tmpMap.put(_Fields.AUTH_ERROR, new org.apache.thrift.meta_data.FieldMetaData("authError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class)));
       tmpMap.put(_Fields.FFFF, new org.apache.thrift.meta_data.FieldMetaData("ffff", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class)));
       tmpMap.put(_Fields.SDF, new org.apache.thrift.meta_data.FieldMetaData("sdf", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TNotFoundException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(requestImageVersionUpload_result.class, metaDataMap);
     }
 
@@ -10158,11 +10694,12 @@ public class SatelliteServer {
       this.sdf = null;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TransferInformation getSuccess() {
       return this.success;
     }
 
-    public requestImageVersionUpload_result setSuccess(TransferInformation success) {
+    public requestImageVersionUpload_result setSuccess(@org.apache.thrift.annotation.Nullable TransferInformation success) {
       this.success = success;
       return this;
     }
@@ -10182,11 +10719,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TTransferRejectedException getRejection() {
       return this.rejection;
     }
 
-    public requestImageVersionUpload_result setRejection(TTransferRejectedException rejection) {
+    public requestImageVersionUpload_result setRejection(@org.apache.thrift.annotation.Nullable TTransferRejectedException rejection) {
       this.rejection = rejection;
       return this;
     }
@@ -10206,11 +10744,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TAuthorizationException getAuthError() {
       return this.authError;
     }
 
-    public requestImageVersionUpload_result setAuthError(TAuthorizationException authError) {
+    public requestImageVersionUpload_result setAuthError(@org.apache.thrift.annotation.Nullable TAuthorizationException authError) {
       this.authError = authError;
       return this;
     }
@@ -10230,11 +10769,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvocationException getFfff() {
       return this.ffff;
     }
 
-    public requestImageVersionUpload_result setFfff(TInvocationException ffff) {
+    public requestImageVersionUpload_result setFfff(@org.apache.thrift.annotation.Nullable TInvocationException ffff) {
       this.ffff = ffff;
       return this;
     }
@@ -10254,11 +10794,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TNotFoundException getSdf() {
       return this.sdf;
     }
 
-    public requestImageVersionUpload_result setSdf(TNotFoundException sdf) {
+    public requestImageVersionUpload_result setSdf(@org.apache.thrift.annotation.Nullable TNotFoundException sdf) {
       this.sdf = sdf;
       return this;
     }
@@ -10278,7 +10819,7 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
@@ -10323,7 +10864,8 @@ public class SatelliteServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
         return getSuccess();
@@ -10341,13 +10883,13 @@ public class SatelliteServer {
         return getSdf();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -10362,13 +10904,11 @@ public class SatelliteServer {
       case SDF:
         return isSetSdf();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof requestImageVersionUpload_result)
         return this.equals((requestImageVersionUpload_result)that);
       return false;
@@ -10377,6 +10917,8 @@ public class SatelliteServer {
     public boolean equals(requestImageVersionUpload_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_success = true && this.isSetSuccess();
       boolean that_present_success = true && that.isSetSuccess();
@@ -10428,34 +10970,29 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
 
-      boolean present_rejection = true && (isSetRejection());
-      list.add(present_rejection);
-      if (present_rejection)
-        list.add(rejection);
+      hashCode = hashCode * 8191 + ((isSetRejection()) ? 131071 : 524287);
+      if (isSetRejection())
+        hashCode = hashCode * 8191 + rejection.hashCode();
 
-      boolean present_authError = true && (isSetAuthError());
-      list.add(present_authError);
-      if (present_authError)
-        list.add(authError);
+      hashCode = hashCode * 8191 + ((isSetAuthError()) ? 131071 : 524287);
+      if (isSetAuthError())
+        hashCode = hashCode * 8191 + authError.hashCode();
 
-      boolean present_ffff = true && (isSetFfff());
-      list.add(present_ffff);
-      if (present_ffff)
-        list.add(ffff);
+      hashCode = hashCode * 8191 + ((isSetFfff()) ? 131071 : 524287);
+      if (isSetFfff())
+        hashCode = hashCode * 8191 + ffff.hashCode();
 
-      boolean present_sdf = true && (isSetSdf());
-      list.add(present_sdf);
-      if (present_sdf)
-        list.add(sdf);
+      hashCode = hashCode * 8191 + ((isSetSdf()) ? 131071 : 524287);
+      if (isSetSdf())
+        hashCode = hashCode * 8191 + sdf.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -10466,7 +11003,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -10476,7 +11013,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetRejection()).compareTo(other.isSetRejection());
+      lastComparison = java.lang.Boolean.compare(isSetRejection(), other.isSetRejection());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -10486,7 +11023,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetAuthError()).compareTo(other.isSetAuthError());
+      lastComparison = java.lang.Boolean.compare(isSetAuthError(), other.isSetAuthError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -10496,7 +11033,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFfff()).compareTo(other.isSetFfff());
+      lastComparison = java.lang.Boolean.compare(isSetFfff(), other.isSetFfff());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -10506,7 +11043,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetSdf()).compareTo(other.isSetSdf());
+      lastComparison = java.lang.Boolean.compare(isSetSdf(), other.isSetSdf());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -10519,21 +11056,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("requestImageVersionUpload_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("requestImageVersionUpload_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -10595,7 +11133,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -10603,13 +11141,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class requestImageVersionUpload_resultStandardSchemeFactory implements SchemeFactory {
+    private static class requestImageVersionUpload_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public requestImageVersionUpload_resultStandardScheme getScheme() {
         return new requestImageVersionUpload_resultStandardScheme();
       }
     }
 
-    private static class requestImageVersionUpload_resultStandardScheme extends StandardScheme<requestImageVersionUpload_result> {
+    private static class requestImageVersionUpload_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<requestImageVersionUpload_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, requestImageVersionUpload_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -10712,18 +11250,18 @@ public class SatelliteServer {
 
     }
 
-    private static class requestImageVersionUpload_resultTupleSchemeFactory implements SchemeFactory {
+    private static class requestImageVersionUpload_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public requestImageVersionUpload_resultTupleScheme getScheme() {
         return new requestImageVersionUpload_resultTupleScheme();
       }
     }
 
-    private static class requestImageVersionUpload_resultTupleScheme extends TupleScheme<requestImageVersionUpload_result> {
+    private static class requestImageVersionUpload_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<requestImageVersionUpload_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, requestImageVersionUpload_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
           optionals.set(0);
         }
@@ -10759,8 +11297,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, requestImageVersionUpload_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(5);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(5);
         if (incoming.get(0)) {
           struct.success = new TransferInformation();
           struct.success.read(iprot);
@@ -10789,6 +11327,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class updateBlockHashes_args implements org.apache.thrift.TBase<updateBlockHashes_args, updateBlockHashes_args._Fields>, java.io.Serializable, Cloneable, Comparable<updateBlockHashes_args>   {
@@ -10798,15 +11339,12 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField BLOCK_HASHES_FIELD_DESC = new org.apache.thrift.protocol.TField("blockHashes", org.apache.thrift.protocol.TType.LIST, (short)2);
     private static final org.apache.thrift.protocol.TField USER_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("userToken", org.apache.thrift.protocol.TType.STRING, (short)3);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new updateBlockHashes_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new updateBlockHashes_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new updateBlockHashes_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new updateBlockHashes_argsTupleSchemeFactory();
 
-    public String uploadToken; // required
-    public List<ByteBuffer> blockHashes; // required
-    public String userToken; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String uploadToken; // required
+    public @org.apache.thrift.annotation.Nullable java.util.List<java.nio.ByteBuffer> blockHashes; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String userToken; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -10814,10 +11352,10 @@ public class SatelliteServer {
       BLOCK_HASHES((short)2, "blockHashes"),
       USER_TOKEN((short)3, "userToken");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -10825,6 +11363,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // UPLOAD_TOKEN
@@ -10844,21 +11383,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -10867,15 +11407,15 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.UPLOAD_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("uploadToken", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
       tmpMap.put(_Fields.BLOCK_HASHES, new org.apache.thrift.meta_data.FieldMetaData("blockHashes", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -10883,7 +11423,7 @@ public class SatelliteServer {
               new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING              , true))));
       tmpMap.put(_Fields.USER_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("userToken", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(updateBlockHashes_args.class, metaDataMap);
     }
 
@@ -10891,9 +11431,9 @@ public class SatelliteServer {
     }
 
     public updateBlockHashes_args(
-      String uploadToken,
-      List<ByteBuffer> blockHashes,
-      String userToken)
+      java.lang.String uploadToken,
+      java.util.List<java.nio.ByteBuffer> blockHashes,
+      java.lang.String userToken)
     {
       this();
       this.uploadToken = uploadToken;
@@ -10909,7 +11449,7 @@ public class SatelliteServer {
         this.uploadToken = other.uploadToken;
       }
       if (other.isSetBlockHashes()) {
-        List<ByteBuffer> __this__blockHashes = new ArrayList<ByteBuffer>(other.blockHashes);
+        java.util.List<java.nio.ByteBuffer> __this__blockHashes = new java.util.ArrayList<java.nio.ByteBuffer>(other.blockHashes);
         this.blockHashes = __this__blockHashes;
       }
       if (other.isSetUserToken()) {
@@ -10928,11 +11468,12 @@ public class SatelliteServer {
       this.userToken = null;
     }
 
-    public String getUploadToken() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getUploadToken() {
       return this.uploadToken;
     }
 
-    public updateBlockHashes_args setUploadToken(String uploadToken) {
+    public updateBlockHashes_args setUploadToken(@org.apache.thrift.annotation.Nullable java.lang.String uploadToken) {
       this.uploadToken = uploadToken;
       return this;
     }
@@ -10956,22 +11497,24 @@ public class SatelliteServer {
       return (this.blockHashes == null) ? 0 : this.blockHashes.size();
     }
 
-    public java.util.Iterator<ByteBuffer> getBlockHashesIterator() {
+    @org.apache.thrift.annotation.Nullable
+    public java.util.Iterator<java.nio.ByteBuffer> getBlockHashesIterator() {
       return (this.blockHashes == null) ? null : this.blockHashes.iterator();
     }
 
-    public void addToBlockHashes(ByteBuffer elem) {
+    public void addToBlockHashes(java.nio.ByteBuffer elem) {
       if (this.blockHashes == null) {
-        this.blockHashes = new ArrayList<ByteBuffer>();
+        this.blockHashes = new java.util.ArrayList<java.nio.ByteBuffer>();
       }
       this.blockHashes.add(elem);
     }
 
-    public List<ByteBuffer> getBlockHashes() {
+    @org.apache.thrift.annotation.Nullable
+    public java.util.List<java.nio.ByteBuffer> getBlockHashes() {
       return this.blockHashes;
     }
 
-    public updateBlockHashes_args setBlockHashes(List<ByteBuffer> blockHashes) {
+    public updateBlockHashes_args setBlockHashes(@org.apache.thrift.annotation.Nullable java.util.List<java.nio.ByteBuffer> blockHashes) {
       this.blockHashes = blockHashes;
       return this;
     }
@@ -10991,11 +11534,12 @@ public class SatelliteServer {
       }
     }
 
-    public String getUserToken() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getUserToken() {
       return this.userToken;
     }
 
-    public updateBlockHashes_args setUserToken(String userToken) {
+    public updateBlockHashes_args setUserToken(@org.apache.thrift.annotation.Nullable java.lang.String userToken) {
       this.userToken = userToken;
       return this;
     }
@@ -11015,13 +11559,13 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case UPLOAD_TOKEN:
         if (value == null) {
           unsetUploadToken();
         } else {
-          setUploadToken((String)value);
+          setUploadToken((java.lang.String)value);
         }
         break;
 
@@ -11029,7 +11573,7 @@ public class SatelliteServer {
         if (value == null) {
           unsetBlockHashes();
         } else {
-          setBlockHashes((List<ByteBuffer>)value);
+          setBlockHashes((java.util.List<java.nio.ByteBuffer>)value);
         }
         break;
 
@@ -11037,14 +11581,15 @@ public class SatelliteServer {
         if (value == null) {
           unsetUserToken();
         } else {
-          setUserToken((String)value);
+          setUserToken((java.lang.String)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case UPLOAD_TOKEN:
         return getUploadToken();
@@ -11056,13 +11601,13 @@ public class SatelliteServer {
         return getUserToken();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -11073,13 +11618,11 @@ public class SatelliteServer {
       case USER_TOKEN:
         return isSetUserToken();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof updateBlockHashes_args)
         return this.equals((updateBlockHashes_args)that);
       return false;
@@ -11088,6 +11631,8 @@ public class SatelliteServer {
     public boolean equals(updateBlockHashes_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_uploadToken = true && this.isSetUploadToken();
       boolean that_present_uploadToken = true && that.isSetUploadToken();
@@ -11121,24 +11666,21 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_uploadToken = true && (isSetUploadToken());
-      list.add(present_uploadToken);
-      if (present_uploadToken)
-        list.add(uploadToken);
+      hashCode = hashCode * 8191 + ((isSetUploadToken()) ? 131071 : 524287);
+      if (isSetUploadToken())
+        hashCode = hashCode * 8191 + uploadToken.hashCode();
 
-      boolean present_blockHashes = true && (isSetBlockHashes());
-      list.add(present_blockHashes);
-      if (present_blockHashes)
-        list.add(blockHashes);
+      hashCode = hashCode * 8191 + ((isSetBlockHashes()) ? 131071 : 524287);
+      if (isSetBlockHashes())
+        hashCode = hashCode * 8191 + blockHashes.hashCode();
 
-      boolean present_userToken = true && (isSetUserToken());
-      list.add(present_userToken);
-      if (present_userToken)
-        list.add(userToken);
+      hashCode = hashCode * 8191 + ((isSetUserToken()) ? 131071 : 524287);
+      if (isSetUserToken())
+        hashCode = hashCode * 8191 + userToken.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -11149,7 +11691,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetUploadToken()).compareTo(other.isSetUploadToken());
+      lastComparison = java.lang.Boolean.compare(isSetUploadToken(), other.isSetUploadToken());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -11159,7 +11701,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetBlockHashes()).compareTo(other.isSetBlockHashes());
+      lastComparison = java.lang.Boolean.compare(isSetBlockHashes(), other.isSetBlockHashes());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -11169,7 +11711,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetUserToken()).compareTo(other.isSetUserToken());
+      lastComparison = java.lang.Boolean.compare(isSetUserToken(), other.isSetUserToken());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -11182,21 +11724,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("updateBlockHashes_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("updateBlockHashes_args(");
       boolean first = true;
 
       sb.append("uploadToken:");
@@ -11239,7 +11782,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -11247,13 +11790,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class updateBlockHashes_argsStandardSchemeFactory implements SchemeFactory {
+    private static class updateBlockHashes_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public updateBlockHashes_argsStandardScheme getScheme() {
         return new updateBlockHashes_argsStandardScheme();
       }
     }
 
-    private static class updateBlockHashes_argsStandardScheme extends StandardScheme<updateBlockHashes_args> {
+    private static class updateBlockHashes_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<updateBlockHashes_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, updateBlockHashes_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -11276,13 +11819,13 @@ public class SatelliteServer {
             case 2: // BLOCK_HASHES
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list226 = iprot.readListBegin();
-                  struct.blockHashes = new ArrayList<ByteBuffer>(_list226.size);
-                  ByteBuffer _elem227;
-                  for (int _i228 = 0; _i228 < _list226.size; ++_i228)
+                  org.apache.thrift.protocol.TList _list306 = iprot.readListBegin();
+                  struct.blockHashes = new java.util.ArrayList<java.nio.ByteBuffer>(_list306.size);
+                  @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer _elem307;
+                  for (int _i308 = 0; _i308 < _list306.size; ++_i308)
                   {
-                    _elem227 = iprot.readBinary();
-                    struct.blockHashes.add(_elem227);
+                    _elem307 = iprot.readBinary();
+                    struct.blockHashes.add(_elem307);
                   }
                   iprot.readListEnd();
                 }
@@ -11323,9 +11866,9 @@ public class SatelliteServer {
           oprot.writeFieldBegin(BLOCK_HASHES_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.blockHashes.size()));
-            for (ByteBuffer _iter229 : struct.blockHashes)
+            for (java.nio.ByteBuffer _iter309 : struct.blockHashes)
             {
-              oprot.writeBinary(_iter229);
+              oprot.writeBinary(_iter309);
             }
             oprot.writeListEnd();
           }
@@ -11342,18 +11885,18 @@ public class SatelliteServer {
 
     }
 
-    private static class updateBlockHashes_argsTupleSchemeFactory implements SchemeFactory {
+    private static class updateBlockHashes_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public updateBlockHashes_argsTupleScheme getScheme() {
         return new updateBlockHashes_argsTupleScheme();
       }
     }
 
-    private static class updateBlockHashes_argsTupleScheme extends TupleScheme<updateBlockHashes_args> {
+    private static class updateBlockHashes_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<updateBlockHashes_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, updateBlockHashes_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetUploadToken()) {
           optionals.set(0);
         }
@@ -11370,9 +11913,9 @@ public class SatelliteServer {
         if (struct.isSetBlockHashes()) {
           {
             oprot.writeI32(struct.blockHashes.size());
-            for (ByteBuffer _iter230 : struct.blockHashes)
+            for (java.nio.ByteBuffer _iter310 : struct.blockHashes)
             {
-              oprot.writeBinary(_iter230);
+              oprot.writeBinary(_iter310);
             }
           }
         }
@@ -11383,21 +11926,21 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, updateBlockHashes_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(3);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           struct.uploadToken = iprot.readString();
           struct.setUploadTokenIsSet(true);
         }
         if (incoming.get(1)) {
           {
-            org.apache.thrift.protocol.TList _list231 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-            struct.blockHashes = new ArrayList<ByteBuffer>(_list231.size);
-            ByteBuffer _elem232;
-            for (int _i233 = 0; _i233 < _list231.size; ++_i233)
+            org.apache.thrift.protocol.TList _list311 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.blockHashes = new java.util.ArrayList<java.nio.ByteBuffer>(_list311.size);
+            @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer _elem312;
+            for (int _i313 = 0; _i313 < _list311.size; ++_i313)
             {
-              _elem232 = iprot.readBinary();
-              struct.blockHashes.add(_elem232);
+              _elem312 = iprot.readBinary();
+              struct.blockHashes.add(_elem312);
             }
           }
           struct.setBlockHashesIsSet(true);
@@ -11409,6 +11952,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class updateBlockHashes_result implements org.apache.thrift.TBase<updateBlockHashes_result, updateBlockHashes_result._Fields>, java.io.Serializable, Cloneable, Comparable<updateBlockHashes_result>   {
@@ -11416,22 +11962,19 @@ public class SatelliteServer {
 
     private static final org.apache.thrift.protocol.TField EX1_FIELD_DESC = new org.apache.thrift.protocol.TField("ex1", org.apache.thrift.protocol.TType.STRUCT, (short)1);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new updateBlockHashes_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new updateBlockHashes_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new updateBlockHashes_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new updateBlockHashes_resultTupleSchemeFactory();
 
-    public TInvalidTokenException ex1; // required
+    public @org.apache.thrift.annotation.Nullable TInvalidTokenException ex1; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       EX1((short)1, "ex1");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -11439,6 +11982,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // EX1
@@ -11454,21 +11998,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -11477,18 +12022,18 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.EX1, new org.apache.thrift.meta_data.FieldMetaData("ex1", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvalidTokenException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(updateBlockHashes_result.class, metaDataMap);
     }
 
@@ -11520,11 +12065,12 @@ public class SatelliteServer {
       this.ex1 = null;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvalidTokenException getEx1() {
       return this.ex1;
     }
 
-    public updateBlockHashes_result setEx1(TInvalidTokenException ex1) {
+    public updateBlockHashes_result setEx1(@org.apache.thrift.annotation.Nullable TInvalidTokenException ex1) {
       this.ex1 = ex1;
       return this;
     }
@@ -11544,7 +12090,7 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case EX1:
         if (value == null) {
@@ -11557,32 +12103,31 @@ public class SatelliteServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case EX1:
         return getEx1();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
       case EX1:
         return isSetEx1();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof updateBlockHashes_result)
         return this.equals((updateBlockHashes_result)that);
       return false;
@@ -11591,6 +12136,8 @@ public class SatelliteServer {
     public boolean equals(updateBlockHashes_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_ex1 = true && this.isSetEx1();
       boolean that_present_ex1 = true && that.isSetEx1();
@@ -11606,14 +12153,13 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_ex1 = true && (isSetEx1());
-      list.add(present_ex1);
-      if (present_ex1)
-        list.add(ex1);
+      hashCode = hashCode * 8191 + ((isSetEx1()) ? 131071 : 524287);
+      if (isSetEx1())
+        hashCode = hashCode * 8191 + ex1.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -11624,7 +12170,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetEx1()).compareTo(other.isSetEx1());
+      lastComparison = java.lang.Boolean.compare(isSetEx1(), other.isSetEx1());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -11637,21 +12183,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("updateBlockHashes_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("updateBlockHashes_result(");
       boolean first = true;
 
       sb.append("ex1:");
@@ -11678,7 +12225,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -11686,13 +12233,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class updateBlockHashes_resultStandardSchemeFactory implements SchemeFactory {
+    private static class updateBlockHashes_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public updateBlockHashes_resultStandardScheme getScheme() {
         return new updateBlockHashes_resultStandardScheme();
       }
     }
 
-    private static class updateBlockHashes_resultStandardScheme extends StandardScheme<updateBlockHashes_result> {
+    private static class updateBlockHashes_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<updateBlockHashes_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, updateBlockHashes_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -11739,18 +12286,18 @@ public class SatelliteServer {
 
     }
 
-    private static class updateBlockHashes_resultTupleSchemeFactory implements SchemeFactory {
+    private static class updateBlockHashes_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public updateBlockHashes_resultTupleScheme getScheme() {
         return new updateBlockHashes_resultTupleScheme();
       }
     }
 
-    private static class updateBlockHashes_resultTupleScheme extends TupleScheme<updateBlockHashes_result> {
+    private static class updateBlockHashes_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<updateBlockHashes_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, updateBlockHashes_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetEx1()) {
           optionals.set(0);
         }
@@ -11762,8 +12309,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, updateBlockHashes_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(1);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
           struct.ex1 = new TInvalidTokenException();
           struct.ex1.read(iprot);
@@ -11772,6 +12319,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class setUploadOptions_args implements org.apache.thrift.TBase<setUploadOptions_args, setUploadOptions_args._Fields>, java.io.Serializable, Cloneable, Comparable<setUploadOptions_args>   {
@@ -11781,15 +12331,12 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField UPLOAD_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("uploadToken", org.apache.thrift.protocol.TType.STRING, (short)2);
     private static final org.apache.thrift.protocol.TField OPTIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("options", org.apache.thrift.protocol.TType.STRUCT, (short)3);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new setUploadOptions_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new setUploadOptions_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setUploadOptions_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setUploadOptions_argsTupleSchemeFactory();
 
-    public String userToken; // required
-    public String uploadToken; // required
-    public UploadOptions options; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String userToken; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String uploadToken; // required
+    public @org.apache.thrift.annotation.Nullable UploadOptions options; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -11797,10 +12344,10 @@ public class SatelliteServer {
       UPLOAD_TOKEN((short)2, "uploadToken"),
       OPTIONS((short)3, "options");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -11808,6 +12355,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // USER_TOKEN
@@ -11827,21 +12375,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -11850,22 +12399,22 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.USER_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("userToken", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
       tmpMap.put(_Fields.UPLOAD_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("uploadToken", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
       tmpMap.put(_Fields.OPTIONS, new org.apache.thrift.meta_data.FieldMetaData("options", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, UploadOptions.class)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setUploadOptions_args.class, metaDataMap);
     }
 
@@ -11873,8 +12422,8 @@ public class SatelliteServer {
     }
 
     public setUploadOptions_args(
-      String userToken,
-      String uploadToken,
+      java.lang.String userToken,
+      java.lang.String uploadToken,
       UploadOptions options)
     {
       this();
@@ -11909,11 +12458,12 @@ public class SatelliteServer {
       this.options = null;
     }
 
-    public String getUserToken() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getUserToken() {
       return this.userToken;
     }
 
-    public setUploadOptions_args setUserToken(String userToken) {
+    public setUploadOptions_args setUserToken(@org.apache.thrift.annotation.Nullable java.lang.String userToken) {
       this.userToken = userToken;
       return this;
     }
@@ -11933,11 +12483,12 @@ public class SatelliteServer {
       }
     }
 
-    public String getUploadToken() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getUploadToken() {
       return this.uploadToken;
     }
 
-    public setUploadOptions_args setUploadToken(String uploadToken) {
+    public setUploadOptions_args setUploadToken(@org.apache.thrift.annotation.Nullable java.lang.String uploadToken) {
       this.uploadToken = uploadToken;
       return this;
     }
@@ -11957,11 +12508,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public UploadOptions getOptions() {
       return this.options;
     }
 
-    public setUploadOptions_args setOptions(UploadOptions options) {
+    public setUploadOptions_args setOptions(@org.apache.thrift.annotation.Nullable UploadOptions options) {
       this.options = options;
       return this;
     }
@@ -11981,13 +12533,13 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case USER_TOKEN:
         if (value == null) {
           unsetUserToken();
         } else {
-          setUserToken((String)value);
+          setUserToken((java.lang.String)value);
         }
         break;
 
@@ -11995,7 +12547,7 @@ public class SatelliteServer {
         if (value == null) {
           unsetUploadToken();
         } else {
-          setUploadToken((String)value);
+          setUploadToken((java.lang.String)value);
         }
         break;
 
@@ -12010,7 +12562,8 @@ public class SatelliteServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case USER_TOKEN:
         return getUserToken();
@@ -12022,13 +12575,13 @@ public class SatelliteServer {
         return getOptions();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -12039,13 +12592,11 @@ public class SatelliteServer {
       case OPTIONS:
         return isSetOptions();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof setUploadOptions_args)
         return this.equals((setUploadOptions_args)that);
       return false;
@@ -12054,6 +12605,8 @@ public class SatelliteServer {
     public boolean equals(setUploadOptions_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_userToken = true && this.isSetUserToken();
       boolean that_present_userToken = true && that.isSetUserToken();
@@ -12087,24 +12640,21 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_userToken = true && (isSetUserToken());
-      list.add(present_userToken);
-      if (present_userToken)
-        list.add(userToken);
+      hashCode = hashCode * 8191 + ((isSetUserToken()) ? 131071 : 524287);
+      if (isSetUserToken())
+        hashCode = hashCode * 8191 + userToken.hashCode();
 
-      boolean present_uploadToken = true && (isSetUploadToken());
-      list.add(present_uploadToken);
-      if (present_uploadToken)
-        list.add(uploadToken);
+      hashCode = hashCode * 8191 + ((isSetUploadToken()) ? 131071 : 524287);
+      if (isSetUploadToken())
+        hashCode = hashCode * 8191 + uploadToken.hashCode();
 
-      boolean present_options = true && (isSetOptions());
-      list.add(present_options);
-      if (present_options)
-        list.add(options);
+      hashCode = hashCode * 8191 + ((isSetOptions()) ? 131071 : 524287);
+      if (isSetOptions())
+        hashCode = hashCode * 8191 + options.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -12115,7 +12665,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetUserToken()).compareTo(other.isSetUserToken());
+      lastComparison = java.lang.Boolean.compare(isSetUserToken(), other.isSetUserToken());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -12125,7 +12675,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetUploadToken()).compareTo(other.isSetUploadToken());
+      lastComparison = java.lang.Boolean.compare(isSetUploadToken(), other.isSetUploadToken());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -12135,7 +12685,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetOptions()).compareTo(other.isSetOptions());
+      lastComparison = java.lang.Boolean.compare(isSetOptions(), other.isSetOptions());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -12148,21 +12698,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("setUploadOptions_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("setUploadOptions_args(");
       boolean first = true;
 
       sb.append("userToken:");
@@ -12208,7 +12759,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -12216,13 +12767,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class setUploadOptions_argsStandardSchemeFactory implements SchemeFactory {
+    private static class setUploadOptions_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public setUploadOptions_argsStandardScheme getScheme() {
         return new setUploadOptions_argsStandardScheme();
       }
     }
 
-    private static class setUploadOptions_argsStandardScheme extends StandardScheme<setUploadOptions_args> {
+    private static class setUploadOptions_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<setUploadOptions_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, setUploadOptions_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -12295,18 +12846,18 @@ public class SatelliteServer {
 
     }
 
-    private static class setUploadOptions_argsTupleSchemeFactory implements SchemeFactory {
+    private static class setUploadOptions_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public setUploadOptions_argsTupleScheme getScheme() {
         return new setUploadOptions_argsTupleScheme();
       }
     }
 
-    private static class setUploadOptions_argsTupleScheme extends TupleScheme<setUploadOptions_args> {
+    private static class setUploadOptions_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<setUploadOptions_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, setUploadOptions_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetUserToken()) {
           optionals.set(0);
         }
@@ -12330,8 +12881,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, setUploadOptions_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(3);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           struct.userToken = iprot.readString();
           struct.setUserTokenIsSet(true);
@@ -12348,6 +12899,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class setUploadOptions_result implements org.apache.thrift.TBase<setUploadOptions_result, setUploadOptions_result._Fields>, java.io.Serializable, Cloneable, Comparable<setUploadOptions_result>   {
@@ -12357,15 +12911,12 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField FROOTLOOPS_FIELD_DESC = new org.apache.thrift.protocol.TField("frootloops", org.apache.thrift.protocol.TType.STRUCT, (short)1);
     private static final org.apache.thrift.protocol.TField IMCYBORGBUTTHATSOK_FIELD_DESC = new org.apache.thrift.protocol.TField("imcyborgbutthatsok", org.apache.thrift.protocol.TType.STRUCT, (short)2);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new setUploadOptions_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new setUploadOptions_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setUploadOptions_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setUploadOptions_resultTupleSchemeFactory();
 
-    public UploadOptions success; // required
-    public TAuthorizationException frootloops; // required
-    public TInvalidTokenException imcyborgbutthatsok; // required
+    public @org.apache.thrift.annotation.Nullable UploadOptions success; // required
+    public @org.apache.thrift.annotation.Nullable TAuthorizationException frootloops; // required
+    public @org.apache.thrift.annotation.Nullable TInvalidTokenException imcyborgbutthatsok; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -12373,10 +12924,10 @@ public class SatelliteServer {
       FROOTLOOPS((short)1, "frootloops"),
       IMCYBORGBUTTHATSOK((short)2, "imcyborgbutthatsok");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -12384,6 +12935,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
@@ -12403,21 +12955,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -12426,22 +12979,22 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, UploadOptions.class)));
       tmpMap.put(_Fields.FROOTLOOPS, new org.apache.thrift.meta_data.FieldMetaData("frootloops", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class)));
       tmpMap.put(_Fields.IMCYBORGBUTTHATSOK, new org.apache.thrift.meta_data.FieldMetaData("imcyborgbutthatsok", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvalidTokenException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setUploadOptions_result.class, metaDataMap);
     }
 
@@ -12485,11 +13038,12 @@ public class SatelliteServer {
       this.imcyborgbutthatsok = null;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public UploadOptions getSuccess() {
       return this.success;
     }
 
-    public setUploadOptions_result setSuccess(UploadOptions success) {
+    public setUploadOptions_result setSuccess(@org.apache.thrift.annotation.Nullable UploadOptions success) {
       this.success = success;
       return this;
     }
@@ -12509,11 +13063,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TAuthorizationException getFrootloops() {
       return this.frootloops;
     }
 
-    public setUploadOptions_result setFrootloops(TAuthorizationException frootloops) {
+    public setUploadOptions_result setFrootloops(@org.apache.thrift.annotation.Nullable TAuthorizationException frootloops) {
       this.frootloops = frootloops;
       return this;
     }
@@ -12533,11 +13088,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvalidTokenException getImcyborgbutthatsok() {
       return this.imcyborgbutthatsok;
     }
 
-    public setUploadOptions_result setImcyborgbutthatsok(TInvalidTokenException imcyborgbutthatsok) {
+    public setUploadOptions_result setImcyborgbutthatsok(@org.apache.thrift.annotation.Nullable TInvalidTokenException imcyborgbutthatsok) {
       this.imcyborgbutthatsok = imcyborgbutthatsok;
       return this;
     }
@@ -12557,7 +13113,7 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
@@ -12586,7 +13142,8 @@ public class SatelliteServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
         return getSuccess();
@@ -12598,13 +13155,13 @@ public class SatelliteServer {
         return getImcyborgbutthatsok();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -12615,13 +13172,11 @@ public class SatelliteServer {
       case IMCYBORGBUTTHATSOK:
         return isSetImcyborgbutthatsok();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof setUploadOptions_result)
         return this.equals((setUploadOptions_result)that);
       return false;
@@ -12630,6 +13185,8 @@ public class SatelliteServer {
     public boolean equals(setUploadOptions_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_success = true && this.isSetSuccess();
       boolean that_present_success = true && that.isSetSuccess();
@@ -12663,24 +13220,21 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
 
-      boolean present_frootloops = true && (isSetFrootloops());
-      list.add(present_frootloops);
-      if (present_frootloops)
-        list.add(frootloops);
+      hashCode = hashCode * 8191 + ((isSetFrootloops()) ? 131071 : 524287);
+      if (isSetFrootloops())
+        hashCode = hashCode * 8191 + frootloops.hashCode();
 
-      boolean present_imcyborgbutthatsok = true && (isSetImcyborgbutthatsok());
-      list.add(present_imcyborgbutthatsok);
-      if (present_imcyborgbutthatsok)
-        list.add(imcyborgbutthatsok);
+      hashCode = hashCode * 8191 + ((isSetImcyborgbutthatsok()) ? 131071 : 524287);
+      if (isSetImcyborgbutthatsok())
+        hashCode = hashCode * 8191 + imcyborgbutthatsok.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -12691,7 +13245,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -12701,7 +13255,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFrootloops()).compareTo(other.isSetFrootloops());
+      lastComparison = java.lang.Boolean.compare(isSetFrootloops(), other.isSetFrootloops());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -12711,7 +13265,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetImcyborgbutthatsok()).compareTo(other.isSetImcyborgbutthatsok());
+      lastComparison = java.lang.Boolean.compare(isSetImcyborgbutthatsok(), other.isSetImcyborgbutthatsok());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -12724,21 +13278,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("setUploadOptions_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("setUploadOptions_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -12784,7 +13339,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -12792,13 +13347,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class setUploadOptions_resultStandardSchemeFactory implements SchemeFactory {
+    private static class setUploadOptions_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public setUploadOptions_resultStandardScheme getScheme() {
         return new setUploadOptions_resultStandardScheme();
       }
     }
 
-    private static class setUploadOptions_resultStandardScheme extends StandardScheme<setUploadOptions_result> {
+    private static class setUploadOptions_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<setUploadOptions_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, setUploadOptions_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -12873,18 +13428,18 @@ public class SatelliteServer {
 
     }
 
-    private static class setUploadOptions_resultTupleSchemeFactory implements SchemeFactory {
+    private static class setUploadOptions_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public setUploadOptions_resultTupleScheme getScheme() {
         return new setUploadOptions_resultTupleScheme();
       }
     }
 
-    private static class setUploadOptions_resultTupleScheme extends TupleScheme<setUploadOptions_result> {
+    private static class setUploadOptions_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<setUploadOptions_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, setUploadOptions_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
           optionals.set(0);
         }
@@ -12908,8 +13463,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, setUploadOptions_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(3);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           struct.success = new UploadOptions();
           struct.success.read(iprot);
@@ -12928,6 +13483,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class cancelUpload_args implements org.apache.thrift.TBase<cancelUpload_args, cancelUpload_args._Fields>, java.io.Serializable, Cloneable, Comparable<cancelUpload_args>   {
@@ -12935,22 +13493,19 @@ public class SatelliteServer {
 
     private static final org.apache.thrift.protocol.TField UPLOAD_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("uploadToken", org.apache.thrift.protocol.TType.STRING, (short)1);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new cancelUpload_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new cancelUpload_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new cancelUpload_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new cancelUpload_argsTupleSchemeFactory();
 
-    public String uploadToken; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String uploadToken; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       UPLOAD_TOKEN((short)1, "uploadToken");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -12958,6 +13513,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // UPLOAD_TOKEN
@@ -12973,21 +13529,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -12996,18 +13553,18 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.UPLOAD_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("uploadToken", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(cancelUpload_args.class, metaDataMap);
     }
 
@@ -13015,7 +13572,7 @@ public class SatelliteServer {
     }
 
     public cancelUpload_args(
-      String uploadToken)
+      java.lang.String uploadToken)
     {
       this();
       this.uploadToken = uploadToken;
@@ -13039,11 +13596,12 @@ public class SatelliteServer {
       this.uploadToken = null;
     }
 
-    public String getUploadToken() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getUploadToken() {
       return this.uploadToken;
     }
 
-    public cancelUpload_args setUploadToken(String uploadToken) {
+    public cancelUpload_args setUploadToken(@org.apache.thrift.annotation.Nullable java.lang.String uploadToken) {
       this.uploadToken = uploadToken;
       return this;
     }
@@ -13063,45 +13621,44 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case UPLOAD_TOKEN:
         if (value == null) {
           unsetUploadToken();
         } else {
-          setUploadToken((String)value);
+          setUploadToken((java.lang.String)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case UPLOAD_TOKEN:
         return getUploadToken();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
       case UPLOAD_TOKEN:
         return isSetUploadToken();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof cancelUpload_args)
         return this.equals((cancelUpload_args)that);
       return false;
@@ -13110,6 +13667,8 @@ public class SatelliteServer {
     public boolean equals(cancelUpload_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_uploadToken = true && this.isSetUploadToken();
       boolean that_present_uploadToken = true && that.isSetUploadToken();
@@ -13125,14 +13684,13 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_uploadToken = true && (isSetUploadToken());
-      list.add(present_uploadToken);
-      if (present_uploadToken)
-        list.add(uploadToken);
+      hashCode = hashCode * 8191 + ((isSetUploadToken()) ? 131071 : 524287);
+      if (isSetUploadToken())
+        hashCode = hashCode * 8191 + uploadToken.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -13143,7 +13701,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetUploadToken()).compareTo(other.isSetUploadToken());
+      lastComparison = java.lang.Boolean.compare(isSetUploadToken(), other.isSetUploadToken());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -13156,21 +13714,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("cancelUpload_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("cancelUpload_args(");
       boolean first = true;
 
       sb.append("uploadToken:");
@@ -13197,7 +13756,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -13205,13 +13764,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class cancelUpload_argsStandardSchemeFactory implements SchemeFactory {
+    private static class cancelUpload_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public cancelUpload_argsStandardScheme getScheme() {
         return new cancelUpload_argsStandardScheme();
       }
     }
 
-    private static class cancelUpload_argsStandardScheme extends StandardScheme<cancelUpload_args> {
+    private static class cancelUpload_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<cancelUpload_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, cancelUpload_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -13257,18 +13816,18 @@ public class SatelliteServer {
 
     }
 
-    private static class cancelUpload_argsTupleSchemeFactory implements SchemeFactory {
+    private static class cancelUpload_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public cancelUpload_argsTupleScheme getScheme() {
         return new cancelUpload_argsTupleScheme();
       }
     }
 
-    private static class cancelUpload_argsTupleScheme extends TupleScheme<cancelUpload_args> {
+    private static class cancelUpload_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<cancelUpload_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, cancelUpload_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetUploadToken()) {
           optionals.set(0);
         }
@@ -13280,8 +13839,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, cancelUpload_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(1);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
           struct.uploadToken = iprot.readString();
           struct.setUploadTokenIsSet(true);
@@ -13289,6 +13848,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class cancelUpload_result implements org.apache.thrift.TBase<cancelUpload_result, cancelUpload_result._Fields>, java.io.Serializable, Cloneable, Comparable<cancelUpload_result>   {
@@ -13296,22 +13858,19 @@ public class SatelliteServer {
 
     private static final org.apache.thrift.protocol.TField EX1_FIELD_DESC = new org.apache.thrift.protocol.TField("ex1", org.apache.thrift.protocol.TType.STRUCT, (short)1);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new cancelUpload_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new cancelUpload_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new cancelUpload_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new cancelUpload_resultTupleSchemeFactory();
 
-    public TInvalidTokenException ex1; // required
+    public @org.apache.thrift.annotation.Nullable TInvalidTokenException ex1; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       EX1((short)1, "ex1");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -13319,6 +13878,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // EX1
@@ -13334,21 +13894,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -13357,18 +13918,18 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.EX1, new org.apache.thrift.meta_data.FieldMetaData("ex1", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvalidTokenException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(cancelUpload_result.class, metaDataMap);
     }
 
@@ -13400,11 +13961,12 @@ public class SatelliteServer {
       this.ex1 = null;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvalidTokenException getEx1() {
       return this.ex1;
     }
 
-    public cancelUpload_result setEx1(TInvalidTokenException ex1) {
+    public cancelUpload_result setEx1(@org.apache.thrift.annotation.Nullable TInvalidTokenException ex1) {
       this.ex1 = ex1;
       return this;
     }
@@ -13424,7 +13986,7 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case EX1:
         if (value == null) {
@@ -13437,32 +13999,31 @@ public class SatelliteServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case EX1:
         return getEx1();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
       case EX1:
         return isSetEx1();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof cancelUpload_result)
         return this.equals((cancelUpload_result)that);
       return false;
@@ -13471,6 +14032,8 @@ public class SatelliteServer {
     public boolean equals(cancelUpload_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_ex1 = true && this.isSetEx1();
       boolean that_present_ex1 = true && that.isSetEx1();
@@ -13486,14 +14049,13 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_ex1 = true && (isSetEx1());
-      list.add(present_ex1);
-      if (present_ex1)
-        list.add(ex1);
+      hashCode = hashCode * 8191 + ((isSetEx1()) ? 131071 : 524287);
+      if (isSetEx1())
+        hashCode = hashCode * 8191 + ex1.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -13504,7 +14066,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetEx1()).compareTo(other.isSetEx1());
+      lastComparison = java.lang.Boolean.compare(isSetEx1(), other.isSetEx1());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -13517,21 +14079,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("cancelUpload_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("cancelUpload_result(");
       boolean first = true;
 
       sb.append("ex1:");
@@ -13558,7 +14121,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -13566,13 +14129,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class cancelUpload_resultStandardSchemeFactory implements SchemeFactory {
+    private static class cancelUpload_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public cancelUpload_resultStandardScheme getScheme() {
         return new cancelUpload_resultStandardScheme();
       }
     }
 
-    private static class cancelUpload_resultStandardScheme extends StandardScheme<cancelUpload_result> {
+    private static class cancelUpload_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<cancelUpload_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, cancelUpload_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -13619,18 +14182,18 @@ public class SatelliteServer {
 
     }
 
-    private static class cancelUpload_resultTupleSchemeFactory implements SchemeFactory {
+    private static class cancelUpload_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public cancelUpload_resultTupleScheme getScheme() {
         return new cancelUpload_resultTupleScheme();
       }
     }
 
-    private static class cancelUpload_resultTupleScheme extends TupleScheme<cancelUpload_result> {
+    private static class cancelUpload_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<cancelUpload_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, cancelUpload_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetEx1()) {
           optionals.set(0);
         }
@@ -13642,8 +14205,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, cancelUpload_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(1);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
           struct.ex1 = new TInvalidTokenException();
           struct.ex1.read(iprot);
@@ -13652,6 +14215,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class queryUploadStatus_args implements org.apache.thrift.TBase<queryUploadStatus_args, queryUploadStatus_args._Fields>, java.io.Serializable, Cloneable, Comparable<queryUploadStatus_args>   {
@@ -13659,22 +14225,19 @@ public class SatelliteServer {
 
     private static final org.apache.thrift.protocol.TField UPLOAD_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("uploadToken", org.apache.thrift.protocol.TType.STRING, (short)1);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new queryUploadStatus_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new queryUploadStatus_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new queryUploadStatus_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new queryUploadStatus_argsTupleSchemeFactory();
 
-    public String uploadToken; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String uploadToken; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       UPLOAD_TOKEN((short)1, "uploadToken");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -13682,6 +14245,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // UPLOAD_TOKEN
@@ -13697,21 +14261,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -13720,18 +14285,18 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.UPLOAD_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("uploadToken", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(queryUploadStatus_args.class, metaDataMap);
     }
 
@@ -13739,7 +14304,7 @@ public class SatelliteServer {
     }
 
     public queryUploadStatus_args(
-      String uploadToken)
+      java.lang.String uploadToken)
     {
       this();
       this.uploadToken = uploadToken;
@@ -13763,11 +14328,12 @@ public class SatelliteServer {
       this.uploadToken = null;
     }
 
-    public String getUploadToken() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getUploadToken() {
       return this.uploadToken;
     }
 
-    public queryUploadStatus_args setUploadToken(String uploadToken) {
+    public queryUploadStatus_args setUploadToken(@org.apache.thrift.annotation.Nullable java.lang.String uploadToken) {
       this.uploadToken = uploadToken;
       return this;
     }
@@ -13787,45 +14353,44 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case UPLOAD_TOKEN:
         if (value == null) {
           unsetUploadToken();
         } else {
-          setUploadToken((String)value);
+          setUploadToken((java.lang.String)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case UPLOAD_TOKEN:
         return getUploadToken();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
       case UPLOAD_TOKEN:
         return isSetUploadToken();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof queryUploadStatus_args)
         return this.equals((queryUploadStatus_args)that);
       return false;
@@ -13834,6 +14399,8 @@ public class SatelliteServer {
     public boolean equals(queryUploadStatus_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_uploadToken = true && this.isSetUploadToken();
       boolean that_present_uploadToken = true && that.isSetUploadToken();
@@ -13849,14 +14416,13 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_uploadToken = true && (isSetUploadToken());
-      list.add(present_uploadToken);
-      if (present_uploadToken)
-        list.add(uploadToken);
+      hashCode = hashCode * 8191 + ((isSetUploadToken()) ? 131071 : 524287);
+      if (isSetUploadToken())
+        hashCode = hashCode * 8191 + uploadToken.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -13867,7 +14433,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetUploadToken()).compareTo(other.isSetUploadToken());
+      lastComparison = java.lang.Boolean.compare(isSetUploadToken(), other.isSetUploadToken());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -13880,21 +14446,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("queryUploadStatus_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("queryUploadStatus_args(");
       boolean first = true;
 
       sb.append("uploadToken:");
@@ -13921,7 +14488,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -13929,13 +14496,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class queryUploadStatus_argsStandardSchemeFactory implements SchemeFactory {
+    private static class queryUploadStatus_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public queryUploadStatus_argsStandardScheme getScheme() {
         return new queryUploadStatus_argsStandardScheme();
       }
     }
 
-    private static class queryUploadStatus_argsStandardScheme extends StandardScheme<queryUploadStatus_args> {
+    private static class queryUploadStatus_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<queryUploadStatus_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, queryUploadStatus_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -13981,18 +14548,18 @@ public class SatelliteServer {
 
     }
 
-    private static class queryUploadStatus_argsTupleSchemeFactory implements SchemeFactory {
+    private static class queryUploadStatus_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public queryUploadStatus_argsTupleScheme getScheme() {
         return new queryUploadStatus_argsTupleScheme();
       }
     }
 
-    private static class queryUploadStatus_argsTupleScheme extends TupleScheme<queryUploadStatus_args> {
+    private static class queryUploadStatus_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<queryUploadStatus_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, queryUploadStatus_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetUploadToken()) {
           optionals.set(0);
         }
@@ -14004,8 +14571,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, queryUploadStatus_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(1);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
           struct.uploadToken = iprot.readString();
           struct.setUploadTokenIsSet(true);
@@ -14013,6 +14580,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class queryUploadStatus_result implements org.apache.thrift.TBase<queryUploadStatus_result, queryUploadStatus_result._Fields>, java.io.Serializable, Cloneable, Comparable<queryUploadStatus_result>   {
@@ -14021,24 +14591,21 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0);
     private static final org.apache.thrift.protocol.TField EX1_FIELD_DESC = new org.apache.thrift.protocol.TField("ex1", org.apache.thrift.protocol.TType.STRUCT, (short)1);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new queryUploadStatus_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new queryUploadStatus_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new queryUploadStatus_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new queryUploadStatus_resultTupleSchemeFactory();
 
-    public TransferStatus success; // required
-    public TInvalidTokenException ex1; // required
+    public @org.apache.thrift.annotation.Nullable TransferStatus success; // required
+    public @org.apache.thrift.annotation.Nullable TInvalidTokenException ex1; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SUCCESS((short)0, "success"),
       EX1((short)1, "ex1");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -14046,6 +14613,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
@@ -14063,21 +14631,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -14086,20 +14655,20 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TransferStatus.class)));
       tmpMap.put(_Fields.EX1, new org.apache.thrift.meta_data.FieldMetaData("ex1", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvalidTokenException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(queryUploadStatus_result.class, metaDataMap);
     }
 
@@ -14137,11 +14706,12 @@ public class SatelliteServer {
       this.ex1 = null;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TransferStatus getSuccess() {
       return this.success;
     }
 
-    public queryUploadStatus_result setSuccess(TransferStatus success) {
+    public queryUploadStatus_result setSuccess(@org.apache.thrift.annotation.Nullable TransferStatus success) {
       this.success = success;
       return this;
     }
@@ -14161,11 +14731,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvalidTokenException getEx1() {
       return this.ex1;
     }
 
-    public queryUploadStatus_result setEx1(TInvalidTokenException ex1) {
+    public queryUploadStatus_result setEx1(@org.apache.thrift.annotation.Nullable TInvalidTokenException ex1) {
       this.ex1 = ex1;
       return this;
     }
@@ -14185,7 +14756,7 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
@@ -14206,7 +14777,8 @@ public class SatelliteServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
         return getSuccess();
@@ -14215,13 +14787,13 @@ public class SatelliteServer {
         return getEx1();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -14230,13 +14802,11 @@ public class SatelliteServer {
       case EX1:
         return isSetEx1();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof queryUploadStatus_result)
         return this.equals((queryUploadStatus_result)that);
       return false;
@@ -14245,6 +14815,8 @@ public class SatelliteServer {
     public boolean equals(queryUploadStatus_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_success = true && this.isSetSuccess();
       boolean that_present_success = true && that.isSetSuccess();
@@ -14269,19 +14841,17 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
 
-      boolean present_ex1 = true && (isSetEx1());
-      list.add(present_ex1);
-      if (present_ex1)
-        list.add(ex1);
+      hashCode = hashCode * 8191 + ((isSetEx1()) ? 131071 : 524287);
+      if (isSetEx1())
+        hashCode = hashCode * 8191 + ex1.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -14292,7 +14862,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -14302,7 +14872,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetEx1()).compareTo(other.isSetEx1());
+      lastComparison = java.lang.Boolean.compare(isSetEx1(), other.isSetEx1());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -14315,21 +14885,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("queryUploadStatus_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("queryUploadStatus_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -14367,7 +14938,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -14375,13 +14946,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class queryUploadStatus_resultStandardSchemeFactory implements SchemeFactory {
+    private static class queryUploadStatus_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public queryUploadStatus_resultStandardScheme getScheme() {
         return new queryUploadStatus_resultStandardScheme();
       }
     }
 
-    private static class queryUploadStatus_resultStandardScheme extends StandardScheme<queryUploadStatus_result> {
+    private static class queryUploadStatus_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<queryUploadStatus_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, queryUploadStatus_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -14442,18 +15013,18 @@ public class SatelliteServer {
 
     }
 
-    private static class queryUploadStatus_resultTupleSchemeFactory implements SchemeFactory {
+    private static class queryUploadStatus_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public queryUploadStatus_resultTupleScheme getScheme() {
         return new queryUploadStatus_resultTupleScheme();
       }
     }
 
-    private static class queryUploadStatus_resultTupleScheme extends TupleScheme<queryUploadStatus_result> {
+    private static class queryUploadStatus_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<queryUploadStatus_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, queryUploadStatus_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
           optionals.set(0);
         }
@@ -14471,8 +15042,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, queryUploadStatus_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(2);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           struct.success = new TransferStatus();
           struct.success.read(iprot);
@@ -14486,6 +15057,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class requestDownload_args implements org.apache.thrift.TBase<requestDownload_args, requestDownload_args._Fields>, java.io.Serializable, Cloneable, Comparable<requestDownload_args>   {
@@ -14494,24 +15068,21 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField USER_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("userToken", org.apache.thrift.protocol.TType.STRING, (short)1);
     private static final org.apache.thrift.protocol.TField IMAGE_VERSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("imageVersionId", org.apache.thrift.protocol.TType.STRING, (short)2);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new requestDownload_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new requestDownload_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new requestDownload_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new requestDownload_argsTupleSchemeFactory();
 
-    public String userToken; // required
-    public String imageVersionId; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String userToken; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String imageVersionId; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       USER_TOKEN((short)1, "userToken"),
       IMAGE_VERSION_ID((short)2, "imageVersionId");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -14519,6 +15090,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // USER_TOKEN
@@ -14536,21 +15108,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -14559,20 +15132,20 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.USER_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("userToken", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
       tmpMap.put(_Fields.IMAGE_VERSION_ID, new org.apache.thrift.meta_data.FieldMetaData("imageVersionId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "UUID")));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(requestDownload_args.class, metaDataMap);
     }
 
@@ -14580,8 +15153,8 @@ public class SatelliteServer {
     }
 
     public requestDownload_args(
-      String userToken,
-      String imageVersionId)
+      java.lang.String userToken,
+      java.lang.String imageVersionId)
     {
       this();
       this.userToken = userToken;
@@ -14610,11 +15183,12 @@ public class SatelliteServer {
       this.imageVersionId = null;
     }
 
-    public String getUserToken() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getUserToken() {
       return this.userToken;
     }
 
-    public requestDownload_args setUserToken(String userToken) {
+    public requestDownload_args setUserToken(@org.apache.thrift.annotation.Nullable java.lang.String userToken) {
       this.userToken = userToken;
       return this;
     }
@@ -14634,11 +15208,12 @@ public class SatelliteServer {
       }
     }
 
-    public String getImageVersionId() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getImageVersionId() {
       return this.imageVersionId;
     }
 
-    public requestDownload_args setImageVersionId(String imageVersionId) {
+    public requestDownload_args setImageVersionId(@org.apache.thrift.annotation.Nullable java.lang.String imageVersionId) {
       this.imageVersionId = imageVersionId;
       return this;
     }
@@ -14658,13 +15233,13 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case USER_TOKEN:
         if (value == null) {
           unsetUserToken();
         } else {
-          setUserToken((String)value);
+          setUserToken((java.lang.String)value);
         }
         break;
 
@@ -14672,14 +15247,15 @@ public class SatelliteServer {
         if (value == null) {
           unsetImageVersionId();
         } else {
-          setImageVersionId((String)value);
+          setImageVersionId((java.lang.String)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case USER_TOKEN:
         return getUserToken();
@@ -14688,13 +15264,13 @@ public class SatelliteServer {
         return getImageVersionId();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -14703,13 +15279,11 @@ public class SatelliteServer {
       case IMAGE_VERSION_ID:
         return isSetImageVersionId();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof requestDownload_args)
         return this.equals((requestDownload_args)that);
       return false;
@@ -14718,6 +15292,8 @@ public class SatelliteServer {
     public boolean equals(requestDownload_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_userToken = true && this.isSetUserToken();
       boolean that_present_userToken = true && that.isSetUserToken();
@@ -14742,19 +15318,17 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_userToken = true && (isSetUserToken());
-      list.add(present_userToken);
-      if (present_userToken)
-        list.add(userToken);
+      hashCode = hashCode * 8191 + ((isSetUserToken()) ? 131071 : 524287);
+      if (isSetUserToken())
+        hashCode = hashCode * 8191 + userToken.hashCode();
 
-      boolean present_imageVersionId = true && (isSetImageVersionId());
-      list.add(present_imageVersionId);
-      if (present_imageVersionId)
-        list.add(imageVersionId);
+      hashCode = hashCode * 8191 + ((isSetImageVersionId()) ? 131071 : 524287);
+      if (isSetImageVersionId())
+        hashCode = hashCode * 8191 + imageVersionId.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -14765,7 +15339,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetUserToken()).compareTo(other.isSetUserToken());
+      lastComparison = java.lang.Boolean.compare(isSetUserToken(), other.isSetUserToken());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -14775,7 +15349,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetImageVersionId()).compareTo(other.isSetImageVersionId());
+      lastComparison = java.lang.Boolean.compare(isSetImageVersionId(), other.isSetImageVersionId());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -14788,21 +15362,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("requestDownload_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("requestDownload_args(");
       boolean first = true;
 
       sb.append("userToken:");
@@ -14837,7 +15412,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -14845,13 +15420,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class requestDownload_argsStandardSchemeFactory implements SchemeFactory {
+    private static class requestDownload_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public requestDownload_argsStandardScheme getScheme() {
         return new requestDownload_argsStandardScheme();
       }
     }
 
-    private static class requestDownload_argsStandardScheme extends StandardScheme<requestDownload_args> {
+    private static class requestDownload_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<requestDownload_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, requestDownload_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -14910,18 +15485,18 @@ public class SatelliteServer {
 
     }
 
-    private static class requestDownload_argsTupleSchemeFactory implements SchemeFactory {
+    private static class requestDownload_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public requestDownload_argsTupleScheme getScheme() {
         return new requestDownload_argsTupleScheme();
       }
     }
 
-    private static class requestDownload_argsTupleScheme extends TupleScheme<requestDownload_args> {
+    private static class requestDownload_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<requestDownload_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, requestDownload_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetUserToken()) {
           optionals.set(0);
         }
@@ -14939,8 +15514,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, requestDownload_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(2);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           struct.userToken = iprot.readString();
           struct.setUserTokenIsSet(true);
@@ -14952,6 +15527,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class requestDownload_result implements org.apache.thrift.TBase<requestDownload_result, requestDownload_result._Fields>, java.io.Serializable, Cloneable, Comparable<requestDownload_result>   {
@@ -14963,17 +15541,14 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField FFFF_FIELD_DESC = new org.apache.thrift.protocol.TField("ffff", org.apache.thrift.protocol.TType.STRUCT, (short)3);
     private static final org.apache.thrift.protocol.TField SDF_FIELD_DESC = new org.apache.thrift.protocol.TField("sdf", org.apache.thrift.protocol.TType.STRUCT, (short)4);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new requestDownload_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new requestDownload_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new requestDownload_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new requestDownload_resultTupleSchemeFactory();
 
-    public TransferInformation success; // required
-    public TTransferRejectedException rejection; // required
-    public TAuthorizationException authError; // required
-    public TInvocationException ffff; // required
-    public TNotFoundException sdf; // required
+    public @org.apache.thrift.annotation.Nullable TransferInformation success; // required
+    public @org.apache.thrift.annotation.Nullable TTransferRejectedException rejection; // required
+    public @org.apache.thrift.annotation.Nullable TAuthorizationException authError; // required
+    public @org.apache.thrift.annotation.Nullable TInvocationException ffff; // required
+    public @org.apache.thrift.annotation.Nullable TNotFoundException sdf; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -14983,10 +15558,10 @@ public class SatelliteServer {
       FFFF((short)3, "ffff"),
       SDF((short)4, "sdf");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -14994,6 +15569,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
@@ -15017,21 +15593,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -15040,26 +15617,26 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TransferInformation.class)));
       tmpMap.put(_Fields.REJECTION, new org.apache.thrift.meta_data.FieldMetaData("rejection", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TTransferRejectedException.class)));
       tmpMap.put(_Fields.AUTH_ERROR, new org.apache.thrift.meta_data.FieldMetaData("authError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class)));
       tmpMap.put(_Fields.FFFF, new org.apache.thrift.meta_data.FieldMetaData("ffff", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class)));
       tmpMap.put(_Fields.SDF, new org.apache.thrift.meta_data.FieldMetaData("sdf", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TNotFoundException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(requestDownload_result.class, metaDataMap);
     }
 
@@ -15115,11 +15692,12 @@ public class SatelliteServer {
       this.sdf = null;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TransferInformation getSuccess() {
       return this.success;
     }
 
-    public requestDownload_result setSuccess(TransferInformation success) {
+    public requestDownload_result setSuccess(@org.apache.thrift.annotation.Nullable TransferInformation success) {
       this.success = success;
       return this;
     }
@@ -15139,11 +15717,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TTransferRejectedException getRejection() {
       return this.rejection;
     }
 
-    public requestDownload_result setRejection(TTransferRejectedException rejection) {
+    public requestDownload_result setRejection(@org.apache.thrift.annotation.Nullable TTransferRejectedException rejection) {
       this.rejection = rejection;
       return this;
     }
@@ -15163,11 +15742,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TAuthorizationException getAuthError() {
       return this.authError;
     }
 
-    public requestDownload_result setAuthError(TAuthorizationException authError) {
+    public requestDownload_result setAuthError(@org.apache.thrift.annotation.Nullable TAuthorizationException authError) {
       this.authError = authError;
       return this;
     }
@@ -15187,11 +15767,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvocationException getFfff() {
       return this.ffff;
     }
 
-    public requestDownload_result setFfff(TInvocationException ffff) {
+    public requestDownload_result setFfff(@org.apache.thrift.annotation.Nullable TInvocationException ffff) {
       this.ffff = ffff;
       return this;
     }
@@ -15211,11 +15792,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TNotFoundException getSdf() {
       return this.sdf;
     }
 
-    public requestDownload_result setSdf(TNotFoundException sdf) {
+    public requestDownload_result setSdf(@org.apache.thrift.annotation.Nullable TNotFoundException sdf) {
       this.sdf = sdf;
       return this;
     }
@@ -15235,7 +15817,7 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
@@ -15280,7 +15862,8 @@ public class SatelliteServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
         return getSuccess();
@@ -15298,13 +15881,13 @@ public class SatelliteServer {
         return getSdf();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -15319,13 +15902,11 @@ public class SatelliteServer {
       case SDF:
         return isSetSdf();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof requestDownload_result)
         return this.equals((requestDownload_result)that);
       return false;
@@ -15334,6 +15915,8 @@ public class SatelliteServer {
     public boolean equals(requestDownload_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_success = true && this.isSetSuccess();
       boolean that_present_success = true && that.isSetSuccess();
@@ -15385,34 +15968,29 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
 
-      boolean present_rejection = true && (isSetRejection());
-      list.add(present_rejection);
-      if (present_rejection)
-        list.add(rejection);
+      hashCode = hashCode * 8191 + ((isSetRejection()) ? 131071 : 524287);
+      if (isSetRejection())
+        hashCode = hashCode * 8191 + rejection.hashCode();
 
-      boolean present_authError = true && (isSetAuthError());
-      list.add(present_authError);
-      if (present_authError)
-        list.add(authError);
+      hashCode = hashCode * 8191 + ((isSetAuthError()) ? 131071 : 524287);
+      if (isSetAuthError())
+        hashCode = hashCode * 8191 + authError.hashCode();
 
-      boolean present_ffff = true && (isSetFfff());
-      list.add(present_ffff);
-      if (present_ffff)
-        list.add(ffff);
+      hashCode = hashCode * 8191 + ((isSetFfff()) ? 131071 : 524287);
+      if (isSetFfff())
+        hashCode = hashCode * 8191 + ffff.hashCode();
 
-      boolean present_sdf = true && (isSetSdf());
-      list.add(present_sdf);
-      if (present_sdf)
-        list.add(sdf);
+      hashCode = hashCode * 8191 + ((isSetSdf()) ? 131071 : 524287);
+      if (isSetSdf())
+        hashCode = hashCode * 8191 + sdf.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -15423,7 +16001,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -15433,7 +16011,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetRejection()).compareTo(other.isSetRejection());
+      lastComparison = java.lang.Boolean.compare(isSetRejection(), other.isSetRejection());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -15443,7 +16021,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetAuthError()).compareTo(other.isSetAuthError());
+      lastComparison = java.lang.Boolean.compare(isSetAuthError(), other.isSetAuthError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -15453,7 +16031,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFfff()).compareTo(other.isSetFfff());
+      lastComparison = java.lang.Boolean.compare(isSetFfff(), other.isSetFfff());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -15463,7 +16041,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetSdf()).compareTo(other.isSetSdf());
+      lastComparison = java.lang.Boolean.compare(isSetSdf(), other.isSetSdf());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -15476,21 +16054,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("requestDownload_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("requestDownload_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -15552,7 +16131,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -15560,13 +16139,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class requestDownload_resultStandardSchemeFactory implements SchemeFactory {
+    private static class requestDownload_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public requestDownload_resultStandardScheme getScheme() {
         return new requestDownload_resultStandardScheme();
       }
     }
 
-    private static class requestDownload_resultStandardScheme extends StandardScheme<requestDownload_result> {
+    private static class requestDownload_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<requestDownload_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, requestDownload_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -15669,18 +16248,18 @@ public class SatelliteServer {
 
     }
 
-    private static class requestDownload_resultTupleSchemeFactory implements SchemeFactory {
+    private static class requestDownload_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public requestDownload_resultTupleScheme getScheme() {
         return new requestDownload_resultTupleScheme();
       }
     }
 
-    private static class requestDownload_resultTupleScheme extends TupleScheme<requestDownload_result> {
+    private static class requestDownload_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<requestDownload_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, requestDownload_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
           optionals.set(0);
         }
@@ -15716,8 +16295,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, requestDownload_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(5);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(5);
         if (incoming.get(0)) {
           struct.success = new TransferInformation();
           struct.success.read(iprot);
@@ -15746,6 +16325,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class cancelDownload_args implements org.apache.thrift.TBase<cancelDownload_args, cancelDownload_args._Fields>, java.io.Serializable, Cloneable, Comparable<cancelDownload_args>   {
@@ -15753,22 +16335,19 @@ public class SatelliteServer {
 
     private static final org.apache.thrift.protocol.TField DOWNLOAD_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("downloadToken", org.apache.thrift.protocol.TType.STRING, (short)1);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new cancelDownload_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new cancelDownload_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new cancelDownload_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new cancelDownload_argsTupleSchemeFactory();
 
-    public String downloadToken; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String downloadToken; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       DOWNLOAD_TOKEN((short)1, "downloadToken");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -15776,6 +16355,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // DOWNLOAD_TOKEN
@@ -15791,21 +16371,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -15814,18 +16395,18 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.DOWNLOAD_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("downloadToken", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(cancelDownload_args.class, metaDataMap);
     }
 
@@ -15833,7 +16414,7 @@ public class SatelliteServer {
     }
 
     public cancelDownload_args(
-      String downloadToken)
+      java.lang.String downloadToken)
     {
       this();
       this.downloadToken = downloadToken;
@@ -15857,11 +16438,12 @@ public class SatelliteServer {
       this.downloadToken = null;
     }
 
-    public String getDownloadToken() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getDownloadToken() {
       return this.downloadToken;
     }
 
-    public cancelDownload_args setDownloadToken(String downloadToken) {
+    public cancelDownload_args setDownloadToken(@org.apache.thrift.annotation.Nullable java.lang.String downloadToken) {
       this.downloadToken = downloadToken;
       return this;
     }
@@ -15881,45 +16463,44 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case DOWNLOAD_TOKEN:
         if (value == null) {
           unsetDownloadToken();
         } else {
-          setDownloadToken((String)value);
+          setDownloadToken((java.lang.String)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case DOWNLOAD_TOKEN:
         return getDownloadToken();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
       case DOWNLOAD_TOKEN:
         return isSetDownloadToken();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof cancelDownload_args)
         return this.equals((cancelDownload_args)that);
       return false;
@@ -15928,6 +16509,8 @@ public class SatelliteServer {
     public boolean equals(cancelDownload_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_downloadToken = true && this.isSetDownloadToken();
       boolean that_present_downloadToken = true && that.isSetDownloadToken();
@@ -15943,14 +16526,13 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_downloadToken = true && (isSetDownloadToken());
-      list.add(present_downloadToken);
-      if (present_downloadToken)
-        list.add(downloadToken);
+      hashCode = hashCode * 8191 + ((isSetDownloadToken()) ? 131071 : 524287);
+      if (isSetDownloadToken())
+        hashCode = hashCode * 8191 + downloadToken.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -15961,7 +16543,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetDownloadToken()).compareTo(other.isSetDownloadToken());
+      lastComparison = java.lang.Boolean.compare(isSetDownloadToken(), other.isSetDownloadToken());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -15974,21 +16556,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("cancelDownload_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("cancelDownload_args(");
       boolean first = true;
 
       sb.append("downloadToken:");
@@ -16015,7 +16598,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -16023,13 +16606,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class cancelDownload_argsStandardSchemeFactory implements SchemeFactory {
+    private static class cancelDownload_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public cancelDownload_argsStandardScheme getScheme() {
         return new cancelDownload_argsStandardScheme();
       }
     }
 
-    private static class cancelDownload_argsStandardScheme extends StandardScheme<cancelDownload_args> {
+    private static class cancelDownload_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<cancelDownload_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, cancelDownload_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -16075,18 +16658,18 @@ public class SatelliteServer {
 
     }
 
-    private static class cancelDownload_argsTupleSchemeFactory implements SchemeFactory {
+    private static class cancelDownload_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public cancelDownload_argsTupleScheme getScheme() {
         return new cancelDownload_argsTupleScheme();
       }
     }
 
-    private static class cancelDownload_argsTupleScheme extends TupleScheme<cancelDownload_args> {
+    private static class cancelDownload_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<cancelDownload_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, cancelDownload_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetDownloadToken()) {
           optionals.set(0);
         }
@@ -16098,8 +16681,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, cancelDownload_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(1);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
           struct.downloadToken = iprot.readString();
           struct.setDownloadTokenIsSet(true);
@@ -16107,6 +16690,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class cancelDownload_result implements org.apache.thrift.TBase<cancelDownload_result, cancelDownload_result._Fields>, java.io.Serializable, Cloneable, Comparable<cancelDownload_result>   {
@@ -16114,22 +16700,19 @@ public class SatelliteServer {
 
     private static final org.apache.thrift.protocol.TField EX1_FIELD_DESC = new org.apache.thrift.protocol.TField("ex1", org.apache.thrift.protocol.TType.STRUCT, (short)1);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new cancelDownload_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new cancelDownload_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new cancelDownload_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new cancelDownload_resultTupleSchemeFactory();
 
-    public TInvalidTokenException ex1; // required
+    public @org.apache.thrift.annotation.Nullable TInvalidTokenException ex1; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       EX1((short)1, "ex1");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -16137,6 +16720,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // EX1
@@ -16152,21 +16736,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -16175,18 +16760,18 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.EX1, new org.apache.thrift.meta_data.FieldMetaData("ex1", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvalidTokenException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(cancelDownload_result.class, metaDataMap);
     }
 
@@ -16218,11 +16803,12 @@ public class SatelliteServer {
       this.ex1 = null;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvalidTokenException getEx1() {
       return this.ex1;
     }
 
-    public cancelDownload_result setEx1(TInvalidTokenException ex1) {
+    public cancelDownload_result setEx1(@org.apache.thrift.annotation.Nullable TInvalidTokenException ex1) {
       this.ex1 = ex1;
       return this;
     }
@@ -16242,7 +16828,7 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case EX1:
         if (value == null) {
@@ -16255,32 +16841,31 @@ public class SatelliteServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case EX1:
         return getEx1();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
       case EX1:
         return isSetEx1();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof cancelDownload_result)
         return this.equals((cancelDownload_result)that);
       return false;
@@ -16289,6 +16874,8 @@ public class SatelliteServer {
     public boolean equals(cancelDownload_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_ex1 = true && this.isSetEx1();
       boolean that_present_ex1 = true && that.isSetEx1();
@@ -16304,14 +16891,13 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_ex1 = true && (isSetEx1());
-      list.add(present_ex1);
-      if (present_ex1)
-        list.add(ex1);
+      hashCode = hashCode * 8191 + ((isSetEx1()) ? 131071 : 524287);
+      if (isSetEx1())
+        hashCode = hashCode * 8191 + ex1.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -16322,7 +16908,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetEx1()).compareTo(other.isSetEx1());
+      lastComparison = java.lang.Boolean.compare(isSetEx1(), other.isSetEx1());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -16335,21 +16921,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("cancelDownload_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("cancelDownload_result(");
       boolean first = true;
 
       sb.append("ex1:");
@@ -16376,7 +16963,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -16384,13 +16971,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class cancelDownload_resultStandardSchemeFactory implements SchemeFactory {
+    private static class cancelDownload_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public cancelDownload_resultStandardScheme getScheme() {
         return new cancelDownload_resultStandardScheme();
       }
     }
 
-    private static class cancelDownload_resultStandardScheme extends StandardScheme<cancelDownload_result> {
+    private static class cancelDownload_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<cancelDownload_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, cancelDownload_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -16437,18 +17024,18 @@ public class SatelliteServer {
 
     }
 
-    private static class cancelDownload_resultTupleSchemeFactory implements SchemeFactory {
+    private static class cancelDownload_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public cancelDownload_resultTupleScheme getScheme() {
         return new cancelDownload_resultTupleScheme();
       }
     }
 
-    private static class cancelDownload_resultTupleScheme extends TupleScheme<cancelDownload_result> {
+    private static class cancelDownload_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<cancelDownload_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, cancelDownload_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetEx1()) {
           optionals.set(0);
         }
@@ -16460,8 +17047,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, cancelDownload_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(1);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
           struct.ex1 = new TInvalidTokenException();
           struct.ex1.read(iprot);
@@ -16470,6 +17057,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class isAuthenticated_args implements org.apache.thrift.TBase<isAuthenticated_args, isAuthenticated_args._Fields>, java.io.Serializable, Cloneable, Comparable<isAuthenticated_args>   {
@@ -16477,22 +17067,19 @@ public class SatelliteServer {
 
     private static final org.apache.thrift.protocol.TField USER_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("userToken", org.apache.thrift.protocol.TType.STRING, (short)1);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new isAuthenticated_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new isAuthenticated_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new isAuthenticated_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new isAuthenticated_argsTupleSchemeFactory();
 
-    public String userToken; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String userToken; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       USER_TOKEN((short)1, "userToken");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -16500,6 +17087,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // USER_TOKEN
@@ -16515,21 +17103,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -16538,18 +17127,18 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.USER_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("userToken", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(isAuthenticated_args.class, metaDataMap);
     }
 
@@ -16557,7 +17146,7 @@ public class SatelliteServer {
     }
 
     public isAuthenticated_args(
-      String userToken)
+      java.lang.String userToken)
     {
       this();
       this.userToken = userToken;
@@ -16581,11 +17170,12 @@ public class SatelliteServer {
       this.userToken = null;
     }
 
-    public String getUserToken() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getUserToken() {
       return this.userToken;
     }
 
-    public isAuthenticated_args setUserToken(String userToken) {
+    public isAuthenticated_args setUserToken(@org.apache.thrift.annotation.Nullable java.lang.String userToken) {
       this.userToken = userToken;
       return this;
     }
@@ -16605,45 +17195,44 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case USER_TOKEN:
         if (value == null) {
           unsetUserToken();
         } else {
-          setUserToken((String)value);
+          setUserToken((java.lang.String)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case USER_TOKEN:
         return getUserToken();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
       case USER_TOKEN:
         return isSetUserToken();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof isAuthenticated_args)
         return this.equals((isAuthenticated_args)that);
       return false;
@@ -16652,6 +17241,8 @@ public class SatelliteServer {
     public boolean equals(isAuthenticated_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_userToken = true && this.isSetUserToken();
       boolean that_present_userToken = true && that.isSetUserToken();
@@ -16667,14 +17258,13 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_userToken = true && (isSetUserToken());
-      list.add(present_userToken);
-      if (present_userToken)
-        list.add(userToken);
+      hashCode = hashCode * 8191 + ((isSetUserToken()) ? 131071 : 524287);
+      if (isSetUserToken())
+        hashCode = hashCode * 8191 + userToken.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -16685,7 +17275,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetUserToken()).compareTo(other.isSetUserToken());
+      lastComparison = java.lang.Boolean.compare(isSetUserToken(), other.isSetUserToken());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -16698,21 +17288,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("isAuthenticated_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("isAuthenticated_args(");
       boolean first = true;
 
       sb.append("userToken:");
@@ -16739,7 +17330,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -16747,13 +17338,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class isAuthenticated_argsStandardSchemeFactory implements SchemeFactory {
+    private static class isAuthenticated_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public isAuthenticated_argsStandardScheme getScheme() {
         return new isAuthenticated_argsStandardScheme();
       }
     }
 
-    private static class isAuthenticated_argsStandardScheme extends StandardScheme<isAuthenticated_args> {
+    private static class isAuthenticated_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<isAuthenticated_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, isAuthenticated_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -16799,18 +17390,18 @@ public class SatelliteServer {
 
     }
 
-    private static class isAuthenticated_argsTupleSchemeFactory implements SchemeFactory {
+    private static class isAuthenticated_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public isAuthenticated_argsTupleScheme getScheme() {
         return new isAuthenticated_argsTupleScheme();
       }
     }
 
-    private static class isAuthenticated_argsTupleScheme extends TupleScheme<isAuthenticated_args> {
+    private static class isAuthenticated_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<isAuthenticated_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, isAuthenticated_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetUserToken()) {
           optionals.set(0);
         }
@@ -16822,8 +17413,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, isAuthenticated_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(1);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
           struct.userToken = iprot.readString();
           struct.setUserTokenIsSet(true);
@@ -16831,6 +17422,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class isAuthenticated_result implements org.apache.thrift.TBase<isAuthenticated_result, isAuthenticated_result._Fields>, java.io.Serializable, Cloneable, Comparable<isAuthenticated_result>   {
@@ -16839,24 +17433,21 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField AUTH_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("authError", org.apache.thrift.protocol.TType.STRUCT, (short)1);
     private static final org.apache.thrift.protocol.TField SERVER_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("serverError", org.apache.thrift.protocol.TType.STRUCT, (short)2);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new isAuthenticated_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new isAuthenticated_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new isAuthenticated_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new isAuthenticated_resultTupleSchemeFactory();
 
-    public TAuthorizationException authError; // required
-    public TInvocationException serverError; // required
+    public @org.apache.thrift.annotation.Nullable TAuthorizationException authError; // required
+    public @org.apache.thrift.annotation.Nullable TInvocationException serverError; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       AUTH_ERROR((short)1, "authError"),
       SERVER_ERROR((short)2, "serverError");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -16864,6 +17455,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // AUTH_ERROR
@@ -16881,21 +17473,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -16904,20 +17497,20 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.AUTH_ERROR, new org.apache.thrift.meta_data.FieldMetaData("authError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class)));
       tmpMap.put(_Fields.SERVER_ERROR, new org.apache.thrift.meta_data.FieldMetaData("serverError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(isAuthenticated_result.class, metaDataMap);
     }
 
@@ -16955,11 +17548,12 @@ public class SatelliteServer {
       this.serverError = null;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TAuthorizationException getAuthError() {
       return this.authError;
     }
 
-    public isAuthenticated_result setAuthError(TAuthorizationException authError) {
+    public isAuthenticated_result setAuthError(@org.apache.thrift.annotation.Nullable TAuthorizationException authError) {
       this.authError = authError;
       return this;
     }
@@ -16979,11 +17573,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvocationException getServerError() {
       return this.serverError;
     }
 
-    public isAuthenticated_result setServerError(TInvocationException serverError) {
+    public isAuthenticated_result setServerError(@org.apache.thrift.annotation.Nullable TInvocationException serverError) {
       this.serverError = serverError;
       return this;
     }
@@ -17003,7 +17598,7 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case AUTH_ERROR:
         if (value == null) {
@@ -17024,7 +17619,8 @@ public class SatelliteServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case AUTH_ERROR:
         return getAuthError();
@@ -17033,13 +17629,13 @@ public class SatelliteServer {
         return getServerError();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -17048,13 +17644,11 @@ public class SatelliteServer {
       case SERVER_ERROR:
         return isSetServerError();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof isAuthenticated_result)
         return this.equals((isAuthenticated_result)that);
       return false;
@@ -17063,6 +17657,8 @@ public class SatelliteServer {
     public boolean equals(isAuthenticated_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_authError = true && this.isSetAuthError();
       boolean that_present_authError = true && that.isSetAuthError();
@@ -17087,19 +17683,17 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_authError = true && (isSetAuthError());
-      list.add(present_authError);
-      if (present_authError)
-        list.add(authError);
+      hashCode = hashCode * 8191 + ((isSetAuthError()) ? 131071 : 524287);
+      if (isSetAuthError())
+        hashCode = hashCode * 8191 + authError.hashCode();
 
-      boolean present_serverError = true && (isSetServerError());
-      list.add(present_serverError);
-      if (present_serverError)
-        list.add(serverError);
+      hashCode = hashCode * 8191 + ((isSetServerError()) ? 131071 : 524287);
+      if (isSetServerError())
+        hashCode = hashCode * 8191 + serverError.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -17110,7 +17704,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetAuthError()).compareTo(other.isSetAuthError());
+      lastComparison = java.lang.Boolean.compare(isSetAuthError(), other.isSetAuthError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -17120,7 +17714,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetServerError()).compareTo(other.isSetServerError());
+      lastComparison = java.lang.Boolean.compare(isSetServerError(), other.isSetServerError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -17133,21 +17727,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("isAuthenticated_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("isAuthenticated_result(");
       boolean first = true;
 
       sb.append("authError:");
@@ -17182,7 +17777,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -17190,13 +17785,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class isAuthenticated_resultStandardSchemeFactory implements SchemeFactory {
+    private static class isAuthenticated_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public isAuthenticated_resultStandardScheme getScheme() {
         return new isAuthenticated_resultStandardScheme();
       }
     }
 
-    private static class isAuthenticated_resultStandardScheme extends StandardScheme<isAuthenticated_result> {
+    private static class isAuthenticated_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<isAuthenticated_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, isAuthenticated_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -17257,18 +17852,18 @@ public class SatelliteServer {
 
     }
 
-    private static class isAuthenticated_resultTupleSchemeFactory implements SchemeFactory {
+    private static class isAuthenticated_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public isAuthenticated_resultTupleScheme getScheme() {
         return new isAuthenticated_resultTupleScheme();
       }
     }
 
-    private static class isAuthenticated_resultTupleScheme extends TupleScheme<isAuthenticated_result> {
+    private static class isAuthenticated_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<isAuthenticated_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, isAuthenticated_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetAuthError()) {
           optionals.set(0);
         }
@@ -17286,8 +17881,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, isAuthenticated_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(2);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           struct.authError = new TAuthorizationException();
           struct.authError.read(iprot);
@@ -17301,6 +17896,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class whoami_args implements org.apache.thrift.TBase<whoami_args, whoami_args._Fields>, java.io.Serializable, Cloneable, Comparable<whoami_args>   {
@@ -17308,22 +17906,19 @@ public class SatelliteServer {
 
     private static final org.apache.thrift.protocol.TField USER_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("userToken", org.apache.thrift.protocol.TType.STRING, (short)1);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new whoami_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new whoami_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new whoami_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new whoami_argsTupleSchemeFactory();
 
-    public String userToken; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String userToken; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       USER_TOKEN((short)1, "userToken");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -17331,6 +17926,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // USER_TOKEN
@@ -17346,21 +17942,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -17369,18 +17966,18 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.USER_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("userToken", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(whoami_args.class, metaDataMap);
     }
 
@@ -17388,7 +17985,7 @@ public class SatelliteServer {
     }
 
     public whoami_args(
-      String userToken)
+      java.lang.String userToken)
     {
       this();
       this.userToken = userToken;
@@ -17412,11 +18009,12 @@ public class SatelliteServer {
       this.userToken = null;
     }
 
-    public String getUserToken() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getUserToken() {
       return this.userToken;
     }
 
-    public whoami_args setUserToken(String userToken) {
+    public whoami_args setUserToken(@org.apache.thrift.annotation.Nullable java.lang.String userToken) {
       this.userToken = userToken;
       return this;
     }
@@ -17436,45 +18034,44 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case USER_TOKEN:
         if (value == null) {
           unsetUserToken();
         } else {
-          setUserToken((String)value);
+          setUserToken((java.lang.String)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case USER_TOKEN:
         return getUserToken();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
       case USER_TOKEN:
         return isSetUserToken();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof whoami_args)
         return this.equals((whoami_args)that);
       return false;
@@ -17483,6 +18080,8 @@ public class SatelliteServer {
     public boolean equals(whoami_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_userToken = true && this.isSetUserToken();
       boolean that_present_userToken = true && that.isSetUserToken();
@@ -17498,14 +18097,13 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_userToken = true && (isSetUserToken());
-      list.add(present_userToken);
-      if (present_userToken)
-        list.add(userToken);
+      hashCode = hashCode * 8191 + ((isSetUserToken()) ? 131071 : 524287);
+      if (isSetUserToken())
+        hashCode = hashCode * 8191 + userToken.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -17516,7 +18114,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetUserToken()).compareTo(other.isSetUserToken());
+      lastComparison = java.lang.Boolean.compare(isSetUserToken(), other.isSetUserToken());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -17529,21 +18127,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("whoami_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("whoami_args(");
       boolean first = true;
 
       sb.append("userToken:");
@@ -17570,7 +18169,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -17578,13 +18177,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class whoami_argsStandardSchemeFactory implements SchemeFactory {
+    private static class whoami_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public whoami_argsStandardScheme getScheme() {
         return new whoami_argsStandardScheme();
       }
     }
 
-    private static class whoami_argsStandardScheme extends StandardScheme<whoami_args> {
+    private static class whoami_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<whoami_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, whoami_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -17630,18 +18229,18 @@ public class SatelliteServer {
 
     }
 
-    private static class whoami_argsTupleSchemeFactory implements SchemeFactory {
+    private static class whoami_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public whoami_argsTupleScheme getScheme() {
         return new whoami_argsTupleScheme();
       }
     }
 
-    private static class whoami_argsTupleScheme extends TupleScheme<whoami_args> {
+    private static class whoami_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<whoami_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, whoami_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetUserToken()) {
           optionals.set(0);
         }
@@ -17653,8 +18252,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, whoami_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(1);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
           struct.userToken = iprot.readString();
           struct.setUserTokenIsSet(true);
@@ -17662,6 +18261,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class whoami_result implements org.apache.thrift.TBase<whoami_result, whoami_result._Fields>, java.io.Serializable, Cloneable, Comparable<whoami_result>   {
@@ -17671,15 +18273,12 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField AUTH_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("authError", org.apache.thrift.protocol.TType.STRUCT, (short)1);
     private static final org.apache.thrift.protocol.TField SERVER_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("serverError", org.apache.thrift.protocol.TType.STRUCT, (short)2);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new whoami_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new whoami_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new whoami_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new whoami_resultTupleSchemeFactory();
 
-    public WhoamiInfo success; // required
-    public TAuthorizationException authError; // required
-    public TInvocationException serverError; // required
+    public @org.apache.thrift.annotation.Nullable WhoamiInfo success; // required
+    public @org.apache.thrift.annotation.Nullable TAuthorizationException authError; // required
+    public @org.apache.thrift.annotation.Nullable TInvocationException serverError; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -17687,10 +18286,10 @@ public class SatelliteServer {
       AUTH_ERROR((short)1, "authError"),
       SERVER_ERROR((short)2, "serverError");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -17698,6 +18297,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
@@ -17717,21 +18317,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -17740,22 +18341,22 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, WhoamiInfo.class)));
       tmpMap.put(_Fields.AUTH_ERROR, new org.apache.thrift.meta_data.FieldMetaData("authError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class)));
       tmpMap.put(_Fields.SERVER_ERROR, new org.apache.thrift.meta_data.FieldMetaData("serverError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(whoami_result.class, metaDataMap);
     }
 
@@ -17799,11 +18400,12 @@ public class SatelliteServer {
       this.serverError = null;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public WhoamiInfo getSuccess() {
       return this.success;
     }
 
-    public whoami_result setSuccess(WhoamiInfo success) {
+    public whoami_result setSuccess(@org.apache.thrift.annotation.Nullable WhoamiInfo success) {
       this.success = success;
       return this;
     }
@@ -17823,11 +18425,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TAuthorizationException getAuthError() {
       return this.authError;
     }
 
-    public whoami_result setAuthError(TAuthorizationException authError) {
+    public whoami_result setAuthError(@org.apache.thrift.annotation.Nullable TAuthorizationException authError) {
       this.authError = authError;
       return this;
     }
@@ -17847,11 +18450,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvocationException getServerError() {
       return this.serverError;
     }
 
-    public whoami_result setServerError(TInvocationException serverError) {
+    public whoami_result setServerError(@org.apache.thrift.annotation.Nullable TInvocationException serverError) {
       this.serverError = serverError;
       return this;
     }
@@ -17871,7 +18475,7 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
@@ -17900,7 +18504,8 @@ public class SatelliteServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
         return getSuccess();
@@ -17912,13 +18517,13 @@ public class SatelliteServer {
         return getServerError();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -17929,13 +18534,11 @@ public class SatelliteServer {
       case SERVER_ERROR:
         return isSetServerError();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof whoami_result)
         return this.equals((whoami_result)that);
       return false;
@@ -17944,6 +18547,8 @@ public class SatelliteServer {
     public boolean equals(whoami_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_success = true && this.isSetSuccess();
       boolean that_present_success = true && that.isSetSuccess();
@@ -17977,24 +18582,21 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
 
-      boolean present_authError = true && (isSetAuthError());
-      list.add(present_authError);
-      if (present_authError)
-        list.add(authError);
+      hashCode = hashCode * 8191 + ((isSetAuthError()) ? 131071 : 524287);
+      if (isSetAuthError())
+        hashCode = hashCode * 8191 + authError.hashCode();
 
-      boolean present_serverError = true && (isSetServerError());
-      list.add(present_serverError);
-      if (present_serverError)
-        list.add(serverError);
+      hashCode = hashCode * 8191 + ((isSetServerError()) ? 131071 : 524287);
+      if (isSetServerError())
+        hashCode = hashCode * 8191 + serverError.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -18005,7 +18607,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -18015,7 +18617,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetAuthError()).compareTo(other.isSetAuthError());
+      lastComparison = java.lang.Boolean.compare(isSetAuthError(), other.isSetAuthError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -18025,7 +18627,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetServerError()).compareTo(other.isSetServerError());
+      lastComparison = java.lang.Boolean.compare(isSetServerError(), other.isSetServerError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -18038,21 +18640,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("whoami_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("whoami_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -18098,7 +18701,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -18106,13 +18709,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class whoami_resultStandardSchemeFactory implements SchemeFactory {
+    private static class whoami_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public whoami_resultStandardScheme getScheme() {
         return new whoami_resultStandardScheme();
       }
     }
 
-    private static class whoami_resultStandardScheme extends StandardScheme<whoami_result> {
+    private static class whoami_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<whoami_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, whoami_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -18187,18 +18790,18 @@ public class SatelliteServer {
 
     }
 
-    private static class whoami_resultTupleSchemeFactory implements SchemeFactory {
+    private static class whoami_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public whoami_resultTupleScheme getScheme() {
         return new whoami_resultTupleScheme();
       }
     }
 
-    private static class whoami_resultTupleScheme extends TupleScheme<whoami_result> {
+    private static class whoami_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<whoami_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, whoami_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
           optionals.set(0);
         }
@@ -18222,8 +18825,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, whoami_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(3);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           struct.success = new WhoamiInfo();
           struct.success.read(iprot);
@@ -18242,6 +18845,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class invalidateSession_args implements org.apache.thrift.TBase<invalidateSession_args, invalidateSession_args._Fields>, java.io.Serializable, Cloneable, Comparable<invalidateSession_args>   {
@@ -18249,22 +18855,19 @@ public class SatelliteServer {
 
     private static final org.apache.thrift.protocol.TField USER_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("userToken", org.apache.thrift.protocol.TType.STRING, (short)1);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new invalidateSession_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new invalidateSession_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new invalidateSession_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new invalidateSession_argsTupleSchemeFactory();
 
-    public String userToken; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String userToken; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       USER_TOKEN((short)1, "userToken");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -18272,6 +18875,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // USER_TOKEN
@@ -18287,21 +18891,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -18310,18 +18915,18 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.USER_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("userToken", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(invalidateSession_args.class, metaDataMap);
     }
 
@@ -18329,7 +18934,7 @@ public class SatelliteServer {
     }
 
     public invalidateSession_args(
-      String userToken)
+      java.lang.String userToken)
     {
       this();
       this.userToken = userToken;
@@ -18353,11 +18958,12 @@ public class SatelliteServer {
       this.userToken = null;
     }
 
-    public String getUserToken() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getUserToken() {
       return this.userToken;
     }
 
-    public invalidateSession_args setUserToken(String userToken) {
+    public invalidateSession_args setUserToken(@org.apache.thrift.annotation.Nullable java.lang.String userToken) {
       this.userToken = userToken;
       return this;
     }
@@ -18377,45 +18983,44 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case USER_TOKEN:
         if (value == null) {
           unsetUserToken();
         } else {
-          setUserToken((String)value);
+          setUserToken((java.lang.String)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case USER_TOKEN:
         return getUserToken();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
       case USER_TOKEN:
         return isSetUserToken();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof invalidateSession_args)
         return this.equals((invalidateSession_args)that);
       return false;
@@ -18424,6 +19029,8 @@ public class SatelliteServer {
     public boolean equals(invalidateSession_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_userToken = true && this.isSetUserToken();
       boolean that_present_userToken = true && that.isSetUserToken();
@@ -18439,14 +19046,13 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_userToken = true && (isSetUserToken());
-      list.add(present_userToken);
-      if (present_userToken)
-        list.add(userToken);
+      hashCode = hashCode * 8191 + ((isSetUserToken()) ? 131071 : 524287);
+      if (isSetUserToken())
+        hashCode = hashCode * 8191 + userToken.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -18457,7 +19063,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetUserToken()).compareTo(other.isSetUserToken());
+      lastComparison = java.lang.Boolean.compare(isSetUserToken(), other.isSetUserToken());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -18470,21 +19076,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("invalidateSession_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("invalidateSession_args(");
       boolean first = true;
 
       sb.append("userToken:");
@@ -18511,7 +19118,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -18519,13 +19126,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class invalidateSession_argsStandardSchemeFactory implements SchemeFactory {
+    private static class invalidateSession_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public invalidateSession_argsStandardScheme getScheme() {
         return new invalidateSession_argsStandardScheme();
       }
     }
 
-    private static class invalidateSession_argsStandardScheme extends StandardScheme<invalidateSession_args> {
+    private static class invalidateSession_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<invalidateSession_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, invalidateSession_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -18571,18 +19178,18 @@ public class SatelliteServer {
 
     }
 
-    private static class invalidateSession_argsTupleSchemeFactory implements SchemeFactory {
+    private static class invalidateSession_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public invalidateSession_argsTupleScheme getScheme() {
         return new invalidateSession_argsTupleScheme();
       }
     }
 
-    private static class invalidateSession_argsTupleScheme extends TupleScheme<invalidateSession_args> {
+    private static class invalidateSession_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<invalidateSession_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, invalidateSession_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetUserToken()) {
           optionals.set(0);
         }
@@ -18594,8 +19201,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, invalidateSession_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(1);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
           struct.userToken = iprot.readString();
           struct.setUserTokenIsSet(true);
@@ -18603,6 +19210,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class invalidateSession_result implements org.apache.thrift.TBase<invalidateSession_result, invalidateSession_result._Fields>, java.io.Serializable, Cloneable, Comparable<invalidateSession_result>   {
@@ -18610,22 +19220,19 @@ public class SatelliteServer {
 
     private static final org.apache.thrift.protocol.TField EX_FIELD_DESC = new org.apache.thrift.protocol.TField("ex", org.apache.thrift.protocol.TType.STRUCT, (short)1);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new invalidateSession_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new invalidateSession_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new invalidateSession_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new invalidateSession_resultTupleSchemeFactory();
 
-    public TInvalidTokenException ex; // required
+    public @org.apache.thrift.annotation.Nullable TInvalidTokenException ex; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       EX((short)1, "ex");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -18633,6 +19240,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // EX
@@ -18648,21 +19256,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -18671,18 +19280,18 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.EX, new org.apache.thrift.meta_data.FieldMetaData("ex", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvalidTokenException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(invalidateSession_result.class, metaDataMap);
     }
 
@@ -18714,11 +19323,12 @@ public class SatelliteServer {
       this.ex = null;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvalidTokenException getEx() {
       return this.ex;
     }
 
-    public invalidateSession_result setEx(TInvalidTokenException ex) {
+    public invalidateSession_result setEx(@org.apache.thrift.annotation.Nullable TInvalidTokenException ex) {
       this.ex = ex;
       return this;
     }
@@ -18738,7 +19348,7 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case EX:
         if (value == null) {
@@ -18751,32 +19361,31 @@ public class SatelliteServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case EX:
         return getEx();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
       case EX:
         return isSetEx();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof invalidateSession_result)
         return this.equals((invalidateSession_result)that);
       return false;
@@ -18785,6 +19394,8 @@ public class SatelliteServer {
     public boolean equals(invalidateSession_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_ex = true && this.isSetEx();
       boolean that_present_ex = true && that.isSetEx();
@@ -18800,14 +19411,13 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_ex = true && (isSetEx());
-      list.add(present_ex);
-      if (present_ex)
-        list.add(ex);
+      hashCode = hashCode * 8191 + ((isSetEx()) ? 131071 : 524287);
+      if (isSetEx())
+        hashCode = hashCode * 8191 + ex.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -18818,7 +19428,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetEx()).compareTo(other.isSetEx());
+      lastComparison = java.lang.Boolean.compare(isSetEx(), other.isSetEx());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -18831,21 +19441,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("invalidateSession_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("invalidateSession_result(");
       boolean first = true;
 
       sb.append("ex:");
@@ -18872,7 +19483,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -18880,13 +19491,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class invalidateSession_resultStandardSchemeFactory implements SchemeFactory {
+    private static class invalidateSession_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public invalidateSession_resultStandardScheme getScheme() {
         return new invalidateSession_resultStandardScheme();
       }
     }
 
-    private static class invalidateSession_resultStandardScheme extends StandardScheme<invalidateSession_result> {
+    private static class invalidateSession_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<invalidateSession_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, invalidateSession_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -18933,18 +19544,18 @@ public class SatelliteServer {
 
     }
 
-    private static class invalidateSession_resultTupleSchemeFactory implements SchemeFactory {
+    private static class invalidateSession_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public invalidateSession_resultTupleScheme getScheme() {
         return new invalidateSession_resultTupleScheme();
       }
     }
 
-    private static class invalidateSession_resultTupleScheme extends TupleScheme<invalidateSession_result> {
+    private static class invalidateSession_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<invalidateSession_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, invalidateSession_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetEx()) {
           optionals.set(0);
         }
@@ -18956,8 +19567,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, invalidateSession_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(1);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
           struct.ex = new TInvalidTokenException();
           struct.ex.read(iprot);
@@ -18966,6 +19577,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getUserList_args implements org.apache.thrift.TBase<getUserList_args, getUserList_args._Fields>, java.io.Serializable, Cloneable, Comparable<getUserList_args>   {
@@ -18974,13 +19588,10 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField USER_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("userToken", org.apache.thrift.protocol.TType.STRING, (short)1);
     private static final org.apache.thrift.protocol.TField PAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("page", org.apache.thrift.protocol.TType.I32, (short)2);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getUserList_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getUserList_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getUserList_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getUserList_argsTupleSchemeFactory();
 
-    public String userToken; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String userToken; // required
     public int page; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@@ -18988,10 +19599,10 @@ public class SatelliteServer {
       USER_TOKEN((short)1, "userToken"),
       PAGE((short)2, "page");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -18999,6 +19610,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // USER_TOKEN
@@ -19016,21 +19628,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -19039,7 +19652,7 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
@@ -19047,14 +19660,14 @@ public class SatelliteServer {
     // isset id assignments
     private static final int __PAGE_ISSET_ID = 0;
     private byte __isset_bitfield = 0;
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.USER_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("userToken", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
       tmpMap.put(_Fields.PAGE, new org.apache.thrift.meta_data.FieldMetaData("page", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getUserList_args.class, metaDataMap);
     }
 
@@ -19062,7 +19675,7 @@ public class SatelliteServer {
     }
 
     public getUserList_args(
-      String userToken,
+      java.lang.String userToken,
       int page)
     {
       this();
@@ -19093,11 +19706,12 @@ public class SatelliteServer {
       this.page = 0;
     }
 
-    public String getUserToken() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getUserToken() {
       return this.userToken;
     }
 
-    public getUserList_args setUserToken(String userToken) {
+    public getUserList_args setUserToken(@org.apache.thrift.annotation.Nullable java.lang.String userToken) {
       this.userToken = userToken;
       return this;
     }
@@ -19128,25 +19742,25 @@ public class SatelliteServer {
     }
 
     public void unsetPage() {
-      __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __PAGE_ISSET_ID);
+      __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __PAGE_ISSET_ID);
     }
 
     /** Returns true if field page is set (has been assigned a value) and false otherwise */
     public boolean isSetPage() {
-      return EncodingUtils.testBit(__isset_bitfield, __PAGE_ISSET_ID);
+      return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __PAGE_ISSET_ID);
     }
 
     public void setPageIsSet(boolean value) {
-      __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __PAGE_ISSET_ID, value);
+      __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __PAGE_ISSET_ID, value);
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case USER_TOKEN:
         if (value == null) {
           unsetUserToken();
         } else {
-          setUserToken((String)value);
+          setUserToken((java.lang.String)value);
         }
         break;
 
@@ -19154,14 +19768,15 @@ public class SatelliteServer {
         if (value == null) {
           unsetPage();
         } else {
-          setPage((Integer)value);
+          setPage((java.lang.Integer)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case USER_TOKEN:
         return getUserToken();
@@ -19170,13 +19785,13 @@ public class SatelliteServer {
         return getPage();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -19185,13 +19800,11 @@ public class SatelliteServer {
       case PAGE:
         return isSetPage();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getUserList_args)
         return this.equals((getUserList_args)that);
       return false;
@@ -19200,6 +19813,8 @@ public class SatelliteServer {
     public boolean equals(getUserList_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_userToken = true && this.isSetUserToken();
       boolean that_present_userToken = true && that.isSetUserToken();
@@ -19224,19 +19839,15 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_userToken = true && (isSetUserToken());
-      list.add(present_userToken);
-      if (present_userToken)
-        list.add(userToken);
+      hashCode = hashCode * 8191 + ((isSetUserToken()) ? 131071 : 524287);
+      if (isSetUserToken())
+        hashCode = hashCode * 8191 + userToken.hashCode();
 
-      boolean present_page = true;
-      list.add(present_page);
-      if (present_page)
-        list.add(page);
+      hashCode = hashCode * 8191 + page;
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -19247,7 +19858,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetUserToken()).compareTo(other.isSetUserToken());
+      lastComparison = java.lang.Boolean.compare(isSetUserToken(), other.isSetUserToken());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -19257,7 +19868,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetPage()).compareTo(other.isSetPage());
+      lastComparison = java.lang.Boolean.compare(isSetPage(), other.isSetPage());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -19270,21 +19881,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getUserList_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getUserList_args(");
       boolean first = true;
 
       sb.append("userToken:");
@@ -19315,7 +19927,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
         __isset_bitfield = 0;
@@ -19325,13 +19937,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class getUserList_argsStandardSchemeFactory implements SchemeFactory {
+    private static class getUserList_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getUserList_argsStandardScheme getScheme() {
         return new getUserList_argsStandardScheme();
       }
     }
 
-    private static class getUserList_argsStandardScheme extends StandardScheme<getUserList_args> {
+    private static class getUserList_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<getUserList_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getUserList_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -19388,18 +20000,18 @@ public class SatelliteServer {
 
     }
 
-    private static class getUserList_argsTupleSchemeFactory implements SchemeFactory {
+    private static class getUserList_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getUserList_argsTupleScheme getScheme() {
         return new getUserList_argsTupleScheme();
       }
     }
 
-    private static class getUserList_argsTupleScheme extends TupleScheme<getUserList_args> {
+    private static class getUserList_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<getUserList_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getUserList_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetUserToken()) {
           optionals.set(0);
         }
@@ -19417,8 +20029,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getUserList_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(2);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           struct.userToken = iprot.readString();
           struct.setUserTokenIsSet(true);
@@ -19430,6 +20042,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getUserList_result implements org.apache.thrift.TBase<getUserList_result, getUserList_result._Fields>, java.io.Serializable, Cloneable, Comparable<getUserList_result>   {
@@ -19439,15 +20054,12 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField FAILURE_FIELD_DESC = new org.apache.thrift.protocol.TField("failure", org.apache.thrift.protocol.TType.STRUCT, (short)1);
     private static final org.apache.thrift.protocol.TField SERVER_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("serverError", org.apache.thrift.protocol.TType.STRUCT, (short)2);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getUserList_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getUserList_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getUserList_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getUserList_resultTupleSchemeFactory();
 
-    public List<UserInfo> success; // required
-    public TAuthorizationException failure; // required
-    public TInvocationException serverError; // required
+    public @org.apache.thrift.annotation.Nullable java.util.List<UserInfo> success; // required
+    public @org.apache.thrift.annotation.Nullable TAuthorizationException failure; // required
+    public @org.apache.thrift.annotation.Nullable TInvocationException serverError; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -19455,10 +20067,10 @@ public class SatelliteServer {
       FAILURE((short)1, "failure"),
       SERVER_ERROR((short)2, "serverError");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -19466,6 +20078,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
@@ -19485,21 +20098,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -19508,23 +20122,23 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
               new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, UserInfo.class))));
       tmpMap.put(_Fields.FAILURE, new org.apache.thrift.meta_data.FieldMetaData("failure", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class)));
       tmpMap.put(_Fields.SERVER_ERROR, new org.apache.thrift.meta_data.FieldMetaData("serverError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getUserList_result.class, metaDataMap);
     }
 
@@ -19532,7 +20146,7 @@ public class SatelliteServer {
     }
 
     public getUserList_result(
-      List<UserInfo> success,
+      java.util.List<UserInfo> success,
       TAuthorizationException failure,
       TInvocationException serverError)
     {
@@ -19547,7 +20161,7 @@ public class SatelliteServer {
      */
     public getUserList_result(getUserList_result other) {
       if (other.isSetSuccess()) {
-        List<UserInfo> __this__success = new ArrayList<UserInfo>(other.success.size());
+        java.util.List<UserInfo> __this__success = new java.util.ArrayList<UserInfo>(other.success.size());
         for (UserInfo other_element : other.success) {
           __this__success.add(new UserInfo(other_element));
         }
@@ -19576,22 +20190,24 @@ public class SatelliteServer {
       return (this.success == null) ? 0 : this.success.size();
     }
 
+    @org.apache.thrift.annotation.Nullable
     public java.util.Iterator<UserInfo> getSuccessIterator() {
       return (this.success == null) ? null : this.success.iterator();
     }
 
     public void addToSuccess(UserInfo elem) {
       if (this.success == null) {
-        this.success = new ArrayList<UserInfo>();
+        this.success = new java.util.ArrayList<UserInfo>();
       }
       this.success.add(elem);
     }
 
-    public List<UserInfo> getSuccess() {
+    @org.apache.thrift.annotation.Nullable
+    public java.util.List<UserInfo> getSuccess() {
       return this.success;
     }
 
-    public getUserList_result setSuccess(List<UserInfo> success) {
+    public getUserList_result setSuccess(@org.apache.thrift.annotation.Nullable java.util.List<UserInfo> success) {
       this.success = success;
       return this;
     }
@@ -19611,11 +20227,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TAuthorizationException getFailure() {
       return this.failure;
     }
 
-    public getUserList_result setFailure(TAuthorizationException failure) {
+    public getUserList_result setFailure(@org.apache.thrift.annotation.Nullable TAuthorizationException failure) {
       this.failure = failure;
       return this;
     }
@@ -19635,11 +20252,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvocationException getServerError() {
       return this.serverError;
     }
 
-    public getUserList_result setServerError(TInvocationException serverError) {
+    public getUserList_result setServerError(@org.apache.thrift.annotation.Nullable TInvocationException serverError) {
       this.serverError = serverError;
       return this;
     }
@@ -19659,13 +20277,13 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
           unsetSuccess();
         } else {
-          setSuccess((List<UserInfo>)value);
+          setSuccess((java.util.List<UserInfo>)value);
         }
         break;
 
@@ -19688,7 +20306,8 @@ public class SatelliteServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
         return getSuccess();
@@ -19700,13 +20319,13 @@ public class SatelliteServer {
         return getServerError();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -19717,13 +20336,11 @@ public class SatelliteServer {
       case SERVER_ERROR:
         return isSetServerError();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getUserList_result)
         return this.equals((getUserList_result)that);
       return false;
@@ -19732,6 +20349,8 @@ public class SatelliteServer {
     public boolean equals(getUserList_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_success = true && this.isSetSuccess();
       boolean that_present_success = true && that.isSetSuccess();
@@ -19765,24 +20384,21 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
 
-      boolean present_failure = true && (isSetFailure());
-      list.add(present_failure);
-      if (present_failure)
-        list.add(failure);
+      hashCode = hashCode * 8191 + ((isSetFailure()) ? 131071 : 524287);
+      if (isSetFailure())
+        hashCode = hashCode * 8191 + failure.hashCode();
 
-      boolean present_serverError = true && (isSetServerError());
-      list.add(present_serverError);
-      if (present_serverError)
-        list.add(serverError);
+      hashCode = hashCode * 8191 + ((isSetServerError()) ? 131071 : 524287);
+      if (isSetServerError())
+        hashCode = hashCode * 8191 + serverError.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -19793,7 +20409,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -19803,7 +20419,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure());
+      lastComparison = java.lang.Boolean.compare(isSetFailure(), other.isSetFailure());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -19813,7 +20429,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetServerError()).compareTo(other.isSetServerError());
+      lastComparison = java.lang.Boolean.compare(isSetServerError(), other.isSetServerError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -19826,21 +20442,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getUserList_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getUserList_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -19883,7 +20500,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -19891,13 +20508,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class getUserList_resultStandardSchemeFactory implements SchemeFactory {
+    private static class getUserList_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getUserList_resultStandardScheme getScheme() {
         return new getUserList_resultStandardScheme();
       }
     }
 
-    private static class getUserList_resultStandardScheme extends StandardScheme<getUserList_result> {
+    private static class getUserList_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<getUserList_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getUserList_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -19912,14 +20529,14 @@ public class SatelliteServer {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list234 = iprot.readListBegin();
-                  struct.success = new ArrayList<UserInfo>(_list234.size);
-                  UserInfo _elem235;
-                  for (int _i236 = 0; _i236 < _list234.size; ++_i236)
+                  org.apache.thrift.protocol.TList _list314 = iprot.readListBegin();
+                  struct.success = new java.util.ArrayList<UserInfo>(_list314.size);
+                  @org.apache.thrift.annotation.Nullable UserInfo _elem315;
+                  for (int _i316 = 0; _i316 < _list314.size; ++_i316)
                   {
-                    _elem235 = new UserInfo();
-                    _elem235.read(iprot);
-                    struct.success.add(_elem235);
+                    _elem315 = new UserInfo();
+                    _elem315.read(iprot);
+                    struct.success.add(_elem315);
                   }
                   iprot.readListEnd();
                 }
@@ -19965,9 +20582,9 @@ public class SatelliteServer {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
-            for (UserInfo _iter237 : struct.success)
+            for (UserInfo _iter317 : struct.success)
             {
-              _iter237.write(oprot);
+              _iter317.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -19989,18 +20606,18 @@ public class SatelliteServer {
 
     }
 
-    private static class getUserList_resultTupleSchemeFactory implements SchemeFactory {
+    private static class getUserList_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getUserList_resultTupleScheme getScheme() {
         return new getUserList_resultTupleScheme();
       }
     }
 
-    private static class getUserList_resultTupleScheme extends TupleScheme<getUserList_result> {
+    private static class getUserList_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<getUserList_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getUserList_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
           optionals.set(0);
         }
@@ -20014,9 +20631,9 @@ public class SatelliteServer {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (UserInfo _iter238 : struct.success)
+            for (UserInfo _iter318 : struct.success)
             {
-              _iter238.write(oprot);
+              _iter318.write(oprot);
             }
           }
         }
@@ -20030,18 +20647,18 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getUserList_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(3);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list239 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new ArrayList<UserInfo>(_list239.size);
-            UserInfo _elem240;
-            for (int _i241 = 0; _i241 < _list239.size; ++_i241)
+            org.apache.thrift.protocol.TList _list319 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.success = new java.util.ArrayList<UserInfo>(_list319.size);
+            @org.apache.thrift.annotation.Nullable UserInfo _elem320;
+            for (int _i321 = 0; _i321 < _list319.size; ++_i321)
             {
-              _elem240 = new UserInfo();
-              _elem240.read(iprot);
-              struct.success.add(_elem240);
+              _elem320 = new UserInfo();
+              _elem320.read(iprot);
+              struct.success.add(_elem320);
             }
           }
           struct.setSuccessIsSet(true);
@@ -20059,6 +20676,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getUserConfig_args implements org.apache.thrift.TBase<getUserConfig_args, getUserConfig_args._Fields>, java.io.Serializable, Cloneable, Comparable<getUserConfig_args>   {
@@ -20066,22 +20686,19 @@ public class SatelliteServer {
 
     private static final org.apache.thrift.protocol.TField USER_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("userToken", org.apache.thrift.protocol.TType.STRING, (short)1);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getUserConfig_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getUserConfig_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getUserConfig_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getUserConfig_argsTupleSchemeFactory();
 
-    public String userToken; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String userToken; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       USER_TOKEN((short)1, "userToken");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -20089,6 +20706,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // USER_TOKEN
@@ -20104,21 +20722,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -20127,18 +20746,18 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.USER_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("userToken", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getUserConfig_args.class, metaDataMap);
     }
 
@@ -20146,7 +20765,7 @@ public class SatelliteServer {
     }
 
     public getUserConfig_args(
-      String userToken)
+      java.lang.String userToken)
     {
       this();
       this.userToken = userToken;
@@ -20170,11 +20789,12 @@ public class SatelliteServer {
       this.userToken = null;
     }
 
-    public String getUserToken() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getUserToken() {
       return this.userToken;
     }
 
-    public getUserConfig_args setUserToken(String userToken) {
+    public getUserConfig_args setUserToken(@org.apache.thrift.annotation.Nullable java.lang.String userToken) {
       this.userToken = userToken;
       return this;
     }
@@ -20194,45 +20814,44 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case USER_TOKEN:
         if (value == null) {
           unsetUserToken();
         } else {
-          setUserToken((String)value);
+          setUserToken((java.lang.String)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case USER_TOKEN:
         return getUserToken();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
       case USER_TOKEN:
         return isSetUserToken();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getUserConfig_args)
         return this.equals((getUserConfig_args)that);
       return false;
@@ -20241,6 +20860,8 @@ public class SatelliteServer {
     public boolean equals(getUserConfig_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_userToken = true && this.isSetUserToken();
       boolean that_present_userToken = true && that.isSetUserToken();
@@ -20256,14 +20877,13 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_userToken = true && (isSetUserToken());
-      list.add(present_userToken);
-      if (present_userToken)
-        list.add(userToken);
+      hashCode = hashCode * 8191 + ((isSetUserToken()) ? 131071 : 524287);
+      if (isSetUserToken())
+        hashCode = hashCode * 8191 + userToken.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -20274,7 +20894,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetUserToken()).compareTo(other.isSetUserToken());
+      lastComparison = java.lang.Boolean.compare(isSetUserToken(), other.isSetUserToken());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -20287,21 +20907,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getUserConfig_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getUserConfig_args(");
       boolean first = true;
 
       sb.append("userToken:");
@@ -20328,7 +20949,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -20336,13 +20957,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class getUserConfig_argsStandardSchemeFactory implements SchemeFactory {
+    private static class getUserConfig_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getUserConfig_argsStandardScheme getScheme() {
         return new getUserConfig_argsStandardScheme();
       }
     }
 
-    private static class getUserConfig_argsStandardScheme extends StandardScheme<getUserConfig_args> {
+    private static class getUserConfig_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<getUserConfig_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getUserConfig_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -20388,18 +21009,18 @@ public class SatelliteServer {
 
     }
 
-    private static class getUserConfig_argsTupleSchemeFactory implements SchemeFactory {
+    private static class getUserConfig_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getUserConfig_argsTupleScheme getScheme() {
         return new getUserConfig_argsTupleScheme();
       }
     }
 
-    private static class getUserConfig_argsTupleScheme extends TupleScheme<getUserConfig_args> {
+    private static class getUserConfig_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<getUserConfig_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getUserConfig_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetUserToken()) {
           optionals.set(0);
         }
@@ -20411,8 +21032,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getUserConfig_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(1);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
           struct.userToken = iprot.readString();
           struct.setUserTokenIsSet(true);
@@ -20420,6 +21041,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getUserConfig_result implements org.apache.thrift.TBase<getUserConfig_result, getUserConfig_result._Fields>, java.io.Serializable, Cloneable, Comparable<getUserConfig_result>   {
@@ -20429,15 +21053,12 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField FAILURE_FIELD_DESC = new org.apache.thrift.protocol.TField("failure", org.apache.thrift.protocol.TType.STRUCT, (short)1);
     private static final org.apache.thrift.protocol.TField SERVER_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("serverError", org.apache.thrift.protocol.TType.STRUCT, (short)2);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getUserConfig_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getUserConfig_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getUserConfig_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getUserConfig_resultTupleSchemeFactory();
 
-    public SatelliteUserConfig success; // required
-    public TAuthorizationException failure; // required
-    public TInvocationException serverError; // required
+    public @org.apache.thrift.annotation.Nullable SatelliteUserConfig success; // required
+    public @org.apache.thrift.annotation.Nullable TAuthorizationException failure; // required
+    public @org.apache.thrift.annotation.Nullable TInvocationException serverError; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -20445,10 +21066,10 @@ public class SatelliteServer {
       FAILURE((short)1, "failure"),
       SERVER_ERROR((short)2, "serverError");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -20456,6 +21077,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
@@ -20475,21 +21097,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -20498,22 +21121,22 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, SatelliteUserConfig.class)));
       tmpMap.put(_Fields.FAILURE, new org.apache.thrift.meta_data.FieldMetaData("failure", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class)));
       tmpMap.put(_Fields.SERVER_ERROR, new org.apache.thrift.meta_data.FieldMetaData("serverError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getUserConfig_result.class, metaDataMap);
     }
 
@@ -20557,11 +21180,12 @@ public class SatelliteServer {
       this.serverError = null;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public SatelliteUserConfig getSuccess() {
       return this.success;
     }
 
-    public getUserConfig_result setSuccess(SatelliteUserConfig success) {
+    public getUserConfig_result setSuccess(@org.apache.thrift.annotation.Nullable SatelliteUserConfig success) {
       this.success = success;
       return this;
     }
@@ -20581,11 +21205,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TAuthorizationException getFailure() {
       return this.failure;
     }
 
-    public getUserConfig_result setFailure(TAuthorizationException failure) {
+    public getUserConfig_result setFailure(@org.apache.thrift.annotation.Nullable TAuthorizationException failure) {
       this.failure = failure;
       return this;
     }
@@ -20605,11 +21230,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvocationException getServerError() {
       return this.serverError;
     }
 
-    public getUserConfig_result setServerError(TInvocationException serverError) {
+    public getUserConfig_result setServerError(@org.apache.thrift.annotation.Nullable TInvocationException serverError) {
       this.serverError = serverError;
       return this;
     }
@@ -20629,7 +21255,7 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
@@ -20658,7 +21284,8 @@ public class SatelliteServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
         return getSuccess();
@@ -20670,13 +21297,13 @@ public class SatelliteServer {
         return getServerError();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -20687,13 +21314,11 @@ public class SatelliteServer {
       case SERVER_ERROR:
         return isSetServerError();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getUserConfig_result)
         return this.equals((getUserConfig_result)that);
       return false;
@@ -20702,6 +21327,8 @@ public class SatelliteServer {
     public boolean equals(getUserConfig_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_success = true && this.isSetSuccess();
       boolean that_present_success = true && that.isSetSuccess();
@@ -20735,24 +21362,21 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
 
-      boolean present_failure = true && (isSetFailure());
-      list.add(present_failure);
-      if (present_failure)
-        list.add(failure);
+      hashCode = hashCode * 8191 + ((isSetFailure()) ? 131071 : 524287);
+      if (isSetFailure())
+        hashCode = hashCode * 8191 + failure.hashCode();
 
-      boolean present_serverError = true && (isSetServerError());
-      list.add(present_serverError);
-      if (present_serverError)
-        list.add(serverError);
+      hashCode = hashCode * 8191 + ((isSetServerError()) ? 131071 : 524287);
+      if (isSetServerError())
+        hashCode = hashCode * 8191 + serverError.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -20763,7 +21387,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -20773,7 +21397,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure());
+      lastComparison = java.lang.Boolean.compare(isSetFailure(), other.isSetFailure());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -20783,7 +21407,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetServerError()).compareTo(other.isSetServerError());
+      lastComparison = java.lang.Boolean.compare(isSetServerError(), other.isSetServerError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -20796,21 +21420,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getUserConfig_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getUserConfig_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -20856,7 +21481,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -20864,13 +21489,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class getUserConfig_resultStandardSchemeFactory implements SchemeFactory {
+    private static class getUserConfig_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getUserConfig_resultStandardScheme getScheme() {
         return new getUserConfig_resultStandardScheme();
       }
     }
 
-    private static class getUserConfig_resultStandardScheme extends StandardScheme<getUserConfig_result> {
+    private static class getUserConfig_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<getUserConfig_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getUserConfig_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -20945,18 +21570,18 @@ public class SatelliteServer {
 
     }
 
-    private static class getUserConfig_resultTupleSchemeFactory implements SchemeFactory {
+    private static class getUserConfig_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getUserConfig_resultTupleScheme getScheme() {
         return new getUserConfig_resultTupleScheme();
       }
     }
 
-    private static class getUserConfig_resultTupleScheme extends TupleScheme<getUserConfig_result> {
+    private static class getUserConfig_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<getUserConfig_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getUserConfig_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
           optionals.set(0);
         }
@@ -20980,8 +21605,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getUserConfig_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(3);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           struct.success = new SatelliteUserConfig();
           struct.success.read(iprot);
@@ -21000,6 +21625,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class setUserConfig_args implements org.apache.thrift.TBase<setUserConfig_args, setUserConfig_args._Fields>, java.io.Serializable, Cloneable, Comparable<setUserConfig_args>   {
@@ -21008,24 +21636,21 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField USER_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("userToken", org.apache.thrift.protocol.TType.STRING, (short)1);
     private static final org.apache.thrift.protocol.TField CONFIG_FIELD_DESC = new org.apache.thrift.protocol.TField("config", org.apache.thrift.protocol.TType.STRUCT, (short)2);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new setUserConfig_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new setUserConfig_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setUserConfig_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setUserConfig_argsTupleSchemeFactory();
 
-    public String userToken; // required
-    public SatelliteUserConfig config; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String userToken; // required
+    public @org.apache.thrift.annotation.Nullable SatelliteUserConfig config; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       USER_TOKEN((short)1, "userToken"),
       CONFIG((short)2, "config");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -21033,6 +21658,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // USER_TOKEN
@@ -21050,21 +21676,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -21073,20 +21700,20 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.USER_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("userToken", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
       tmpMap.put(_Fields.CONFIG, new org.apache.thrift.meta_data.FieldMetaData("config", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, SatelliteUserConfig.class)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setUserConfig_args.class, metaDataMap);
     }
 
@@ -21094,7 +21721,7 @@ public class SatelliteServer {
     }
 
     public setUserConfig_args(
-      String userToken,
+      java.lang.String userToken,
       SatelliteUserConfig config)
     {
       this();
@@ -21124,11 +21751,12 @@ public class SatelliteServer {
       this.config = null;
     }
 
-    public String getUserToken() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getUserToken() {
       return this.userToken;
     }
 
-    public setUserConfig_args setUserToken(String userToken) {
+    public setUserConfig_args setUserToken(@org.apache.thrift.annotation.Nullable java.lang.String userToken) {
       this.userToken = userToken;
       return this;
     }
@@ -21148,11 +21776,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public SatelliteUserConfig getConfig() {
       return this.config;
     }
 
-    public setUserConfig_args setConfig(SatelliteUserConfig config) {
+    public setUserConfig_args setConfig(@org.apache.thrift.annotation.Nullable SatelliteUserConfig config) {
       this.config = config;
       return this;
     }
@@ -21172,13 +21801,13 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case USER_TOKEN:
         if (value == null) {
           unsetUserToken();
         } else {
-          setUserToken((String)value);
+          setUserToken((java.lang.String)value);
         }
         break;
 
@@ -21193,7 +21822,8 @@ public class SatelliteServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case USER_TOKEN:
         return getUserToken();
@@ -21202,13 +21832,13 @@ public class SatelliteServer {
         return getConfig();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -21217,13 +21847,11 @@ public class SatelliteServer {
       case CONFIG:
         return isSetConfig();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof setUserConfig_args)
         return this.equals((setUserConfig_args)that);
       return false;
@@ -21232,6 +21860,8 @@ public class SatelliteServer {
     public boolean equals(setUserConfig_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_userToken = true && this.isSetUserToken();
       boolean that_present_userToken = true && that.isSetUserToken();
@@ -21256,19 +21886,17 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_userToken = true && (isSetUserToken());
-      list.add(present_userToken);
-      if (present_userToken)
-        list.add(userToken);
+      hashCode = hashCode * 8191 + ((isSetUserToken()) ? 131071 : 524287);
+      if (isSetUserToken())
+        hashCode = hashCode * 8191 + userToken.hashCode();
 
-      boolean present_config = true && (isSetConfig());
-      list.add(present_config);
-      if (present_config)
-        list.add(config);
+      hashCode = hashCode * 8191 + ((isSetConfig()) ? 131071 : 524287);
+      if (isSetConfig())
+        hashCode = hashCode * 8191 + config.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -21279,7 +21907,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetUserToken()).compareTo(other.isSetUserToken());
+      lastComparison = java.lang.Boolean.compare(isSetUserToken(), other.isSetUserToken());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -21289,7 +21917,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetConfig()).compareTo(other.isSetConfig());
+      lastComparison = java.lang.Boolean.compare(isSetConfig(), other.isSetConfig());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -21302,21 +21930,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("setUserConfig_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("setUserConfig_args(");
       boolean first = true;
 
       sb.append("userToken:");
@@ -21354,7 +21983,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -21362,13 +21991,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class setUserConfig_argsStandardSchemeFactory implements SchemeFactory {
+    private static class setUserConfig_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public setUserConfig_argsStandardScheme getScheme() {
         return new setUserConfig_argsStandardScheme();
       }
     }
 
-    private static class setUserConfig_argsStandardScheme extends StandardScheme<setUserConfig_args> {
+    private static class setUserConfig_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<setUserConfig_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, setUserConfig_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -21428,18 +22057,18 @@ public class SatelliteServer {
 
     }
 
-    private static class setUserConfig_argsTupleSchemeFactory implements SchemeFactory {
+    private static class setUserConfig_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public setUserConfig_argsTupleScheme getScheme() {
         return new setUserConfig_argsTupleScheme();
       }
     }
 
-    private static class setUserConfig_argsTupleScheme extends TupleScheme<setUserConfig_args> {
+    private static class setUserConfig_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<setUserConfig_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, setUserConfig_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetUserToken()) {
           optionals.set(0);
         }
@@ -21457,8 +22086,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, setUserConfig_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(2);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           struct.userToken = iprot.readString();
           struct.setUserTokenIsSet(true);
@@ -21471,6 +22100,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class setUserConfig_result implements org.apache.thrift.TBase<setUserConfig_result, setUserConfig_result._Fields>, java.io.Serializable, Cloneable, Comparable<setUserConfig_result>   {
@@ -21479,24 +22111,21 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField FAILURE_FIELD_DESC = new org.apache.thrift.protocol.TField("failure", org.apache.thrift.protocol.TType.STRUCT, (short)1);
     private static final org.apache.thrift.protocol.TField SERVER_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("serverError", org.apache.thrift.protocol.TType.STRUCT, (short)2);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new setUserConfig_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new setUserConfig_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setUserConfig_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setUserConfig_resultTupleSchemeFactory();
 
-    public TAuthorizationException failure; // required
-    public TInvocationException serverError; // required
+    public @org.apache.thrift.annotation.Nullable TAuthorizationException failure; // required
+    public @org.apache.thrift.annotation.Nullable TInvocationException serverError; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       FAILURE((short)1, "failure"),
       SERVER_ERROR((short)2, "serverError");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -21504,6 +22133,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // FAILURE
@@ -21521,21 +22151,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -21544,20 +22175,20 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.FAILURE, new org.apache.thrift.meta_data.FieldMetaData("failure", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class)));
       tmpMap.put(_Fields.SERVER_ERROR, new org.apache.thrift.meta_data.FieldMetaData("serverError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setUserConfig_result.class, metaDataMap);
     }
 
@@ -21595,11 +22226,12 @@ public class SatelliteServer {
       this.serverError = null;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TAuthorizationException getFailure() {
       return this.failure;
     }
 
-    public setUserConfig_result setFailure(TAuthorizationException failure) {
+    public setUserConfig_result setFailure(@org.apache.thrift.annotation.Nullable TAuthorizationException failure) {
       this.failure = failure;
       return this;
     }
@@ -21619,11 +22251,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvocationException getServerError() {
       return this.serverError;
     }
 
-    public setUserConfig_result setServerError(TInvocationException serverError) {
+    public setUserConfig_result setServerError(@org.apache.thrift.annotation.Nullable TInvocationException serverError) {
       this.serverError = serverError;
       return this;
     }
@@ -21643,7 +22276,7 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case FAILURE:
         if (value == null) {
@@ -21664,7 +22297,8 @@ public class SatelliteServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case FAILURE:
         return getFailure();
@@ -21673,13 +22307,13 @@ public class SatelliteServer {
         return getServerError();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -21688,13 +22322,11 @@ public class SatelliteServer {
       case SERVER_ERROR:
         return isSetServerError();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof setUserConfig_result)
         return this.equals((setUserConfig_result)that);
       return false;
@@ -21703,6 +22335,8 @@ public class SatelliteServer {
     public boolean equals(setUserConfig_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_failure = true && this.isSetFailure();
       boolean that_present_failure = true && that.isSetFailure();
@@ -21727,19 +22361,17 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_failure = true && (isSetFailure());
-      list.add(present_failure);
-      if (present_failure)
-        list.add(failure);
+      hashCode = hashCode * 8191 + ((isSetFailure()) ? 131071 : 524287);
+      if (isSetFailure())
+        hashCode = hashCode * 8191 + failure.hashCode();
 
-      boolean present_serverError = true && (isSetServerError());
-      list.add(present_serverError);
-      if (present_serverError)
-        list.add(serverError);
+      hashCode = hashCode * 8191 + ((isSetServerError()) ? 131071 : 524287);
+      if (isSetServerError())
+        hashCode = hashCode * 8191 + serverError.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -21750,7 +22382,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure());
+      lastComparison = java.lang.Boolean.compare(isSetFailure(), other.isSetFailure());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -21760,7 +22392,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetServerError()).compareTo(other.isSetServerError());
+      lastComparison = java.lang.Boolean.compare(isSetServerError(), other.isSetServerError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -21773,21 +22405,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("setUserConfig_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("setUserConfig_result(");
       boolean first = true;
 
       sb.append("failure:");
@@ -21822,7 +22455,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -21830,13 +22463,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class setUserConfig_resultStandardSchemeFactory implements SchemeFactory {
+    private static class setUserConfig_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public setUserConfig_resultStandardScheme getScheme() {
         return new setUserConfig_resultStandardScheme();
       }
     }
 
-    private static class setUserConfig_resultStandardScheme extends StandardScheme<setUserConfig_result> {
+    private static class setUserConfig_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<setUserConfig_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, setUserConfig_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -21897,18 +22530,18 @@ public class SatelliteServer {
 
     }
 
-    private static class setUserConfig_resultTupleSchemeFactory implements SchemeFactory {
+    private static class setUserConfig_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public setUserConfig_resultTupleScheme getScheme() {
         return new setUserConfig_resultTupleScheme();
       }
     }
 
-    private static class setUserConfig_resultTupleScheme extends TupleScheme<setUserConfig_result> {
+    private static class setUserConfig_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<setUserConfig_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, setUserConfig_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetFailure()) {
           optionals.set(0);
         }
@@ -21926,8 +22559,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, setUserConfig_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(2);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           struct.failure = new TAuthorizationException();
           struct.failure.read(iprot);
@@ -21941,27 +22574,27 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getOperatingSystems_args implements org.apache.thrift.TBase<getOperatingSystems_args, getOperatingSystems_args._Fields>, java.io.Serializable, Cloneable, Comparable<getOperatingSystems_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getOperatingSystems_args");
 
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getOperatingSystems_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getOperatingSystems_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getOperatingSystems_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getOperatingSystems_argsTupleSchemeFactory();
 
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
 ;
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -21969,6 +22602,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           default:
@@ -21982,21 +22616,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -22005,14 +22640,14 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getOperatingSystems_args.class, metaDataMap);
     }
 
@@ -22033,32 +22668,31 @@ public class SatelliteServer {
     public void clear() {
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getOperatingSystems_args)
         return this.equals((getOperatingSystems_args)that);
       return false;
@@ -22067,15 +22701,17 @@ public class SatelliteServer {
     public boolean equals(getOperatingSystems_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       return true;
     }
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -22089,21 +22725,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getOperatingSystems_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getOperatingSystems_args(");
       boolean first = true;
 
       sb.append(")");
@@ -22123,7 +22760,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -22131,13 +22768,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class getOperatingSystems_argsStandardSchemeFactory implements SchemeFactory {
+    private static class getOperatingSystems_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getOperatingSystems_argsStandardScheme getScheme() {
         return new getOperatingSystems_argsStandardScheme();
       }
     }
 
-    private static class getOperatingSystems_argsStandardScheme extends StandardScheme<getOperatingSystems_args> {
+    private static class getOperatingSystems_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<getOperatingSystems_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getOperatingSystems_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -22170,25 +22807,28 @@ public class SatelliteServer {
 
     }
 
-    private static class getOperatingSystems_argsTupleSchemeFactory implements SchemeFactory {
+    private static class getOperatingSystems_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getOperatingSystems_argsTupleScheme getScheme() {
         return new getOperatingSystems_argsTupleScheme();
       }
     }
 
-    private static class getOperatingSystems_argsTupleScheme extends TupleScheme<getOperatingSystems_args> {
+    private static class getOperatingSystems_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<getOperatingSystems_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getOperatingSystems_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
       }
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getOperatingSystems_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getOperatingSystems_result implements org.apache.thrift.TBase<getOperatingSystems_result, getOperatingSystems_result._Fields>, java.io.Serializable, Cloneable, Comparable<getOperatingSystems_result>   {
@@ -22196,22 +22836,19 @@ public class SatelliteServer {
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getOperatingSystems_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getOperatingSystems_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getOperatingSystems_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getOperatingSystems_resultTupleSchemeFactory();
 
-    public List<OperatingSystem> success; // required
+    public @org.apache.thrift.annotation.Nullable java.util.List<OperatingSystem> success; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SUCCESS((short)0, "success");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -22219,6 +22856,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
@@ -22234,21 +22872,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -22257,19 +22896,19 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
               new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, OperatingSystem.class))));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getOperatingSystems_result.class, metaDataMap);
     }
 
@@ -22277,7 +22916,7 @@ public class SatelliteServer {
     }
 
     public getOperatingSystems_result(
-      List<OperatingSystem> success)
+      java.util.List<OperatingSystem> success)
     {
       this();
       this.success = success;
@@ -22288,7 +22927,7 @@ public class SatelliteServer {
      */
     public getOperatingSystems_result(getOperatingSystems_result other) {
       if (other.isSetSuccess()) {
-        List<OperatingSystem> __this__success = new ArrayList<OperatingSystem>(other.success.size());
+        java.util.List<OperatingSystem> __this__success = new java.util.ArrayList<OperatingSystem>(other.success.size());
         for (OperatingSystem other_element : other.success) {
           __this__success.add(new OperatingSystem(other_element));
         }
@@ -22309,22 +22948,24 @@ public class SatelliteServer {
       return (this.success == null) ? 0 : this.success.size();
     }
 
+    @org.apache.thrift.annotation.Nullable
     public java.util.Iterator<OperatingSystem> getSuccessIterator() {
       return (this.success == null) ? null : this.success.iterator();
     }
 
     public void addToSuccess(OperatingSystem elem) {
       if (this.success == null) {
-        this.success = new ArrayList<OperatingSystem>();
+        this.success = new java.util.ArrayList<OperatingSystem>();
       }
       this.success.add(elem);
     }
 
-    public List<OperatingSystem> getSuccess() {
+    @org.apache.thrift.annotation.Nullable
+    public java.util.List<OperatingSystem> getSuccess() {
       return this.success;
     }
 
-    public getOperatingSystems_result setSuccess(List<OperatingSystem> success) {
+    public getOperatingSystems_result setSuccess(@org.apache.thrift.annotation.Nullable java.util.List<OperatingSystem> success) {
       this.success = success;
       return this;
     }
@@ -22344,45 +22985,44 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
           unsetSuccess();
         } else {
-          setSuccess((List<OperatingSystem>)value);
+          setSuccess((java.util.List<OperatingSystem>)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
         return getSuccess();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
       case SUCCESS:
         return isSetSuccess();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getOperatingSystems_result)
         return this.equals((getOperatingSystems_result)that);
       return false;
@@ -22391,6 +23031,8 @@ public class SatelliteServer {
     public boolean equals(getOperatingSystems_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_success = true && this.isSetSuccess();
       boolean that_present_success = true && that.isSetSuccess();
@@ -22406,14 +23048,13 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -22424,7 +23065,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -22437,21 +23078,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getOperatingSystems_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getOperatingSystems_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -22478,7 +23120,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -22486,13 +23128,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class getOperatingSystems_resultStandardSchemeFactory implements SchemeFactory {
+    private static class getOperatingSystems_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getOperatingSystems_resultStandardScheme getScheme() {
         return new getOperatingSystems_resultStandardScheme();
       }
     }
 
-    private static class getOperatingSystems_resultStandardScheme extends StandardScheme<getOperatingSystems_result> {
+    private static class getOperatingSystems_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<getOperatingSystems_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getOperatingSystems_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -22507,14 +23149,14 @@ public class SatelliteServer {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list242 = iprot.readListBegin();
-                  struct.success = new ArrayList<OperatingSystem>(_list242.size);
-                  OperatingSystem _elem243;
-                  for (int _i244 = 0; _i244 < _list242.size; ++_i244)
+                  org.apache.thrift.protocol.TList _list322 = iprot.readListBegin();
+                  struct.success = new java.util.ArrayList<OperatingSystem>(_list322.size);
+                  @org.apache.thrift.annotation.Nullable OperatingSystem _elem323;
+                  for (int _i324 = 0; _i324 < _list322.size; ++_i324)
                   {
-                    _elem243 = new OperatingSystem();
-                    _elem243.read(iprot);
-                    struct.success.add(_elem243);
+                    _elem323 = new OperatingSystem();
+                    _elem323.read(iprot);
+                    struct.success.add(_elem323);
                   }
                   iprot.readListEnd();
                 }
@@ -22542,9 +23184,9 @@ public class SatelliteServer {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
-            for (OperatingSystem _iter245 : struct.success)
+            for (OperatingSystem _iter325 : struct.success)
             {
-              _iter245.write(oprot);
+              _iter325.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -22556,18 +23198,18 @@ public class SatelliteServer {
 
     }
 
-    private static class getOperatingSystems_resultTupleSchemeFactory implements SchemeFactory {
+    private static class getOperatingSystems_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getOperatingSystems_resultTupleScheme getScheme() {
         return new getOperatingSystems_resultTupleScheme();
       }
     }
 
-    private static class getOperatingSystems_resultTupleScheme extends TupleScheme<getOperatingSystems_result> {
+    private static class getOperatingSystems_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<getOperatingSystems_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getOperatingSystems_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
           optionals.set(0);
         }
@@ -22575,9 +23217,9 @@ public class SatelliteServer {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (OperatingSystem _iter246 : struct.success)
+            for (OperatingSystem _iter326 : struct.success)
             {
-              _iter246.write(oprot);
+              _iter326.write(oprot);
             }
           }
         }
@@ -22585,18 +23227,18 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getOperatingSystems_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(1);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list247 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new ArrayList<OperatingSystem>(_list247.size);
-            OperatingSystem _elem248;
-            for (int _i249 = 0; _i249 < _list247.size; ++_i249)
+            org.apache.thrift.protocol.TList _list327 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.success = new java.util.ArrayList<OperatingSystem>(_list327.size);
+            @org.apache.thrift.annotation.Nullable OperatingSystem _elem328;
+            for (int _i329 = 0; _i329 < _list327.size; ++_i329)
             {
-              _elem248 = new OperatingSystem();
-              _elem248.read(iprot);
-              struct.success.add(_elem248);
+              _elem328 = new OperatingSystem();
+              _elem328.read(iprot);
+              struct.success.add(_elem328);
             }
           }
           struct.setSuccessIsSet(true);
@@ -22604,27 +23246,27 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getVirtualizers_args implements org.apache.thrift.TBase<getVirtualizers_args, getVirtualizers_args._Fields>, java.io.Serializable, Cloneable, Comparable<getVirtualizers_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getVirtualizers_args");
 
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getVirtualizers_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getVirtualizers_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getVirtualizers_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getVirtualizers_argsTupleSchemeFactory();
 
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
 ;
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -22632,6 +23274,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           default:
@@ -22645,21 +23288,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -22668,14 +23312,14 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getVirtualizers_args.class, metaDataMap);
     }
 
@@ -22696,32 +23340,31 @@ public class SatelliteServer {
     public void clear() {
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getVirtualizers_args)
         return this.equals((getVirtualizers_args)that);
       return false;
@@ -22730,15 +23373,17 @@ public class SatelliteServer {
     public boolean equals(getVirtualizers_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       return true;
     }
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -22752,21 +23397,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getVirtualizers_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getVirtualizers_args(");
       boolean first = true;
 
       sb.append(")");
@@ -22786,7 +23432,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -22794,13 +23440,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class getVirtualizers_argsStandardSchemeFactory implements SchemeFactory {
+    private static class getVirtualizers_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getVirtualizers_argsStandardScheme getScheme() {
         return new getVirtualizers_argsStandardScheme();
       }
     }
 
-    private static class getVirtualizers_argsStandardScheme extends StandardScheme<getVirtualizers_args> {
+    private static class getVirtualizers_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<getVirtualizers_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getVirtualizers_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -22833,25 +23479,28 @@ public class SatelliteServer {
 
     }
 
-    private static class getVirtualizers_argsTupleSchemeFactory implements SchemeFactory {
+    private static class getVirtualizers_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getVirtualizers_argsTupleScheme getScheme() {
         return new getVirtualizers_argsTupleScheme();
       }
     }
 
-    private static class getVirtualizers_argsTupleScheme extends TupleScheme<getVirtualizers_args> {
+    private static class getVirtualizers_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<getVirtualizers_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getVirtualizers_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
       }
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getVirtualizers_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getVirtualizers_result implements org.apache.thrift.TBase<getVirtualizers_result, getVirtualizers_result._Fields>, java.io.Serializable, Cloneable, Comparable<getVirtualizers_result>   {
@@ -22859,22 +23508,19 @@ public class SatelliteServer {
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getVirtualizers_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getVirtualizers_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getVirtualizers_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getVirtualizers_resultTupleSchemeFactory();
 
-    public List<Virtualizer> success; // required
+    public @org.apache.thrift.annotation.Nullable java.util.List<Virtualizer> success; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SUCCESS((short)0, "success");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -22882,6 +23528,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
@@ -22897,21 +23544,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -22920,19 +23568,19 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
               new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Virtualizer.class))));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getVirtualizers_result.class, metaDataMap);
     }
 
@@ -22940,7 +23588,7 @@ public class SatelliteServer {
     }
 
     public getVirtualizers_result(
-      List<Virtualizer> success)
+      java.util.List<Virtualizer> success)
     {
       this();
       this.success = success;
@@ -22951,7 +23599,7 @@ public class SatelliteServer {
      */
     public getVirtualizers_result(getVirtualizers_result other) {
       if (other.isSetSuccess()) {
-        List<Virtualizer> __this__success = new ArrayList<Virtualizer>(other.success.size());
+        java.util.List<Virtualizer> __this__success = new java.util.ArrayList<Virtualizer>(other.success.size());
         for (Virtualizer other_element : other.success) {
           __this__success.add(new Virtualizer(other_element));
         }
@@ -22972,22 +23620,24 @@ public class SatelliteServer {
       return (this.success == null) ? 0 : this.success.size();
     }
 
+    @org.apache.thrift.annotation.Nullable
     public java.util.Iterator<Virtualizer> getSuccessIterator() {
       return (this.success == null) ? null : this.success.iterator();
     }
 
     public void addToSuccess(Virtualizer elem) {
       if (this.success == null) {
-        this.success = new ArrayList<Virtualizer>();
+        this.success = new java.util.ArrayList<Virtualizer>();
       }
       this.success.add(elem);
     }
 
-    public List<Virtualizer> getSuccess() {
+    @org.apache.thrift.annotation.Nullable
+    public java.util.List<Virtualizer> getSuccess() {
       return this.success;
     }
 
-    public getVirtualizers_result setSuccess(List<Virtualizer> success) {
+    public getVirtualizers_result setSuccess(@org.apache.thrift.annotation.Nullable java.util.List<Virtualizer> success) {
       this.success = success;
       return this;
     }
@@ -23007,45 +23657,44 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
           unsetSuccess();
         } else {
-          setSuccess((List<Virtualizer>)value);
+          setSuccess((java.util.List<Virtualizer>)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
         return getSuccess();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
       case SUCCESS:
         return isSetSuccess();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getVirtualizers_result)
         return this.equals((getVirtualizers_result)that);
       return false;
@@ -23054,6 +23703,8 @@ public class SatelliteServer {
     public boolean equals(getVirtualizers_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_success = true && this.isSetSuccess();
       boolean that_present_success = true && that.isSetSuccess();
@@ -23069,14 +23720,13 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -23087,7 +23737,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -23100,21 +23750,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getVirtualizers_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getVirtualizers_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -23141,7 +23792,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -23149,13 +23800,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class getVirtualizers_resultStandardSchemeFactory implements SchemeFactory {
+    private static class getVirtualizers_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getVirtualizers_resultStandardScheme getScheme() {
         return new getVirtualizers_resultStandardScheme();
       }
     }
 
-    private static class getVirtualizers_resultStandardScheme extends StandardScheme<getVirtualizers_result> {
+    private static class getVirtualizers_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<getVirtualizers_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getVirtualizers_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -23170,14 +23821,14 @@ public class SatelliteServer {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list250 = iprot.readListBegin();
-                  struct.success = new ArrayList<Virtualizer>(_list250.size);
-                  Virtualizer _elem251;
-                  for (int _i252 = 0; _i252 < _list250.size; ++_i252)
+                  org.apache.thrift.protocol.TList _list330 = iprot.readListBegin();
+                  struct.success = new java.util.ArrayList<Virtualizer>(_list330.size);
+                  @org.apache.thrift.annotation.Nullable Virtualizer _elem331;
+                  for (int _i332 = 0; _i332 < _list330.size; ++_i332)
                   {
-                    _elem251 = new Virtualizer();
-                    _elem251.read(iprot);
-                    struct.success.add(_elem251);
+                    _elem331 = new Virtualizer();
+                    _elem331.read(iprot);
+                    struct.success.add(_elem331);
                   }
                   iprot.readListEnd();
                 }
@@ -23205,9 +23856,9 @@ public class SatelliteServer {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
-            for (Virtualizer _iter253 : struct.success)
+            for (Virtualizer _iter333 : struct.success)
             {
-              _iter253.write(oprot);
+              _iter333.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -23219,18 +23870,18 @@ public class SatelliteServer {
 
     }
 
-    private static class getVirtualizers_resultTupleSchemeFactory implements SchemeFactory {
+    private static class getVirtualizers_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getVirtualizers_resultTupleScheme getScheme() {
         return new getVirtualizers_resultTupleScheme();
       }
     }
 
-    private static class getVirtualizers_resultTupleScheme extends TupleScheme<getVirtualizers_result> {
+    private static class getVirtualizers_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<getVirtualizers_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getVirtualizers_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
           optionals.set(0);
         }
@@ -23238,9 +23889,9 @@ public class SatelliteServer {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (Virtualizer _iter254 : struct.success)
+            for (Virtualizer _iter334 : struct.success)
             {
-              _iter254.write(oprot);
+              _iter334.write(oprot);
             }
           }
         }
@@ -23248,18 +23899,18 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getVirtualizers_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(1);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list255 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new ArrayList<Virtualizer>(_list255.size);
-            Virtualizer _elem256;
-            for (int _i257 = 0; _i257 < _list255.size; ++_i257)
+            org.apache.thrift.protocol.TList _list335 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.success = new java.util.ArrayList<Virtualizer>(_list335.size);
+            @org.apache.thrift.annotation.Nullable Virtualizer _elem336;
+            for (int _i337 = 0; _i337 < _list335.size; ++_i337)
             {
-              _elem256 = new Virtualizer();
-              _elem256.read(iprot);
-              struct.success.add(_elem256);
+              _elem336 = new Virtualizer();
+              _elem336.read(iprot);
+              struct.success.add(_elem336);
             }
           }
           struct.setSuccessIsSet(true);
@@ -23267,27 +23918,27 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getAllOrganizations_args implements org.apache.thrift.TBase<getAllOrganizations_args, getAllOrganizations_args._Fields>, java.io.Serializable, Cloneable, Comparable<getAllOrganizations_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getAllOrganizations_args");
 
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getAllOrganizations_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getAllOrganizations_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getAllOrganizations_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getAllOrganizations_argsTupleSchemeFactory();
 
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
 ;
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -23295,6 +23946,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           default:
@@ -23308,21 +23960,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -23331,14 +23984,14 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getAllOrganizations_args.class, metaDataMap);
     }
 
@@ -23359,32 +24012,31 @@ public class SatelliteServer {
     public void clear() {
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getAllOrganizations_args)
         return this.equals((getAllOrganizations_args)that);
       return false;
@@ -23393,15 +24045,17 @@ public class SatelliteServer {
     public boolean equals(getAllOrganizations_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       return true;
     }
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -23415,21 +24069,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getAllOrganizations_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getAllOrganizations_args(");
       boolean first = true;
 
       sb.append(")");
@@ -23449,7 +24104,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -23457,13 +24112,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class getAllOrganizations_argsStandardSchemeFactory implements SchemeFactory {
+    private static class getAllOrganizations_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getAllOrganizations_argsStandardScheme getScheme() {
         return new getAllOrganizations_argsStandardScheme();
       }
     }
 
-    private static class getAllOrganizations_argsStandardScheme extends StandardScheme<getAllOrganizations_args> {
+    private static class getAllOrganizations_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<getAllOrganizations_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getAllOrganizations_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -23496,25 +24151,28 @@ public class SatelliteServer {
 
     }
 
-    private static class getAllOrganizations_argsTupleSchemeFactory implements SchemeFactory {
+    private static class getAllOrganizations_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getAllOrganizations_argsTupleScheme getScheme() {
         return new getAllOrganizations_argsTupleScheme();
       }
     }
 
-    private static class getAllOrganizations_argsTupleScheme extends TupleScheme<getAllOrganizations_args> {
+    private static class getAllOrganizations_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<getAllOrganizations_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getAllOrganizations_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
       }
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getAllOrganizations_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getAllOrganizations_result implements org.apache.thrift.TBase<getAllOrganizations_result, getAllOrganizations_result._Fields>, java.io.Serializable, Cloneable, Comparable<getAllOrganizations_result>   {
@@ -23522,22 +24180,19 @@ public class SatelliteServer {
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getAllOrganizations_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getAllOrganizations_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getAllOrganizations_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getAllOrganizations_resultTupleSchemeFactory();
 
-    public List<Organization> success; // required
+    public @org.apache.thrift.annotation.Nullable java.util.List<Organization> success; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SUCCESS((short)0, "success");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -23545,6 +24200,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
@@ -23560,21 +24216,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -23583,19 +24240,19 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
               new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Organization.class))));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getAllOrganizations_result.class, metaDataMap);
     }
 
@@ -23603,7 +24260,7 @@ public class SatelliteServer {
     }
 
     public getAllOrganizations_result(
-      List<Organization> success)
+      java.util.List<Organization> success)
     {
       this();
       this.success = success;
@@ -23614,7 +24271,7 @@ public class SatelliteServer {
      */
     public getAllOrganizations_result(getAllOrganizations_result other) {
       if (other.isSetSuccess()) {
-        List<Organization> __this__success = new ArrayList<Organization>(other.success.size());
+        java.util.List<Organization> __this__success = new java.util.ArrayList<Organization>(other.success.size());
         for (Organization other_element : other.success) {
           __this__success.add(new Organization(other_element));
         }
@@ -23635,22 +24292,24 @@ public class SatelliteServer {
       return (this.success == null) ? 0 : this.success.size();
     }
 
+    @org.apache.thrift.annotation.Nullable
     public java.util.Iterator<Organization> getSuccessIterator() {
       return (this.success == null) ? null : this.success.iterator();
     }
 
     public void addToSuccess(Organization elem) {
       if (this.success == null) {
-        this.success = new ArrayList<Organization>();
+        this.success = new java.util.ArrayList<Organization>();
       }
       this.success.add(elem);
     }
 
-    public List<Organization> getSuccess() {
+    @org.apache.thrift.annotation.Nullable
+    public java.util.List<Organization> getSuccess() {
       return this.success;
     }
 
-    public getAllOrganizations_result setSuccess(List<Organization> success) {
+    public getAllOrganizations_result setSuccess(@org.apache.thrift.annotation.Nullable java.util.List<Organization> success) {
       this.success = success;
       return this;
     }
@@ -23670,45 +24329,44 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
           unsetSuccess();
         } else {
-          setSuccess((List<Organization>)value);
+          setSuccess((java.util.List<Organization>)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
         return getSuccess();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
       case SUCCESS:
         return isSetSuccess();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getAllOrganizations_result)
         return this.equals((getAllOrganizations_result)that);
       return false;
@@ -23717,6 +24375,8 @@ public class SatelliteServer {
     public boolean equals(getAllOrganizations_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_success = true && this.isSetSuccess();
       boolean that_present_success = true && that.isSetSuccess();
@@ -23732,14 +24392,13 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -23750,7 +24409,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -23763,21 +24422,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getAllOrganizations_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getAllOrganizations_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -23804,7 +24464,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -23812,13 +24472,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class getAllOrganizations_resultStandardSchemeFactory implements SchemeFactory {
+    private static class getAllOrganizations_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getAllOrganizations_resultStandardScheme getScheme() {
         return new getAllOrganizations_resultStandardScheme();
       }
     }
 
-    private static class getAllOrganizations_resultStandardScheme extends StandardScheme<getAllOrganizations_result> {
+    private static class getAllOrganizations_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<getAllOrganizations_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getAllOrganizations_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -23833,14 +24493,14 @@ public class SatelliteServer {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list258 = iprot.readListBegin();
-                  struct.success = new ArrayList<Organization>(_list258.size);
-                  Organization _elem259;
-                  for (int _i260 = 0; _i260 < _list258.size; ++_i260)
+                  org.apache.thrift.protocol.TList _list338 = iprot.readListBegin();
+                  struct.success = new java.util.ArrayList<Organization>(_list338.size);
+                  @org.apache.thrift.annotation.Nullable Organization _elem339;
+                  for (int _i340 = 0; _i340 < _list338.size; ++_i340)
                   {
-                    _elem259 = new Organization();
-                    _elem259.read(iprot);
-                    struct.success.add(_elem259);
+                    _elem339 = new Organization();
+                    _elem339.read(iprot);
+                    struct.success.add(_elem339);
                   }
                   iprot.readListEnd();
                 }
@@ -23868,9 +24528,9 @@ public class SatelliteServer {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
-            for (Organization _iter261 : struct.success)
+            for (Organization _iter341 : struct.success)
             {
-              _iter261.write(oprot);
+              _iter341.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -23882,18 +24542,18 @@ public class SatelliteServer {
 
     }
 
-    private static class getAllOrganizations_resultTupleSchemeFactory implements SchemeFactory {
+    private static class getAllOrganizations_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getAllOrganizations_resultTupleScheme getScheme() {
         return new getAllOrganizations_resultTupleScheme();
       }
     }
 
-    private static class getAllOrganizations_resultTupleScheme extends TupleScheme<getAllOrganizations_result> {
+    private static class getAllOrganizations_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<getAllOrganizations_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getAllOrganizations_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
           optionals.set(0);
         }
@@ -23901,9 +24561,9 @@ public class SatelliteServer {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (Organization _iter262 : struct.success)
+            for (Organization _iter342 : struct.success)
             {
-              _iter262.write(oprot);
+              _iter342.write(oprot);
             }
           }
         }
@@ -23911,18 +24571,18 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getAllOrganizations_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(1);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list263 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new ArrayList<Organization>(_list263.size);
-            Organization _elem264;
-            for (int _i265 = 0; _i265 < _list263.size; ++_i265)
+            org.apache.thrift.protocol.TList _list343 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.success = new java.util.ArrayList<Organization>(_list343.size);
+            @org.apache.thrift.annotation.Nullable Organization _elem344;
+            for (int _i345 = 0; _i345 < _list343.size; ++_i345)
             {
-              _elem264 = new Organization();
-              _elem264.read(iprot);
-              struct.success.add(_elem264);
+              _elem344 = new Organization();
+              _elem344.read(iprot);
+              struct.success.add(_elem344);
             }
           }
           struct.setSuccessIsSet(true);
@@ -23930,27 +24590,27 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getLocations_args implements org.apache.thrift.TBase<getLocations_args, getLocations_args._Fields>, java.io.Serializable, Cloneable, Comparable<getLocations_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getLocations_args");
 
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getLocations_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getLocations_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getLocations_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getLocations_argsTupleSchemeFactory();
 
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
 ;
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -23958,6 +24618,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           default:
@@ -23971,21 +24632,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -23994,14 +24656,14 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getLocations_args.class, metaDataMap);
     }
 
@@ -24022,32 +24684,31 @@ public class SatelliteServer {
     public void clear() {
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getLocations_args)
         return this.equals((getLocations_args)that);
       return false;
@@ -24056,15 +24717,17 @@ public class SatelliteServer {
     public boolean equals(getLocations_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       return true;
     }
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -24078,21 +24741,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getLocations_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getLocations_args(");
       boolean first = true;
 
       sb.append(")");
@@ -24112,7 +24776,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -24120,13 +24784,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class getLocations_argsStandardSchemeFactory implements SchemeFactory {
+    private static class getLocations_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getLocations_argsStandardScheme getScheme() {
         return new getLocations_argsStandardScheme();
       }
     }
 
-    private static class getLocations_argsStandardScheme extends StandardScheme<getLocations_args> {
+    private static class getLocations_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<getLocations_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getLocations_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -24159,25 +24823,28 @@ public class SatelliteServer {
 
     }
 
-    private static class getLocations_argsTupleSchemeFactory implements SchemeFactory {
+    private static class getLocations_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getLocations_argsTupleScheme getScheme() {
         return new getLocations_argsTupleScheme();
       }
     }
 
-    private static class getLocations_argsTupleScheme extends TupleScheme<getLocations_args> {
+    private static class getLocations_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<getLocations_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getLocations_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
       }
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getLocations_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getLocations_result implements org.apache.thrift.TBase<getLocations_result, getLocations_result._Fields>, java.io.Serializable, Cloneable, Comparable<getLocations_result>   {
@@ -24185,22 +24852,19 @@ public class SatelliteServer {
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getLocations_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getLocations_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getLocations_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getLocations_resultTupleSchemeFactory();
 
-    public List<Location> success; // required
+    public @org.apache.thrift.annotation.Nullable java.util.List<Location> success; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SUCCESS((short)0, "success");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -24208,6 +24872,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
@@ -24223,21 +24888,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -24246,19 +24912,19 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
               new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Location.class))));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getLocations_result.class, metaDataMap);
     }
 
@@ -24266,7 +24932,7 @@ public class SatelliteServer {
     }
 
     public getLocations_result(
-      List<Location> success)
+      java.util.List<Location> success)
     {
       this();
       this.success = success;
@@ -24277,7 +24943,7 @@ public class SatelliteServer {
      */
     public getLocations_result(getLocations_result other) {
       if (other.isSetSuccess()) {
-        List<Location> __this__success = new ArrayList<Location>(other.success.size());
+        java.util.List<Location> __this__success = new java.util.ArrayList<Location>(other.success.size());
         for (Location other_element : other.success) {
           __this__success.add(new Location(other_element));
         }
@@ -24298,22 +24964,24 @@ public class SatelliteServer {
       return (this.success == null) ? 0 : this.success.size();
     }
 
+    @org.apache.thrift.annotation.Nullable
     public java.util.Iterator<Location> getSuccessIterator() {
       return (this.success == null) ? null : this.success.iterator();
     }
 
     public void addToSuccess(Location elem) {
       if (this.success == null) {
-        this.success = new ArrayList<Location>();
+        this.success = new java.util.ArrayList<Location>();
       }
       this.success.add(elem);
     }
 
-    public List<Location> getSuccess() {
+    @org.apache.thrift.annotation.Nullable
+    public java.util.List<Location> getSuccess() {
       return this.success;
     }
 
-    public getLocations_result setSuccess(List<Location> success) {
+    public getLocations_result setSuccess(@org.apache.thrift.annotation.Nullable java.util.List<Location> success) {
       this.success = success;
       return this;
     }
@@ -24333,45 +25001,44 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
           unsetSuccess();
         } else {
-          setSuccess((List<Location>)value);
+          setSuccess((java.util.List<Location>)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
         return getSuccess();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
       case SUCCESS:
         return isSetSuccess();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getLocations_result)
         return this.equals((getLocations_result)that);
       return false;
@@ -24380,6 +25047,8 @@ public class SatelliteServer {
     public boolean equals(getLocations_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_success = true && this.isSetSuccess();
       boolean that_present_success = true && that.isSetSuccess();
@@ -24395,14 +25064,13 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -24413,7 +25081,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -24426,21 +25094,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getLocations_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getLocations_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -24467,7 +25136,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -24475,13 +25144,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class getLocations_resultStandardSchemeFactory implements SchemeFactory {
+    private static class getLocations_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getLocations_resultStandardScheme getScheme() {
         return new getLocations_resultStandardScheme();
       }
     }
 
-    private static class getLocations_resultStandardScheme extends StandardScheme<getLocations_result> {
+    private static class getLocations_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<getLocations_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getLocations_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -24496,14 +25165,14 @@ public class SatelliteServer {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list266 = iprot.readListBegin();
-                  struct.success = new ArrayList<Location>(_list266.size);
-                  Location _elem267;
-                  for (int _i268 = 0; _i268 < _list266.size; ++_i268)
+                  org.apache.thrift.protocol.TList _list346 = iprot.readListBegin();
+                  struct.success = new java.util.ArrayList<Location>(_list346.size);
+                  @org.apache.thrift.annotation.Nullable Location _elem347;
+                  for (int _i348 = 0; _i348 < _list346.size; ++_i348)
                   {
-                    _elem267 = new Location();
-                    _elem267.read(iprot);
-                    struct.success.add(_elem267);
+                    _elem347 = new Location();
+                    _elem347.read(iprot);
+                    struct.success.add(_elem347);
                   }
                   iprot.readListEnd();
                 }
@@ -24531,9 +25200,9 @@ public class SatelliteServer {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
-            for (Location _iter269 : struct.success)
+            for (Location _iter349 : struct.success)
             {
-              _iter269.write(oprot);
+              _iter349.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -24545,18 +25214,18 @@ public class SatelliteServer {
 
     }
 
-    private static class getLocations_resultTupleSchemeFactory implements SchemeFactory {
+    private static class getLocations_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getLocations_resultTupleScheme getScheme() {
         return new getLocations_resultTupleScheme();
       }
     }
 
-    private static class getLocations_resultTupleScheme extends TupleScheme<getLocations_result> {
+    private static class getLocations_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<getLocations_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getLocations_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
           optionals.set(0);
         }
@@ -24564,9 +25233,9 @@ public class SatelliteServer {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (Location _iter270 : struct.success)
+            for (Location _iter350 : struct.success)
             {
-              _iter270.write(oprot);
+              _iter350.write(oprot);
             }
           }
         }
@@ -24574,18 +25243,18 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getLocations_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(1);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list271 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new ArrayList<Location>(_list271.size);
-            Location _elem272;
-            for (int _i273 = 0; _i273 < _list271.size; ++_i273)
+            org.apache.thrift.protocol.TList _list351 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.success = new java.util.ArrayList<Location>(_list351.size);
+            @org.apache.thrift.annotation.Nullable Location _elem352;
+            for (int _i353 = 0; _i353 < _list351.size; ++_i353)
             {
-              _elem272 = new Location();
-              _elem272.read(iprot);
-              struct.success.add(_elem272);
+              _elem352 = new Location();
+              _elem352.read(iprot);
+              struct.success.add(_elem352);
             }
           }
           struct.setSuccessIsSet(true);
@@ -24593,27 +25262,27 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getStatus_args implements org.apache.thrift.TBase<getStatus_args, getStatus_args._Fields>, java.io.Serializable, Cloneable, Comparable<getStatus_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getStatus_args");
 
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getStatus_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getStatus_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getStatus_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getStatus_argsTupleSchemeFactory();
 
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
 ;
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -24621,6 +25290,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           default:
@@ -24634,21 +25304,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -24657,14 +25328,14 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getStatus_args.class, metaDataMap);
     }
 
@@ -24685,32 +25356,31 @@ public class SatelliteServer {
     public void clear() {
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getStatus_args)
         return this.equals((getStatus_args)that);
       return false;
@@ -24719,15 +25389,17 @@ public class SatelliteServer {
     public boolean equals(getStatus_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       return true;
     }
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -24741,21 +25413,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getStatus_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getStatus_args(");
       boolean first = true;
 
       sb.append(")");
@@ -24775,7 +25448,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -24783,13 +25456,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class getStatus_argsStandardSchemeFactory implements SchemeFactory {
+    private static class getStatus_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getStatus_argsStandardScheme getScheme() {
         return new getStatus_argsStandardScheme();
       }
     }
 
-    private static class getStatus_argsStandardScheme extends StandardScheme<getStatus_args> {
+    private static class getStatus_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<getStatus_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getStatus_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -24822,25 +25495,28 @@ public class SatelliteServer {
 
     }
 
-    private static class getStatus_argsTupleSchemeFactory implements SchemeFactory {
+    private static class getStatus_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getStatus_argsTupleScheme getScheme() {
         return new getStatus_argsTupleScheme();
       }
     }
 
-    private static class getStatus_argsTupleScheme extends TupleScheme<getStatus_args> {
+    private static class getStatus_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<getStatus_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getStatus_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
       }
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getStatus_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getStatus_result implements org.apache.thrift.TBase<getStatus_result, getStatus_result._Fields>, java.io.Serializable, Cloneable, Comparable<getStatus_result>   {
@@ -24848,22 +25524,19 @@ public class SatelliteServer {
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getStatus_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getStatus_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getStatus_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getStatus_resultTupleSchemeFactory();
 
-    public SatelliteStatus success; // required
+    public @org.apache.thrift.annotation.Nullable SatelliteStatus success; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       SUCCESS((short)0, "success");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -24871,6 +25544,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
@@ -24886,21 +25560,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -24909,18 +25584,18 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, SatelliteStatus.class)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getStatus_result.class, metaDataMap);
     }
 
@@ -24952,11 +25627,12 @@ public class SatelliteServer {
       this.success = null;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public SatelliteStatus getSuccess() {
       return this.success;
     }
 
-    public getStatus_result setSuccess(SatelliteStatus success) {
+    public getStatus_result setSuccess(@org.apache.thrift.annotation.Nullable SatelliteStatus success) {
       this.success = success;
       return this;
     }
@@ -24976,7 +25652,7 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
@@ -24989,32 +25665,31 @@ public class SatelliteServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
         return getSuccess();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
       case SUCCESS:
         return isSetSuccess();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getStatus_result)
         return this.equals((getStatus_result)that);
       return false;
@@ -25023,6 +25698,8 @@ public class SatelliteServer {
     public boolean equals(getStatus_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_success = true && this.isSetSuccess();
       boolean that_present_success = true && that.isSetSuccess();
@@ -25038,14 +25715,13 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -25056,7 +25732,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -25069,21 +25745,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getStatus_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getStatus_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -25113,7 +25790,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -25121,13 +25798,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class getStatus_resultStandardSchemeFactory implements SchemeFactory {
+    private static class getStatus_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getStatus_resultStandardScheme getScheme() {
         return new getStatus_resultStandardScheme();
       }
     }
 
-    private static class getStatus_resultStandardScheme extends StandardScheme<getStatus_result> {
+    private static class getStatus_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<getStatus_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getStatus_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -25174,18 +25851,18 @@ public class SatelliteServer {
 
     }
 
-    private static class getStatus_resultTupleSchemeFactory implements SchemeFactory {
+    private static class getStatus_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getStatus_resultTupleScheme getScheme() {
         return new getStatus_resultTupleScheme();
       }
     }
 
-    private static class getStatus_resultTupleScheme extends TupleScheme<getStatus_result> {
+    private static class getStatus_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<getStatus_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getStatus_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
           optionals.set(0);
         }
@@ -25197,8 +25874,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getStatus_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(1);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
           struct.success = new SatelliteStatus();
           struct.success.read(iprot);
@@ -25207,6 +25884,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getImageList_args implements org.apache.thrift.TBase<getImageList_args, getImageList_args._Fields>, java.io.Serializable, Cloneable, Comparable<getImageList_args>   {
@@ -25216,14 +25896,11 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField TAG_SEARCH_FIELD_DESC = new org.apache.thrift.protocol.TField("tagSearch", org.apache.thrift.protocol.TType.LIST, (short)2);
     private static final org.apache.thrift.protocol.TField PAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("page", org.apache.thrift.protocol.TType.I32, (short)3);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getImageList_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getImageList_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getImageList_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getImageList_argsTupleSchemeFactory();
 
-    public String userToken; // required
-    public List<String> tagSearch; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String userToken; // required
+    public @org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> tagSearch; // required
     public int page; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@@ -25232,10 +25909,10 @@ public class SatelliteServer {
       TAG_SEARCH((short)2, "tagSearch"),
       PAGE((short)3, "page");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -25243,6 +25920,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // USER_TOKEN
@@ -25262,21 +25940,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -25285,7 +25964,7 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
@@ -25293,9 +25972,9 @@ public class SatelliteServer {
     // isset id assignments
     private static final int __PAGE_ISSET_ID = 0;
     private byte __isset_bitfield = 0;
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.USER_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("userToken", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
       tmpMap.put(_Fields.TAG_SEARCH, new org.apache.thrift.meta_data.FieldMetaData("tagSearch", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -25303,7 +25982,7 @@ public class SatelliteServer {
               new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
       tmpMap.put(_Fields.PAGE, new org.apache.thrift.meta_data.FieldMetaData("page", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getImageList_args.class, metaDataMap);
     }
 
@@ -25311,8 +25990,8 @@ public class SatelliteServer {
     }
 
     public getImageList_args(
-      String userToken,
-      List<String> tagSearch,
+      java.lang.String userToken,
+      java.util.List<java.lang.String> tagSearch,
       int page)
     {
       this();
@@ -25331,7 +26010,7 @@ public class SatelliteServer {
         this.userToken = other.userToken;
       }
       if (other.isSetTagSearch()) {
-        List<String> __this__tagSearch = new ArrayList<String>(other.tagSearch);
+        java.util.List<java.lang.String> __this__tagSearch = new java.util.ArrayList<java.lang.String>(other.tagSearch);
         this.tagSearch = __this__tagSearch;
       }
       this.page = other.page;
@@ -25349,11 +26028,12 @@ public class SatelliteServer {
       this.page = 0;
     }
 
-    public String getUserToken() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getUserToken() {
       return this.userToken;
     }
 
-    public getImageList_args setUserToken(String userToken) {
+    public getImageList_args setUserToken(@org.apache.thrift.annotation.Nullable java.lang.String userToken) {
       this.userToken = userToken;
       return this;
     }
@@ -25377,22 +26057,24 @@ public class SatelliteServer {
       return (this.tagSearch == null) ? 0 : this.tagSearch.size();
     }
 
-    public java.util.Iterator<String> getTagSearchIterator() {
+    @org.apache.thrift.annotation.Nullable
+    public java.util.Iterator<java.lang.String> getTagSearchIterator() {
       return (this.tagSearch == null) ? null : this.tagSearch.iterator();
     }
 
-    public void addToTagSearch(String elem) {
+    public void addToTagSearch(java.lang.String elem) {
       if (this.tagSearch == null) {
-        this.tagSearch = new ArrayList<String>();
+        this.tagSearch = new java.util.ArrayList<java.lang.String>();
       }
       this.tagSearch.add(elem);
     }
 
-    public List<String> getTagSearch() {
+    @org.apache.thrift.annotation.Nullable
+    public java.util.List<java.lang.String> getTagSearch() {
       return this.tagSearch;
     }
 
-    public getImageList_args setTagSearch(List<String> tagSearch) {
+    public getImageList_args setTagSearch(@org.apache.thrift.annotation.Nullable java.util.List<java.lang.String> tagSearch) {
       this.tagSearch = tagSearch;
       return this;
     }
@@ -25423,25 +26105,25 @@ public class SatelliteServer {
     }
 
     public void unsetPage() {
-      __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __PAGE_ISSET_ID);
+      __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __PAGE_ISSET_ID);
     }
 
     /** Returns true if field page is set (has been assigned a value) and false otherwise */
     public boolean isSetPage() {
-      return EncodingUtils.testBit(__isset_bitfield, __PAGE_ISSET_ID);
+      return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __PAGE_ISSET_ID);
     }
 
     public void setPageIsSet(boolean value) {
-      __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __PAGE_ISSET_ID, value);
+      __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __PAGE_ISSET_ID, value);
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case USER_TOKEN:
         if (value == null) {
           unsetUserToken();
         } else {
-          setUserToken((String)value);
+          setUserToken((java.lang.String)value);
         }
         break;
 
@@ -25449,7 +26131,7 @@ public class SatelliteServer {
         if (value == null) {
           unsetTagSearch();
         } else {
-          setTagSearch((List<String>)value);
+          setTagSearch((java.util.List<java.lang.String>)value);
         }
         break;
 
@@ -25457,14 +26139,15 @@ public class SatelliteServer {
         if (value == null) {
           unsetPage();
         } else {
-          setPage((Integer)value);
+          setPage((java.lang.Integer)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case USER_TOKEN:
         return getUserToken();
@@ -25476,13 +26159,13 @@ public class SatelliteServer {
         return getPage();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -25493,13 +26176,11 @@ public class SatelliteServer {
       case PAGE:
         return isSetPage();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getImageList_args)
         return this.equals((getImageList_args)that);
       return false;
@@ -25508,6 +26189,8 @@ public class SatelliteServer {
     public boolean equals(getImageList_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_userToken = true && this.isSetUserToken();
       boolean that_present_userToken = true && that.isSetUserToken();
@@ -25541,24 +26224,19 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_userToken = true && (isSetUserToken());
-      list.add(present_userToken);
-      if (present_userToken)
-        list.add(userToken);
+      hashCode = hashCode * 8191 + ((isSetUserToken()) ? 131071 : 524287);
+      if (isSetUserToken())
+        hashCode = hashCode * 8191 + userToken.hashCode();
 
-      boolean present_tagSearch = true && (isSetTagSearch());
-      list.add(present_tagSearch);
-      if (present_tagSearch)
-        list.add(tagSearch);
+      hashCode = hashCode * 8191 + ((isSetTagSearch()) ? 131071 : 524287);
+      if (isSetTagSearch())
+        hashCode = hashCode * 8191 + tagSearch.hashCode();
 
-      boolean present_page = true;
-      list.add(present_page);
-      if (present_page)
-        list.add(page);
+      hashCode = hashCode * 8191 + page;
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -25569,7 +26247,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetUserToken()).compareTo(other.isSetUserToken());
+      lastComparison = java.lang.Boolean.compare(isSetUserToken(), other.isSetUserToken());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -25579,7 +26257,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetTagSearch()).compareTo(other.isSetTagSearch());
+      lastComparison = java.lang.Boolean.compare(isSetTagSearch(), other.isSetTagSearch());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -25589,7 +26267,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetPage()).compareTo(other.isSetPage());
+      lastComparison = java.lang.Boolean.compare(isSetPage(), other.isSetPage());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -25602,21 +26280,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getImageList_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getImageList_args(");
       boolean first = true;
 
       sb.append("userToken:");
@@ -25655,7 +26334,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
         __isset_bitfield = 0;
@@ -25665,13 +26344,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class getImageList_argsStandardSchemeFactory implements SchemeFactory {
+    private static class getImageList_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getImageList_argsStandardScheme getScheme() {
         return new getImageList_argsStandardScheme();
       }
     }
 
-    private static class getImageList_argsStandardScheme extends StandardScheme<getImageList_args> {
+    private static class getImageList_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<getImageList_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getImageList_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -25694,13 +26373,13 @@ public class SatelliteServer {
             case 2: // TAG_SEARCH
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list274 = iprot.readListBegin();
-                  struct.tagSearch = new ArrayList<String>(_list274.size);
-                  String _elem275;
-                  for (int _i276 = 0; _i276 < _list274.size; ++_i276)
+                  org.apache.thrift.protocol.TList _list354 = iprot.readListBegin();
+                  struct.tagSearch = new java.util.ArrayList<java.lang.String>(_list354.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _elem355;
+                  for (int _i356 = 0; _i356 < _list354.size; ++_i356)
                   {
-                    _elem275 = iprot.readString();
-                    struct.tagSearch.add(_elem275);
+                    _elem355 = iprot.readString();
+                    struct.tagSearch.add(_elem355);
                   }
                   iprot.readListEnd();
                 }
@@ -25741,9 +26420,9 @@ public class SatelliteServer {
           oprot.writeFieldBegin(TAG_SEARCH_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.tagSearch.size()));
-            for (String _iter277 : struct.tagSearch)
+            for (java.lang.String _iter357 : struct.tagSearch)
             {
-              oprot.writeString(_iter277);
+              oprot.writeString(_iter357);
             }
             oprot.writeListEnd();
           }
@@ -25758,18 +26437,18 @@ public class SatelliteServer {
 
     }
 
-    private static class getImageList_argsTupleSchemeFactory implements SchemeFactory {
+    private static class getImageList_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getImageList_argsTupleScheme getScheme() {
         return new getImageList_argsTupleScheme();
       }
     }
 
-    private static class getImageList_argsTupleScheme extends TupleScheme<getImageList_args> {
+    private static class getImageList_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<getImageList_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getImageList_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetUserToken()) {
           optionals.set(0);
         }
@@ -25786,9 +26465,9 @@ public class SatelliteServer {
         if (struct.isSetTagSearch()) {
           {
             oprot.writeI32(struct.tagSearch.size());
-            for (String _iter278 : struct.tagSearch)
+            for (java.lang.String _iter358 : struct.tagSearch)
             {
-              oprot.writeString(_iter278);
+              oprot.writeString(_iter358);
             }
           }
         }
@@ -25799,21 +26478,21 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getImageList_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(3);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           struct.userToken = iprot.readString();
           struct.setUserTokenIsSet(true);
         }
         if (incoming.get(1)) {
           {
-            org.apache.thrift.protocol.TList _list279 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-            struct.tagSearch = new ArrayList<String>(_list279.size);
-            String _elem280;
-            for (int _i281 = 0; _i281 < _list279.size; ++_i281)
+            org.apache.thrift.protocol.TList _list359 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+            struct.tagSearch = new java.util.ArrayList<java.lang.String>(_list359.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _elem360;
+            for (int _i361 = 0; _i361 < _list359.size; ++_i361)
             {
-              _elem280 = iprot.readString();
-              struct.tagSearch.add(_elem280);
+              _elem360 = iprot.readString();
+              struct.tagSearch.add(_elem360);
             }
           }
           struct.setTagSearchIsSet(true);
@@ -25825,6 +26504,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getImageList_result implements org.apache.thrift.TBase<getImageList_result, getImageList_result._Fields>, java.io.Serializable, Cloneable, Comparable<getImageList_result>   {
@@ -25834,15 +26516,12 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField AUTH_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("authError", org.apache.thrift.protocol.TType.STRUCT, (short)1);
     private static final org.apache.thrift.protocol.TField SERVER_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("serverError", org.apache.thrift.protocol.TType.STRUCT, (short)2);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getImageList_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getImageList_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getImageList_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getImageList_resultTupleSchemeFactory();
 
-    public List<ImageSummaryRead> success; // required
-    public TAuthorizationException authError; // required
-    public TInvocationException serverError; // required
+    public @org.apache.thrift.annotation.Nullable java.util.List<ImageSummaryRead> success; // required
+    public @org.apache.thrift.annotation.Nullable TAuthorizationException authError; // required
+    public @org.apache.thrift.annotation.Nullable TInvocationException serverError; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -25850,10 +26529,10 @@ public class SatelliteServer {
       AUTH_ERROR((short)1, "authError"),
       SERVER_ERROR((short)2, "serverError");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -25861,6 +26540,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
@@ -25880,21 +26560,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -25903,23 +26584,23 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
               new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ImageSummaryRead.class))));
       tmpMap.put(_Fields.AUTH_ERROR, new org.apache.thrift.meta_data.FieldMetaData("authError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class)));
       tmpMap.put(_Fields.SERVER_ERROR, new org.apache.thrift.meta_data.FieldMetaData("serverError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getImageList_result.class, metaDataMap);
     }
 
@@ -25927,7 +26608,7 @@ public class SatelliteServer {
     }
 
     public getImageList_result(
-      List<ImageSummaryRead> success,
+      java.util.List<ImageSummaryRead> success,
       TAuthorizationException authError,
       TInvocationException serverError)
     {
@@ -25942,7 +26623,7 @@ public class SatelliteServer {
      */
     public getImageList_result(getImageList_result other) {
       if (other.isSetSuccess()) {
-        List<ImageSummaryRead> __this__success = new ArrayList<ImageSummaryRead>(other.success.size());
+        java.util.List<ImageSummaryRead> __this__success = new java.util.ArrayList<ImageSummaryRead>(other.success.size());
         for (ImageSummaryRead other_element : other.success) {
           __this__success.add(new ImageSummaryRead(other_element));
         }
@@ -25971,22 +26652,24 @@ public class SatelliteServer {
       return (this.success == null) ? 0 : this.success.size();
     }
 
+    @org.apache.thrift.annotation.Nullable
     public java.util.Iterator<ImageSummaryRead> getSuccessIterator() {
       return (this.success == null) ? null : this.success.iterator();
     }
 
     public void addToSuccess(ImageSummaryRead elem) {
       if (this.success == null) {
-        this.success = new ArrayList<ImageSummaryRead>();
+        this.success = new java.util.ArrayList<ImageSummaryRead>();
       }
       this.success.add(elem);
     }
 
-    public List<ImageSummaryRead> getSuccess() {
+    @org.apache.thrift.annotation.Nullable
+    public java.util.List<ImageSummaryRead> getSuccess() {
       return this.success;
     }
 
-    public getImageList_result setSuccess(List<ImageSummaryRead> success) {
+    public getImageList_result setSuccess(@org.apache.thrift.annotation.Nullable java.util.List<ImageSummaryRead> success) {
       this.success = success;
       return this;
     }
@@ -26006,11 +26689,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TAuthorizationException getAuthError() {
       return this.authError;
     }
 
-    public getImageList_result setAuthError(TAuthorizationException authError) {
+    public getImageList_result setAuthError(@org.apache.thrift.annotation.Nullable TAuthorizationException authError) {
       this.authError = authError;
       return this;
     }
@@ -26030,11 +26714,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvocationException getServerError() {
       return this.serverError;
     }
 
-    public getImageList_result setServerError(TInvocationException serverError) {
+    public getImageList_result setServerError(@org.apache.thrift.annotation.Nullable TInvocationException serverError) {
       this.serverError = serverError;
       return this;
     }
@@ -26054,13 +26739,13 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
           unsetSuccess();
         } else {
-          setSuccess((List<ImageSummaryRead>)value);
+          setSuccess((java.util.List<ImageSummaryRead>)value);
         }
         break;
 
@@ -26083,7 +26768,8 @@ public class SatelliteServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
         return getSuccess();
@@ -26095,13 +26781,13 @@ public class SatelliteServer {
         return getServerError();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -26112,13 +26798,11 @@ public class SatelliteServer {
       case SERVER_ERROR:
         return isSetServerError();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getImageList_result)
         return this.equals((getImageList_result)that);
       return false;
@@ -26127,6 +26811,8 @@ public class SatelliteServer {
     public boolean equals(getImageList_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_success = true && this.isSetSuccess();
       boolean that_present_success = true && that.isSetSuccess();
@@ -26160,24 +26846,21 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
 
-      boolean present_authError = true && (isSetAuthError());
-      list.add(present_authError);
-      if (present_authError)
-        list.add(authError);
+      hashCode = hashCode * 8191 + ((isSetAuthError()) ? 131071 : 524287);
+      if (isSetAuthError())
+        hashCode = hashCode * 8191 + authError.hashCode();
 
-      boolean present_serverError = true && (isSetServerError());
-      list.add(present_serverError);
-      if (present_serverError)
-        list.add(serverError);
+      hashCode = hashCode * 8191 + ((isSetServerError()) ? 131071 : 524287);
+      if (isSetServerError())
+        hashCode = hashCode * 8191 + serverError.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -26188,7 +26871,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -26198,7 +26881,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetAuthError()).compareTo(other.isSetAuthError());
+      lastComparison = java.lang.Boolean.compare(isSetAuthError(), other.isSetAuthError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -26208,7 +26891,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetServerError()).compareTo(other.isSetServerError());
+      lastComparison = java.lang.Boolean.compare(isSetServerError(), other.isSetServerError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -26221,21 +26904,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getImageList_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getImageList_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -26278,7 +26962,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -26286,13 +26970,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class getImageList_resultStandardSchemeFactory implements SchemeFactory {
+    private static class getImageList_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getImageList_resultStandardScheme getScheme() {
         return new getImageList_resultStandardScheme();
       }
     }
 
-    private static class getImageList_resultStandardScheme extends StandardScheme<getImageList_result> {
+    private static class getImageList_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<getImageList_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getImageList_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -26307,14 +26991,14 @@ public class SatelliteServer {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list282 = iprot.readListBegin();
-                  struct.success = new ArrayList<ImageSummaryRead>(_list282.size);
-                  ImageSummaryRead _elem283;
-                  for (int _i284 = 0; _i284 < _list282.size; ++_i284)
+                  org.apache.thrift.protocol.TList _list362 = iprot.readListBegin();
+                  struct.success = new java.util.ArrayList<ImageSummaryRead>(_list362.size);
+                  @org.apache.thrift.annotation.Nullable ImageSummaryRead _elem363;
+                  for (int _i364 = 0; _i364 < _list362.size; ++_i364)
                   {
-                    _elem283 = new ImageSummaryRead();
-                    _elem283.read(iprot);
-                    struct.success.add(_elem283);
+                    _elem363 = new ImageSummaryRead();
+                    _elem363.read(iprot);
+                    struct.success.add(_elem363);
                   }
                   iprot.readListEnd();
                 }
@@ -26360,9 +27044,9 @@ public class SatelliteServer {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
-            for (ImageSummaryRead _iter285 : struct.success)
+            for (ImageSummaryRead _iter365 : struct.success)
             {
-              _iter285.write(oprot);
+              _iter365.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -26384,18 +27068,18 @@ public class SatelliteServer {
 
     }
 
-    private static class getImageList_resultTupleSchemeFactory implements SchemeFactory {
+    private static class getImageList_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getImageList_resultTupleScheme getScheme() {
         return new getImageList_resultTupleScheme();
       }
     }
 
-    private static class getImageList_resultTupleScheme extends TupleScheme<getImageList_result> {
+    private static class getImageList_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<getImageList_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getImageList_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
           optionals.set(0);
         }
@@ -26409,9 +27093,9 @@ public class SatelliteServer {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (ImageSummaryRead _iter286 : struct.success)
+            for (ImageSummaryRead _iter366 : struct.success)
             {
-              _iter286.write(oprot);
+              _iter366.write(oprot);
             }
           }
         }
@@ -26425,18 +27109,18 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getImageList_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(3);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list287 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new ArrayList<ImageSummaryRead>(_list287.size);
-            ImageSummaryRead _elem288;
-            for (int _i289 = 0; _i289 < _list287.size; ++_i289)
+            org.apache.thrift.protocol.TList _list367 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.success = new java.util.ArrayList<ImageSummaryRead>(_list367.size);
+            @org.apache.thrift.annotation.Nullable ImageSummaryRead _elem368;
+            for (int _i369 = 0; _i369 < _list367.size; ++_i369)
             {
-              _elem288 = new ImageSummaryRead();
-              _elem288.read(iprot);
-              struct.success.add(_elem288);
+              _elem368 = new ImageSummaryRead();
+              _elem368.read(iprot);
+              struct.success.add(_elem368);
             }
           }
           struct.setSuccessIsSet(true);
@@ -26454,6 +27138,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getImageDetails_args implements org.apache.thrift.TBase<getImageDetails_args, getImageDetails_args._Fields>, java.io.Serializable, Cloneable, Comparable<getImageDetails_args>   {
@@ -26462,24 +27149,21 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField USER_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("userToken", org.apache.thrift.protocol.TType.STRING, (short)1);
     private static final org.apache.thrift.protocol.TField IMAGE_BASE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("imageBaseId", org.apache.thrift.protocol.TType.STRING, (short)2);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getImageDetails_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getImageDetails_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getImageDetails_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getImageDetails_argsTupleSchemeFactory();
 
-    public String userToken; // required
-    public String imageBaseId; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String userToken; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String imageBaseId; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       USER_TOKEN((short)1, "userToken"),
       IMAGE_BASE_ID((short)2, "imageBaseId");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -26487,6 +27171,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // USER_TOKEN
@@ -26504,21 +27189,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -26527,20 +27213,20 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.USER_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("userToken", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
       tmpMap.put(_Fields.IMAGE_BASE_ID, new org.apache.thrift.meta_data.FieldMetaData("imageBaseId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "UUID")));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getImageDetails_args.class, metaDataMap);
     }
 
@@ -26548,8 +27234,8 @@ public class SatelliteServer {
     }
 
     public getImageDetails_args(
-      String userToken,
-      String imageBaseId)
+      java.lang.String userToken,
+      java.lang.String imageBaseId)
     {
       this();
       this.userToken = userToken;
@@ -26578,11 +27264,12 @@ public class SatelliteServer {
       this.imageBaseId = null;
     }
 
-    public String getUserToken() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getUserToken() {
       return this.userToken;
     }
 
-    public getImageDetails_args setUserToken(String userToken) {
+    public getImageDetails_args setUserToken(@org.apache.thrift.annotation.Nullable java.lang.String userToken) {
       this.userToken = userToken;
       return this;
     }
@@ -26602,11 +27289,12 @@ public class SatelliteServer {
       }
     }
 
-    public String getImageBaseId() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getImageBaseId() {
       return this.imageBaseId;
     }
 
-    public getImageDetails_args setImageBaseId(String imageBaseId) {
+    public getImageDetails_args setImageBaseId(@org.apache.thrift.annotation.Nullable java.lang.String imageBaseId) {
       this.imageBaseId = imageBaseId;
       return this;
     }
@@ -26626,13 +27314,13 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case USER_TOKEN:
         if (value == null) {
           unsetUserToken();
         } else {
-          setUserToken((String)value);
+          setUserToken((java.lang.String)value);
         }
         break;
 
@@ -26640,14 +27328,15 @@ public class SatelliteServer {
         if (value == null) {
           unsetImageBaseId();
         } else {
-          setImageBaseId((String)value);
+          setImageBaseId((java.lang.String)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case USER_TOKEN:
         return getUserToken();
@@ -26656,13 +27345,13 @@ public class SatelliteServer {
         return getImageBaseId();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -26671,13 +27360,11 @@ public class SatelliteServer {
       case IMAGE_BASE_ID:
         return isSetImageBaseId();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getImageDetails_args)
         return this.equals((getImageDetails_args)that);
       return false;
@@ -26686,6 +27373,8 @@ public class SatelliteServer {
     public boolean equals(getImageDetails_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_userToken = true && this.isSetUserToken();
       boolean that_present_userToken = true && that.isSetUserToken();
@@ -26710,19 +27399,17 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_userToken = true && (isSetUserToken());
-      list.add(present_userToken);
-      if (present_userToken)
-        list.add(userToken);
+      hashCode = hashCode * 8191 + ((isSetUserToken()) ? 131071 : 524287);
+      if (isSetUserToken())
+        hashCode = hashCode * 8191 + userToken.hashCode();
 
-      boolean present_imageBaseId = true && (isSetImageBaseId());
-      list.add(present_imageBaseId);
-      if (present_imageBaseId)
-        list.add(imageBaseId);
+      hashCode = hashCode * 8191 + ((isSetImageBaseId()) ? 131071 : 524287);
+      if (isSetImageBaseId())
+        hashCode = hashCode * 8191 + imageBaseId.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -26733,7 +27420,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetUserToken()).compareTo(other.isSetUserToken());
+      lastComparison = java.lang.Boolean.compare(isSetUserToken(), other.isSetUserToken());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -26743,7 +27430,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetImageBaseId()).compareTo(other.isSetImageBaseId());
+      lastComparison = java.lang.Boolean.compare(isSetImageBaseId(), other.isSetImageBaseId());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -26756,21 +27443,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getImageDetails_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getImageDetails_args(");
       boolean first = true;
 
       sb.append("userToken:");
@@ -26805,7 +27493,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -26813,13 +27501,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class getImageDetails_argsStandardSchemeFactory implements SchemeFactory {
+    private static class getImageDetails_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getImageDetails_argsStandardScheme getScheme() {
         return new getImageDetails_argsStandardScheme();
       }
     }
 
-    private static class getImageDetails_argsStandardScheme extends StandardScheme<getImageDetails_args> {
+    private static class getImageDetails_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<getImageDetails_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getImageDetails_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -26878,18 +27566,18 @@ public class SatelliteServer {
 
     }
 
-    private static class getImageDetails_argsTupleSchemeFactory implements SchemeFactory {
+    private static class getImageDetails_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getImageDetails_argsTupleScheme getScheme() {
         return new getImageDetails_argsTupleScheme();
       }
     }
 
-    private static class getImageDetails_argsTupleScheme extends TupleScheme<getImageDetails_args> {
+    private static class getImageDetails_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<getImageDetails_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getImageDetails_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetUserToken()) {
           optionals.set(0);
         }
@@ -26907,8 +27595,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getImageDetails_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(2);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           struct.userToken = iprot.readString();
           struct.setUserTokenIsSet(true);
@@ -26920,6 +27608,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getImageDetails_result implements org.apache.thrift.TBase<getImageDetails_result, getImageDetails_result._Fields>, java.io.Serializable, Cloneable, Comparable<getImageDetails_result>   {
@@ -26930,16 +27621,13 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField NOT_FOUND_FIELD_DESC = new org.apache.thrift.protocol.TField("notFound", org.apache.thrift.protocol.TType.STRUCT, (short)2);
     private static final org.apache.thrift.protocol.TField SERVER_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("serverError", org.apache.thrift.protocol.TType.STRUCT, (short)3);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getImageDetails_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getImageDetails_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getImageDetails_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getImageDetails_resultTupleSchemeFactory();
 
-    public ImageDetailsRead success; // required
-    public TAuthorizationException authError; // required
-    public TNotFoundException notFound; // required
-    public TInvocationException serverError; // required
+    public @org.apache.thrift.annotation.Nullable ImageDetailsRead success; // required
+    public @org.apache.thrift.annotation.Nullable TAuthorizationException authError; // required
+    public @org.apache.thrift.annotation.Nullable TNotFoundException notFound; // required
+    public @org.apache.thrift.annotation.Nullable TInvocationException serverError; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -26948,10 +27636,10 @@ public class SatelliteServer {
       NOT_FOUND((short)2, "notFound"),
       SERVER_ERROR((short)3, "serverError");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -26959,6 +27647,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
@@ -26980,21 +27669,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -27003,24 +27693,24 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ImageDetailsRead.class)));
       tmpMap.put(_Fields.AUTH_ERROR, new org.apache.thrift.meta_data.FieldMetaData("authError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class)));
       tmpMap.put(_Fields.NOT_FOUND, new org.apache.thrift.meta_data.FieldMetaData("notFound", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TNotFoundException.class)));
       tmpMap.put(_Fields.SERVER_ERROR, new org.apache.thrift.meta_data.FieldMetaData("serverError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getImageDetails_result.class, metaDataMap);
     }
 
@@ -27070,11 +27760,12 @@ public class SatelliteServer {
       this.serverError = null;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public ImageDetailsRead getSuccess() {
       return this.success;
     }
 
-    public getImageDetails_result setSuccess(ImageDetailsRead success) {
+    public getImageDetails_result setSuccess(@org.apache.thrift.annotation.Nullable ImageDetailsRead success) {
       this.success = success;
       return this;
     }
@@ -27094,11 +27785,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TAuthorizationException getAuthError() {
       return this.authError;
     }
 
-    public getImageDetails_result setAuthError(TAuthorizationException authError) {
+    public getImageDetails_result setAuthError(@org.apache.thrift.annotation.Nullable TAuthorizationException authError) {
       this.authError = authError;
       return this;
     }
@@ -27118,11 +27810,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TNotFoundException getNotFound() {
       return this.notFound;
     }
 
-    public getImageDetails_result setNotFound(TNotFoundException notFound) {
+    public getImageDetails_result setNotFound(@org.apache.thrift.annotation.Nullable TNotFoundException notFound) {
       this.notFound = notFound;
       return this;
     }
@@ -27142,11 +27835,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvocationException getServerError() {
       return this.serverError;
     }
 
-    public getImageDetails_result setServerError(TInvocationException serverError) {
+    public getImageDetails_result setServerError(@org.apache.thrift.annotation.Nullable TInvocationException serverError) {
       this.serverError = serverError;
       return this;
     }
@@ -27166,7 +27860,7 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
@@ -27203,7 +27897,8 @@ public class SatelliteServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
         return getSuccess();
@@ -27218,13 +27913,13 @@ public class SatelliteServer {
         return getServerError();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -27237,13 +27932,11 @@ public class SatelliteServer {
       case SERVER_ERROR:
         return isSetServerError();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getImageDetails_result)
         return this.equals((getImageDetails_result)that);
       return false;
@@ -27252,6 +27945,8 @@ public class SatelliteServer {
     public boolean equals(getImageDetails_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_success = true && this.isSetSuccess();
       boolean that_present_success = true && that.isSetSuccess();
@@ -27294,29 +27989,25 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
 
-      boolean present_authError = true && (isSetAuthError());
-      list.add(present_authError);
-      if (present_authError)
-        list.add(authError);
+      hashCode = hashCode * 8191 + ((isSetAuthError()) ? 131071 : 524287);
+      if (isSetAuthError())
+        hashCode = hashCode * 8191 + authError.hashCode();
 
-      boolean present_notFound = true && (isSetNotFound());
-      list.add(present_notFound);
-      if (present_notFound)
-        list.add(notFound);
+      hashCode = hashCode * 8191 + ((isSetNotFound()) ? 131071 : 524287);
+      if (isSetNotFound())
+        hashCode = hashCode * 8191 + notFound.hashCode();
 
-      boolean present_serverError = true && (isSetServerError());
-      list.add(present_serverError);
-      if (present_serverError)
-        list.add(serverError);
+      hashCode = hashCode * 8191 + ((isSetServerError()) ? 131071 : 524287);
+      if (isSetServerError())
+        hashCode = hashCode * 8191 + serverError.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -27327,7 +28018,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -27337,7 +28028,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetAuthError()).compareTo(other.isSetAuthError());
+      lastComparison = java.lang.Boolean.compare(isSetAuthError(), other.isSetAuthError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -27347,7 +28038,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetNotFound()).compareTo(other.isSetNotFound());
+      lastComparison = java.lang.Boolean.compare(isSetNotFound(), other.isSetNotFound());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -27357,7 +28048,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetServerError()).compareTo(other.isSetServerError());
+      lastComparison = java.lang.Boolean.compare(isSetServerError(), other.isSetServerError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -27370,21 +28061,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getImageDetails_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getImageDetails_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -27438,7 +28130,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -27446,13 +28138,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class getImageDetails_resultStandardSchemeFactory implements SchemeFactory {
+    private static class getImageDetails_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getImageDetails_resultStandardScheme getScheme() {
         return new getImageDetails_resultStandardScheme();
       }
     }
 
-    private static class getImageDetails_resultStandardScheme extends StandardScheme<getImageDetails_result> {
+    private static class getImageDetails_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<getImageDetails_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getImageDetails_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -27541,18 +28233,18 @@ public class SatelliteServer {
 
     }
 
-    private static class getImageDetails_resultTupleSchemeFactory implements SchemeFactory {
+    private static class getImageDetails_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getImageDetails_resultTupleScheme getScheme() {
         return new getImageDetails_resultTupleScheme();
       }
     }
 
-    private static class getImageDetails_resultTupleScheme extends TupleScheme<getImageDetails_result> {
+    private static class getImageDetails_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<getImageDetails_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getImageDetails_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
           optionals.set(0);
         }
@@ -27582,8 +28274,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getImageDetails_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(4);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(4);
         if (incoming.get(0)) {
           struct.success = new ImageDetailsRead();
           struct.success.read(iprot);
@@ -27607,6 +28299,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class createImage_args implements org.apache.thrift.TBase<createImage_args, createImage_args._Fields>, java.io.Serializable, Cloneable, Comparable<createImage_args>   {
@@ -27615,24 +28310,21 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField USER_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("userToken", org.apache.thrift.protocol.TType.STRING, (short)1);
     private static final org.apache.thrift.protocol.TField IMAGE_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("imageName", org.apache.thrift.protocol.TType.STRING, (short)2);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new createImage_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new createImage_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new createImage_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new createImage_argsTupleSchemeFactory();
 
-    public String userToken; // required
-    public String imageName; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String userToken; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String imageName; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       USER_TOKEN((short)1, "userToken"),
       IMAGE_NAME((short)2, "imageName");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -27640,6 +28332,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // USER_TOKEN
@@ -27657,21 +28350,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -27680,20 +28374,20 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.USER_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("userToken", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
       tmpMap.put(_Fields.IMAGE_NAME, new org.apache.thrift.meta_data.FieldMetaData("imageName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(createImage_args.class, metaDataMap);
     }
 
@@ -27701,8 +28395,8 @@ public class SatelliteServer {
     }
 
     public createImage_args(
-      String userToken,
-      String imageName)
+      java.lang.String userToken,
+      java.lang.String imageName)
     {
       this();
       this.userToken = userToken;
@@ -27731,11 +28425,12 @@ public class SatelliteServer {
       this.imageName = null;
     }
 
-    public String getUserToken() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getUserToken() {
       return this.userToken;
     }
 
-    public createImage_args setUserToken(String userToken) {
+    public createImage_args setUserToken(@org.apache.thrift.annotation.Nullable java.lang.String userToken) {
       this.userToken = userToken;
       return this;
     }
@@ -27755,11 +28450,12 @@ public class SatelliteServer {
       }
     }
 
-    public String getImageName() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getImageName() {
       return this.imageName;
     }
 
-    public createImage_args setImageName(String imageName) {
+    public createImage_args setImageName(@org.apache.thrift.annotation.Nullable java.lang.String imageName) {
       this.imageName = imageName;
       return this;
     }
@@ -27779,13 +28475,13 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case USER_TOKEN:
         if (value == null) {
           unsetUserToken();
         } else {
-          setUserToken((String)value);
+          setUserToken((java.lang.String)value);
         }
         break;
 
@@ -27793,14 +28489,15 @@ public class SatelliteServer {
         if (value == null) {
           unsetImageName();
         } else {
-          setImageName((String)value);
+          setImageName((java.lang.String)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case USER_TOKEN:
         return getUserToken();
@@ -27809,13 +28506,13 @@ public class SatelliteServer {
         return getImageName();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -27824,13 +28521,11 @@ public class SatelliteServer {
       case IMAGE_NAME:
         return isSetImageName();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof createImage_args)
         return this.equals((createImage_args)that);
       return false;
@@ -27839,6 +28534,8 @@ public class SatelliteServer {
     public boolean equals(createImage_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_userToken = true && this.isSetUserToken();
       boolean that_present_userToken = true && that.isSetUserToken();
@@ -27863,19 +28560,17 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_userToken = true && (isSetUserToken());
-      list.add(present_userToken);
-      if (present_userToken)
-        list.add(userToken);
+      hashCode = hashCode * 8191 + ((isSetUserToken()) ? 131071 : 524287);
+      if (isSetUserToken())
+        hashCode = hashCode * 8191 + userToken.hashCode();
 
-      boolean present_imageName = true && (isSetImageName());
-      list.add(present_imageName);
-      if (present_imageName)
-        list.add(imageName);
+      hashCode = hashCode * 8191 + ((isSetImageName()) ? 131071 : 524287);
+      if (isSetImageName())
+        hashCode = hashCode * 8191 + imageName.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -27886,7 +28581,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetUserToken()).compareTo(other.isSetUserToken());
+      lastComparison = java.lang.Boolean.compare(isSetUserToken(), other.isSetUserToken());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -27896,7 +28591,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetImageName()).compareTo(other.isSetImageName());
+      lastComparison = java.lang.Boolean.compare(isSetImageName(), other.isSetImageName());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -27909,21 +28604,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("createImage_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("createImage_args(");
       boolean first = true;
 
       sb.append("userToken:");
@@ -27958,7 +28654,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -27966,13 +28662,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class createImage_argsStandardSchemeFactory implements SchemeFactory {
+    private static class createImage_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public createImage_argsStandardScheme getScheme() {
         return new createImage_argsStandardScheme();
       }
     }
 
-    private static class createImage_argsStandardScheme extends StandardScheme<createImage_args> {
+    private static class createImage_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<createImage_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, createImage_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -28031,18 +28727,18 @@ public class SatelliteServer {
 
     }
 
-    private static class createImage_argsTupleSchemeFactory implements SchemeFactory {
+    private static class createImage_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public createImage_argsTupleScheme getScheme() {
         return new createImage_argsTupleScheme();
       }
     }
 
-    private static class createImage_argsTupleScheme extends TupleScheme<createImage_args> {
+    private static class createImage_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<createImage_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, createImage_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetUserToken()) {
           optionals.set(0);
         }
@@ -28060,8 +28756,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, createImage_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(2);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           struct.userToken = iprot.readString();
           struct.setUserTokenIsSet(true);
@@ -28073,6 +28769,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class createImage_result implements org.apache.thrift.TBase<createImage_result, createImage_result._Fields>, java.io.Serializable, Cloneable, Comparable<createImage_result>   {
@@ -28082,15 +28781,12 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField AUTH_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("authError", org.apache.thrift.protocol.TType.STRUCT, (short)1);
     private static final org.apache.thrift.protocol.TField ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("error", org.apache.thrift.protocol.TType.STRUCT, (short)2);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new createImage_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new createImage_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new createImage_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new createImage_resultTupleSchemeFactory();
 
-    public String success; // required
-    public TAuthorizationException authError; // required
-    public TInvocationException error; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String success; // required
+    public @org.apache.thrift.annotation.Nullable TAuthorizationException authError; // required
+    public @org.apache.thrift.annotation.Nullable TInvocationException error; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -28098,10 +28794,10 @@ public class SatelliteServer {
       AUTH_ERROR((short)1, "authError"),
       ERROR((short)2, "error");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -28109,6 +28805,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
@@ -28128,21 +28825,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -28151,22 +28849,22 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "UUID")));
       tmpMap.put(_Fields.AUTH_ERROR, new org.apache.thrift.meta_data.FieldMetaData("authError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class)));
       tmpMap.put(_Fields.ERROR, new org.apache.thrift.meta_data.FieldMetaData("error", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(createImage_result.class, metaDataMap);
     }
 
@@ -28174,7 +28872,7 @@ public class SatelliteServer {
     }
 
     public createImage_result(
-      String success,
+      java.lang.String success,
       TAuthorizationException authError,
       TInvocationException error)
     {
@@ -28210,11 +28908,12 @@ public class SatelliteServer {
       this.error = null;
     }
 
-    public String getSuccess() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getSuccess() {
       return this.success;
     }
 
-    public createImage_result setSuccess(String success) {
+    public createImage_result setSuccess(@org.apache.thrift.annotation.Nullable java.lang.String success) {
       this.success = success;
       return this;
     }
@@ -28234,11 +28933,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TAuthorizationException getAuthError() {
       return this.authError;
     }
 
-    public createImage_result setAuthError(TAuthorizationException authError) {
+    public createImage_result setAuthError(@org.apache.thrift.annotation.Nullable TAuthorizationException authError) {
       this.authError = authError;
       return this;
     }
@@ -28258,11 +28958,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvocationException getError() {
       return this.error;
     }
 
-    public createImage_result setError(TInvocationException error) {
+    public createImage_result setError(@org.apache.thrift.annotation.Nullable TInvocationException error) {
       this.error = error;
       return this;
     }
@@ -28282,13 +28983,13 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
           unsetSuccess();
         } else {
-          setSuccess((String)value);
+          setSuccess((java.lang.String)value);
         }
         break;
 
@@ -28311,7 +29012,8 @@ public class SatelliteServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
         return getSuccess();
@@ -28323,13 +29025,13 @@ public class SatelliteServer {
         return getError();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -28340,13 +29042,11 @@ public class SatelliteServer {
       case ERROR:
         return isSetError();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof createImage_result)
         return this.equals((createImage_result)that);
       return false;
@@ -28355,6 +29055,8 @@ public class SatelliteServer {
     public boolean equals(createImage_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_success = true && this.isSetSuccess();
       boolean that_present_success = true && that.isSetSuccess();
@@ -28388,24 +29090,21 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
 
-      boolean present_authError = true && (isSetAuthError());
-      list.add(present_authError);
-      if (present_authError)
-        list.add(authError);
+      hashCode = hashCode * 8191 + ((isSetAuthError()) ? 131071 : 524287);
+      if (isSetAuthError())
+        hashCode = hashCode * 8191 + authError.hashCode();
 
-      boolean present_error = true && (isSetError());
-      list.add(present_error);
-      if (present_error)
-        list.add(error);
+      hashCode = hashCode * 8191 + ((isSetError()) ? 131071 : 524287);
+      if (isSetError())
+        hashCode = hashCode * 8191 + error.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -28416,7 +29115,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -28426,7 +29125,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetAuthError()).compareTo(other.isSetAuthError());
+      lastComparison = java.lang.Boolean.compare(isSetAuthError(), other.isSetAuthError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -28436,7 +29135,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetError()).compareTo(other.isSetError());
+      lastComparison = java.lang.Boolean.compare(isSetError(), other.isSetError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -28449,21 +29148,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("createImage_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("createImage_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -28506,7 +29206,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -28514,13 +29214,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class createImage_resultStandardSchemeFactory implements SchemeFactory {
+    private static class createImage_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public createImage_resultStandardScheme getScheme() {
         return new createImage_resultStandardScheme();
       }
     }
 
-    private static class createImage_resultStandardScheme extends StandardScheme<createImage_result> {
+    private static class createImage_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<createImage_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, createImage_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -28594,18 +29294,18 @@ public class SatelliteServer {
 
     }
 
-    private static class createImage_resultTupleSchemeFactory implements SchemeFactory {
+    private static class createImage_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public createImage_resultTupleScheme getScheme() {
         return new createImage_resultTupleScheme();
       }
     }
 
-    private static class createImage_resultTupleScheme extends TupleScheme<createImage_result> {
+    private static class createImage_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<createImage_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, createImage_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
           optionals.set(0);
         }
@@ -28629,8 +29329,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, createImage_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(3);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           struct.success = iprot.readString();
           struct.setSuccessIsSet(true);
@@ -28648,6 +29348,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class updateImageBase_args implements org.apache.thrift.TBase<updateImageBase_args, updateImageBase_args._Fields>, java.io.Serializable, Cloneable, Comparable<updateImageBase_args>   {
@@ -28657,15 +29360,12 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField IMAGE_BASE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("imageBaseId", org.apache.thrift.protocol.TType.STRING, (short)2);
     private static final org.apache.thrift.protocol.TField IMAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("image", org.apache.thrift.protocol.TType.STRUCT, (short)3);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new updateImageBase_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new updateImageBase_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new updateImageBase_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new updateImageBase_argsTupleSchemeFactory();
 
-    public String userToken; // required
-    public String imageBaseId; // required
-    public ImageBaseWrite image; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String userToken; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String imageBaseId; // required
+    public @org.apache.thrift.annotation.Nullable ImageBaseWrite image; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -28673,10 +29373,10 @@ public class SatelliteServer {
       IMAGE_BASE_ID((short)2, "imageBaseId"),
       IMAGE((short)3, "image");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -28684,6 +29384,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // USER_TOKEN
@@ -28703,21 +29404,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -28726,22 +29428,22 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.USER_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("userToken", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
       tmpMap.put(_Fields.IMAGE_BASE_ID, new org.apache.thrift.meta_data.FieldMetaData("imageBaseId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "UUID")));
       tmpMap.put(_Fields.IMAGE, new org.apache.thrift.meta_data.FieldMetaData("image", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ImageBaseWrite.class)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(updateImageBase_args.class, metaDataMap);
     }
 
@@ -28749,8 +29451,8 @@ public class SatelliteServer {
     }
 
     public updateImageBase_args(
-      String userToken,
-      String imageBaseId,
+      java.lang.String userToken,
+      java.lang.String imageBaseId,
       ImageBaseWrite image)
     {
       this();
@@ -28785,11 +29487,12 @@ public class SatelliteServer {
       this.image = null;
     }
 
-    public String getUserToken() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getUserToken() {
       return this.userToken;
     }
 
-    public updateImageBase_args setUserToken(String userToken) {
+    public updateImageBase_args setUserToken(@org.apache.thrift.annotation.Nullable java.lang.String userToken) {
       this.userToken = userToken;
       return this;
     }
@@ -28809,11 +29512,12 @@ public class SatelliteServer {
       }
     }
 
-    public String getImageBaseId() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getImageBaseId() {
       return this.imageBaseId;
     }
 
-    public updateImageBase_args setImageBaseId(String imageBaseId) {
+    public updateImageBase_args setImageBaseId(@org.apache.thrift.annotation.Nullable java.lang.String imageBaseId) {
       this.imageBaseId = imageBaseId;
       return this;
     }
@@ -28833,11 +29537,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public ImageBaseWrite getImage() {
       return this.image;
     }
 
-    public updateImageBase_args setImage(ImageBaseWrite image) {
+    public updateImageBase_args setImage(@org.apache.thrift.annotation.Nullable ImageBaseWrite image) {
       this.image = image;
       return this;
     }
@@ -28857,13 +29562,13 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case USER_TOKEN:
         if (value == null) {
           unsetUserToken();
         } else {
-          setUserToken((String)value);
+          setUserToken((java.lang.String)value);
         }
         break;
 
@@ -28871,7 +29576,7 @@ public class SatelliteServer {
         if (value == null) {
           unsetImageBaseId();
         } else {
-          setImageBaseId((String)value);
+          setImageBaseId((java.lang.String)value);
         }
         break;
 
@@ -28886,7 +29591,8 @@ public class SatelliteServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case USER_TOKEN:
         return getUserToken();
@@ -28898,13 +29604,13 @@ public class SatelliteServer {
         return getImage();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -28915,13 +29621,11 @@ public class SatelliteServer {
       case IMAGE:
         return isSetImage();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof updateImageBase_args)
         return this.equals((updateImageBase_args)that);
       return false;
@@ -28930,6 +29634,8 @@ public class SatelliteServer {
     public boolean equals(updateImageBase_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_userToken = true && this.isSetUserToken();
       boolean that_present_userToken = true && that.isSetUserToken();
@@ -28963,24 +29669,21 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_userToken = true && (isSetUserToken());
-      list.add(present_userToken);
-      if (present_userToken)
-        list.add(userToken);
+      hashCode = hashCode * 8191 + ((isSetUserToken()) ? 131071 : 524287);
+      if (isSetUserToken())
+        hashCode = hashCode * 8191 + userToken.hashCode();
 
-      boolean present_imageBaseId = true && (isSetImageBaseId());
-      list.add(present_imageBaseId);
-      if (present_imageBaseId)
-        list.add(imageBaseId);
+      hashCode = hashCode * 8191 + ((isSetImageBaseId()) ? 131071 : 524287);
+      if (isSetImageBaseId())
+        hashCode = hashCode * 8191 + imageBaseId.hashCode();
 
-      boolean present_image = true && (isSetImage());
-      list.add(present_image);
-      if (present_image)
-        list.add(image);
+      hashCode = hashCode * 8191 + ((isSetImage()) ? 131071 : 524287);
+      if (isSetImage())
+        hashCode = hashCode * 8191 + image.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -28991,7 +29694,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetUserToken()).compareTo(other.isSetUserToken());
+      lastComparison = java.lang.Boolean.compare(isSetUserToken(), other.isSetUserToken());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -29001,7 +29704,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetImageBaseId()).compareTo(other.isSetImageBaseId());
+      lastComparison = java.lang.Boolean.compare(isSetImageBaseId(), other.isSetImageBaseId());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -29011,7 +29714,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetImage()).compareTo(other.isSetImage());
+      lastComparison = java.lang.Boolean.compare(isSetImage(), other.isSetImage());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -29024,21 +29727,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("updateImageBase_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("updateImageBase_args(");
       boolean first = true;
 
       sb.append("userToken:");
@@ -29084,7 +29788,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -29092,13 +29796,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class updateImageBase_argsStandardSchemeFactory implements SchemeFactory {
+    private static class updateImageBase_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public updateImageBase_argsStandardScheme getScheme() {
         return new updateImageBase_argsStandardScheme();
       }
     }
 
-    private static class updateImageBase_argsStandardScheme extends StandardScheme<updateImageBase_args> {
+    private static class updateImageBase_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<updateImageBase_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, updateImageBase_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -29171,18 +29875,18 @@ public class SatelliteServer {
 
     }
 
-    private static class updateImageBase_argsTupleSchemeFactory implements SchemeFactory {
+    private static class updateImageBase_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public updateImageBase_argsTupleScheme getScheme() {
         return new updateImageBase_argsTupleScheme();
       }
     }
 
-    private static class updateImageBase_argsTupleScheme extends TupleScheme<updateImageBase_args> {
+    private static class updateImageBase_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<updateImageBase_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, updateImageBase_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetUserToken()) {
           optionals.set(0);
         }
@@ -29206,8 +29910,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, updateImageBase_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(3);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           struct.userToken = iprot.readString();
           struct.setUserTokenIsSet(true);
@@ -29224,6 +29928,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class updateImageBase_result implements org.apache.thrift.TBase<updateImageBase_result, updateImageBase_result._Fields>, java.io.Serializable, Cloneable, Comparable<updateImageBase_result>   {
@@ -29233,15 +29940,12 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField NOT_FOUND_FIELD_DESC = new org.apache.thrift.protocol.TField("notFound", org.apache.thrift.protocol.TType.STRUCT, (short)2);
     private static final org.apache.thrift.protocol.TField IMG_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("imgError", org.apache.thrift.protocol.TType.STRUCT, (short)3);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new updateImageBase_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new updateImageBase_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new updateImageBase_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new updateImageBase_resultTupleSchemeFactory();
 
-    public TAuthorizationException authError; // required
-    public TNotFoundException notFound; // required
-    public TInvocationException imgError; // required
+    public @org.apache.thrift.annotation.Nullable TAuthorizationException authError; // required
+    public @org.apache.thrift.annotation.Nullable TNotFoundException notFound; // required
+    public @org.apache.thrift.annotation.Nullable TInvocationException imgError; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -29249,10 +29953,10 @@ public class SatelliteServer {
       NOT_FOUND((short)2, "notFound"),
       IMG_ERROR((short)3, "imgError");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -29260,6 +29964,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // AUTH_ERROR
@@ -29279,21 +29984,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -29302,22 +30008,22 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.AUTH_ERROR, new org.apache.thrift.meta_data.FieldMetaData("authError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class)));
       tmpMap.put(_Fields.NOT_FOUND, new org.apache.thrift.meta_data.FieldMetaData("notFound", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TNotFoundException.class)));
       tmpMap.put(_Fields.IMG_ERROR, new org.apache.thrift.meta_data.FieldMetaData("imgError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(updateImageBase_result.class, metaDataMap);
     }
 
@@ -29361,11 +30067,12 @@ public class SatelliteServer {
       this.imgError = null;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TAuthorizationException getAuthError() {
       return this.authError;
     }
 
-    public updateImageBase_result setAuthError(TAuthorizationException authError) {
+    public updateImageBase_result setAuthError(@org.apache.thrift.annotation.Nullable TAuthorizationException authError) {
       this.authError = authError;
       return this;
     }
@@ -29385,11 +30092,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TNotFoundException getNotFound() {
       return this.notFound;
     }
 
-    public updateImageBase_result setNotFound(TNotFoundException notFound) {
+    public updateImageBase_result setNotFound(@org.apache.thrift.annotation.Nullable TNotFoundException notFound) {
       this.notFound = notFound;
       return this;
     }
@@ -29409,11 +30117,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvocationException getImgError() {
       return this.imgError;
     }
 
-    public updateImageBase_result setImgError(TInvocationException imgError) {
+    public updateImageBase_result setImgError(@org.apache.thrift.annotation.Nullable TInvocationException imgError) {
       this.imgError = imgError;
       return this;
     }
@@ -29433,7 +30142,7 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case AUTH_ERROR:
         if (value == null) {
@@ -29462,7 +30171,8 @@ public class SatelliteServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case AUTH_ERROR:
         return getAuthError();
@@ -29474,13 +30184,13 @@ public class SatelliteServer {
         return getImgError();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -29491,13 +30201,11 @@ public class SatelliteServer {
       case IMG_ERROR:
         return isSetImgError();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof updateImageBase_result)
         return this.equals((updateImageBase_result)that);
       return false;
@@ -29506,6 +30214,8 @@ public class SatelliteServer {
     public boolean equals(updateImageBase_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_authError = true && this.isSetAuthError();
       boolean that_present_authError = true && that.isSetAuthError();
@@ -29539,24 +30249,21 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_authError = true && (isSetAuthError());
-      list.add(present_authError);
-      if (present_authError)
-        list.add(authError);
+      hashCode = hashCode * 8191 + ((isSetAuthError()) ? 131071 : 524287);
+      if (isSetAuthError())
+        hashCode = hashCode * 8191 + authError.hashCode();
 
-      boolean present_notFound = true && (isSetNotFound());
-      list.add(present_notFound);
-      if (present_notFound)
-        list.add(notFound);
+      hashCode = hashCode * 8191 + ((isSetNotFound()) ? 131071 : 524287);
+      if (isSetNotFound())
+        hashCode = hashCode * 8191 + notFound.hashCode();
 
-      boolean present_imgError = true && (isSetImgError());
-      list.add(present_imgError);
-      if (present_imgError)
-        list.add(imgError);
+      hashCode = hashCode * 8191 + ((isSetImgError()) ? 131071 : 524287);
+      if (isSetImgError())
+        hashCode = hashCode * 8191 + imgError.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -29567,7 +30274,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetAuthError()).compareTo(other.isSetAuthError());
+      lastComparison = java.lang.Boolean.compare(isSetAuthError(), other.isSetAuthError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -29577,7 +30284,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetNotFound()).compareTo(other.isSetNotFound());
+      lastComparison = java.lang.Boolean.compare(isSetNotFound(), other.isSetNotFound());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -29587,7 +30294,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetImgError()).compareTo(other.isSetImgError());
+      lastComparison = java.lang.Boolean.compare(isSetImgError(), other.isSetImgError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -29600,21 +30307,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("updateImageBase_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("updateImageBase_result(");
       boolean first = true;
 
       sb.append("authError:");
@@ -29657,7 +30365,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -29665,13 +30373,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class updateImageBase_resultStandardSchemeFactory implements SchemeFactory {
+    private static class updateImageBase_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public updateImageBase_resultStandardScheme getScheme() {
         return new updateImageBase_resultStandardScheme();
       }
     }
 
-    private static class updateImageBase_resultStandardScheme extends StandardScheme<updateImageBase_result> {
+    private static class updateImageBase_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<updateImageBase_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, updateImageBase_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -29746,18 +30454,18 @@ public class SatelliteServer {
 
     }
 
-    private static class updateImageBase_resultTupleSchemeFactory implements SchemeFactory {
+    private static class updateImageBase_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public updateImageBase_resultTupleScheme getScheme() {
         return new updateImageBase_resultTupleScheme();
       }
     }
 
-    private static class updateImageBase_resultTupleScheme extends TupleScheme<updateImageBase_result> {
+    private static class updateImageBase_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<updateImageBase_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, updateImageBase_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetAuthError()) {
           optionals.set(0);
         }
@@ -29781,8 +30489,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, updateImageBase_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(3);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           struct.authError = new TAuthorizationException();
           struct.authError.read(iprot);
@@ -29801,6 +30509,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class updateImageVersion_args implements org.apache.thrift.TBase<updateImageVersion_args, updateImageVersion_args._Fields>, java.io.Serializable, Cloneable, Comparable<updateImageVersion_args>   {
@@ -29810,15 +30521,12 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField IMAGE_VERSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("imageVersionId", org.apache.thrift.protocol.TType.STRING, (short)2);
     private static final org.apache.thrift.protocol.TField IMAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("image", org.apache.thrift.protocol.TType.STRUCT, (short)3);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new updateImageVersion_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new updateImageVersion_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new updateImageVersion_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new updateImageVersion_argsTupleSchemeFactory();
 
-    public String userToken; // required
-    public String imageVersionId; // required
-    public ImageVersionWrite image; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String userToken; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String imageVersionId; // required
+    public @org.apache.thrift.annotation.Nullable ImageVersionWrite image; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -29826,10 +30534,10 @@ public class SatelliteServer {
       IMAGE_VERSION_ID((short)2, "imageVersionId"),
       IMAGE((short)3, "image");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -29837,6 +30545,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // USER_TOKEN
@@ -29856,21 +30565,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -29879,22 +30589,22 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.USER_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("userToken", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
       tmpMap.put(_Fields.IMAGE_VERSION_ID, new org.apache.thrift.meta_data.FieldMetaData("imageVersionId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "UUID")));
       tmpMap.put(_Fields.IMAGE, new org.apache.thrift.meta_data.FieldMetaData("image", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ImageVersionWrite.class)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(updateImageVersion_args.class, metaDataMap);
     }
 
@@ -29902,8 +30612,8 @@ public class SatelliteServer {
     }
 
     public updateImageVersion_args(
-      String userToken,
-      String imageVersionId,
+      java.lang.String userToken,
+      java.lang.String imageVersionId,
       ImageVersionWrite image)
     {
       this();
@@ -29938,11 +30648,12 @@ public class SatelliteServer {
       this.image = null;
     }
 
-    public String getUserToken() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getUserToken() {
       return this.userToken;
     }
 
-    public updateImageVersion_args setUserToken(String userToken) {
+    public updateImageVersion_args setUserToken(@org.apache.thrift.annotation.Nullable java.lang.String userToken) {
       this.userToken = userToken;
       return this;
     }
@@ -29962,11 +30673,12 @@ public class SatelliteServer {
       }
     }
 
-    public String getImageVersionId() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getImageVersionId() {
       return this.imageVersionId;
     }
 
-    public updateImageVersion_args setImageVersionId(String imageVersionId) {
+    public updateImageVersion_args setImageVersionId(@org.apache.thrift.annotation.Nullable java.lang.String imageVersionId) {
       this.imageVersionId = imageVersionId;
       return this;
     }
@@ -29986,11 +30698,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public ImageVersionWrite getImage() {
       return this.image;
     }
 
-    public updateImageVersion_args setImage(ImageVersionWrite image) {
+    public updateImageVersion_args setImage(@org.apache.thrift.annotation.Nullable ImageVersionWrite image) {
       this.image = image;
       return this;
     }
@@ -30010,13 +30723,13 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case USER_TOKEN:
         if (value == null) {
           unsetUserToken();
         } else {
-          setUserToken((String)value);
+          setUserToken((java.lang.String)value);
         }
         break;
 
@@ -30024,7 +30737,7 @@ public class SatelliteServer {
         if (value == null) {
           unsetImageVersionId();
         } else {
-          setImageVersionId((String)value);
+          setImageVersionId((java.lang.String)value);
         }
         break;
 
@@ -30039,7 +30752,8 @@ public class SatelliteServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case USER_TOKEN:
         return getUserToken();
@@ -30051,13 +30765,13 @@ public class SatelliteServer {
         return getImage();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -30068,13 +30782,11 @@ public class SatelliteServer {
       case IMAGE:
         return isSetImage();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof updateImageVersion_args)
         return this.equals((updateImageVersion_args)that);
       return false;
@@ -30083,6 +30795,8 @@ public class SatelliteServer {
     public boolean equals(updateImageVersion_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_userToken = true && this.isSetUserToken();
       boolean that_present_userToken = true && that.isSetUserToken();
@@ -30116,24 +30830,21 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_userToken = true && (isSetUserToken());
-      list.add(present_userToken);
-      if (present_userToken)
-        list.add(userToken);
+      hashCode = hashCode * 8191 + ((isSetUserToken()) ? 131071 : 524287);
+      if (isSetUserToken())
+        hashCode = hashCode * 8191 + userToken.hashCode();
 
-      boolean present_imageVersionId = true && (isSetImageVersionId());
-      list.add(present_imageVersionId);
-      if (present_imageVersionId)
-        list.add(imageVersionId);
+      hashCode = hashCode * 8191 + ((isSetImageVersionId()) ? 131071 : 524287);
+      if (isSetImageVersionId())
+        hashCode = hashCode * 8191 + imageVersionId.hashCode();
 
-      boolean present_image = true && (isSetImage());
-      list.add(present_image);
-      if (present_image)
-        list.add(image);
+      hashCode = hashCode * 8191 + ((isSetImage()) ? 131071 : 524287);
+      if (isSetImage())
+        hashCode = hashCode * 8191 + image.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -30144,7 +30855,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetUserToken()).compareTo(other.isSetUserToken());
+      lastComparison = java.lang.Boolean.compare(isSetUserToken(), other.isSetUserToken());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -30154,7 +30865,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetImageVersionId()).compareTo(other.isSetImageVersionId());
+      lastComparison = java.lang.Boolean.compare(isSetImageVersionId(), other.isSetImageVersionId());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -30164,7 +30875,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetImage()).compareTo(other.isSetImage());
+      lastComparison = java.lang.Boolean.compare(isSetImage(), other.isSetImage());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -30177,21 +30888,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("updateImageVersion_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("updateImageVersion_args(");
       boolean first = true;
 
       sb.append("userToken:");
@@ -30237,7 +30949,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -30245,13 +30957,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class updateImageVersion_argsStandardSchemeFactory implements SchemeFactory {
+    private static class updateImageVersion_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public updateImageVersion_argsStandardScheme getScheme() {
         return new updateImageVersion_argsStandardScheme();
       }
     }
 
-    private static class updateImageVersion_argsStandardScheme extends StandardScheme<updateImageVersion_args> {
+    private static class updateImageVersion_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<updateImageVersion_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, updateImageVersion_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -30324,18 +31036,18 @@ public class SatelliteServer {
 
     }
 
-    private static class updateImageVersion_argsTupleSchemeFactory implements SchemeFactory {
+    private static class updateImageVersion_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public updateImageVersion_argsTupleScheme getScheme() {
         return new updateImageVersion_argsTupleScheme();
       }
     }
 
-    private static class updateImageVersion_argsTupleScheme extends TupleScheme<updateImageVersion_args> {
+    private static class updateImageVersion_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<updateImageVersion_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, updateImageVersion_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetUserToken()) {
           optionals.set(0);
         }
@@ -30359,8 +31071,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, updateImageVersion_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(3);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           struct.userToken = iprot.readString();
           struct.setUserTokenIsSet(true);
@@ -30377,6 +31089,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class updateImageVersion_result implements org.apache.thrift.TBase<updateImageVersion_result, updateImageVersion_result._Fields>, java.io.Serializable, Cloneable, Comparable<updateImageVersion_result>   {
@@ -30386,15 +31101,12 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField NOT_FOUND_FIELD_DESC = new org.apache.thrift.protocol.TField("notFound", org.apache.thrift.protocol.TType.STRUCT, (short)2);
     private static final org.apache.thrift.protocol.TField IMG_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("imgError", org.apache.thrift.protocol.TType.STRUCT, (short)3);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new updateImageVersion_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new updateImageVersion_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new updateImageVersion_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new updateImageVersion_resultTupleSchemeFactory();
 
-    public TAuthorizationException authError; // required
-    public TNotFoundException notFound; // required
-    public TInvocationException imgError; // required
+    public @org.apache.thrift.annotation.Nullable TAuthorizationException authError; // required
+    public @org.apache.thrift.annotation.Nullable TNotFoundException notFound; // required
+    public @org.apache.thrift.annotation.Nullable TInvocationException imgError; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -30402,10 +31114,10 @@ public class SatelliteServer {
       NOT_FOUND((short)2, "notFound"),
       IMG_ERROR((short)3, "imgError");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -30413,6 +31125,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // AUTH_ERROR
@@ -30432,21 +31145,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -30455,22 +31169,22 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.AUTH_ERROR, new org.apache.thrift.meta_data.FieldMetaData("authError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class)));
       tmpMap.put(_Fields.NOT_FOUND, new org.apache.thrift.meta_data.FieldMetaData("notFound", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TNotFoundException.class)));
       tmpMap.put(_Fields.IMG_ERROR, new org.apache.thrift.meta_data.FieldMetaData("imgError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(updateImageVersion_result.class, metaDataMap);
     }
 
@@ -30514,11 +31228,12 @@ public class SatelliteServer {
       this.imgError = null;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TAuthorizationException getAuthError() {
       return this.authError;
     }
 
-    public updateImageVersion_result setAuthError(TAuthorizationException authError) {
+    public updateImageVersion_result setAuthError(@org.apache.thrift.annotation.Nullable TAuthorizationException authError) {
       this.authError = authError;
       return this;
     }
@@ -30538,11 +31253,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TNotFoundException getNotFound() {
       return this.notFound;
     }
 
-    public updateImageVersion_result setNotFound(TNotFoundException notFound) {
+    public updateImageVersion_result setNotFound(@org.apache.thrift.annotation.Nullable TNotFoundException notFound) {
       this.notFound = notFound;
       return this;
     }
@@ -30562,11 +31278,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvocationException getImgError() {
       return this.imgError;
     }
 
-    public updateImageVersion_result setImgError(TInvocationException imgError) {
+    public updateImageVersion_result setImgError(@org.apache.thrift.annotation.Nullable TInvocationException imgError) {
       this.imgError = imgError;
       return this;
     }
@@ -30586,7 +31303,7 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case AUTH_ERROR:
         if (value == null) {
@@ -30615,7 +31332,8 @@ public class SatelliteServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case AUTH_ERROR:
         return getAuthError();
@@ -30627,13 +31345,13 @@ public class SatelliteServer {
         return getImgError();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -30644,13 +31362,11 @@ public class SatelliteServer {
       case IMG_ERROR:
         return isSetImgError();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof updateImageVersion_result)
         return this.equals((updateImageVersion_result)that);
       return false;
@@ -30659,6 +31375,8 @@ public class SatelliteServer {
     public boolean equals(updateImageVersion_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_authError = true && this.isSetAuthError();
       boolean that_present_authError = true && that.isSetAuthError();
@@ -30692,24 +31410,21 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_authError = true && (isSetAuthError());
-      list.add(present_authError);
-      if (present_authError)
-        list.add(authError);
+      hashCode = hashCode * 8191 + ((isSetAuthError()) ? 131071 : 524287);
+      if (isSetAuthError())
+        hashCode = hashCode * 8191 + authError.hashCode();
 
-      boolean present_notFound = true && (isSetNotFound());
-      list.add(present_notFound);
-      if (present_notFound)
-        list.add(notFound);
+      hashCode = hashCode * 8191 + ((isSetNotFound()) ? 131071 : 524287);
+      if (isSetNotFound())
+        hashCode = hashCode * 8191 + notFound.hashCode();
 
-      boolean present_imgError = true && (isSetImgError());
-      list.add(present_imgError);
-      if (present_imgError)
-        list.add(imgError);
+      hashCode = hashCode * 8191 + ((isSetImgError()) ? 131071 : 524287);
+      if (isSetImgError())
+        hashCode = hashCode * 8191 + imgError.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -30720,7 +31435,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetAuthError()).compareTo(other.isSetAuthError());
+      lastComparison = java.lang.Boolean.compare(isSetAuthError(), other.isSetAuthError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -30730,7 +31445,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetNotFound()).compareTo(other.isSetNotFound());
+      lastComparison = java.lang.Boolean.compare(isSetNotFound(), other.isSetNotFound());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -30740,7 +31455,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetImgError()).compareTo(other.isSetImgError());
+      lastComparison = java.lang.Boolean.compare(isSetImgError(), other.isSetImgError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -30753,21 +31468,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("updateImageVersion_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("updateImageVersion_result(");
       boolean first = true;
 
       sb.append("authError:");
@@ -30810,7 +31526,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -30818,13 +31534,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class updateImageVersion_resultStandardSchemeFactory implements SchemeFactory {
+    private static class updateImageVersion_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public updateImageVersion_resultStandardScheme getScheme() {
         return new updateImageVersion_resultStandardScheme();
       }
     }
 
-    private static class updateImageVersion_resultStandardScheme extends StandardScheme<updateImageVersion_result> {
+    private static class updateImageVersion_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<updateImageVersion_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, updateImageVersion_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -30899,18 +31615,18 @@ public class SatelliteServer {
 
     }
 
-    private static class updateImageVersion_resultTupleSchemeFactory implements SchemeFactory {
+    private static class updateImageVersion_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public updateImageVersion_resultTupleScheme getScheme() {
         return new updateImageVersion_resultTupleScheme();
       }
     }
 
-    private static class updateImageVersion_resultTupleScheme extends TupleScheme<updateImageVersion_result> {
+    private static class updateImageVersion_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<updateImageVersion_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, updateImageVersion_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetAuthError()) {
           optionals.set(0);
         }
@@ -30934,8 +31650,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, updateImageVersion_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(3);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           struct.authError = new TAuthorizationException();
           struct.authError.read(iprot);
@@ -30954,6 +31670,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class deleteImageVersion_args implements org.apache.thrift.TBase<deleteImageVersion_args, deleteImageVersion_args._Fields>, java.io.Serializable, Cloneable, Comparable<deleteImageVersion_args>   {
@@ -30962,24 +31681,21 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField USER_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("userToken", org.apache.thrift.protocol.TType.STRING, (short)1);
     private static final org.apache.thrift.protocol.TField IMAGE_VERSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("imageVersionId", org.apache.thrift.protocol.TType.STRING, (short)2);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new deleteImageVersion_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new deleteImageVersion_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new deleteImageVersion_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new deleteImageVersion_argsTupleSchemeFactory();
 
-    public String userToken; // required
-    public String imageVersionId; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String userToken; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String imageVersionId; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       USER_TOKEN((short)1, "userToken"),
       IMAGE_VERSION_ID((short)2, "imageVersionId");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -30987,6 +31703,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // USER_TOKEN
@@ -31004,21 +31721,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -31027,20 +31745,20 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.USER_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("userToken", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
       tmpMap.put(_Fields.IMAGE_VERSION_ID, new org.apache.thrift.meta_data.FieldMetaData("imageVersionId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "UUID")));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(deleteImageVersion_args.class, metaDataMap);
     }
 
@@ -31048,8 +31766,8 @@ public class SatelliteServer {
     }
 
     public deleteImageVersion_args(
-      String userToken,
-      String imageVersionId)
+      java.lang.String userToken,
+      java.lang.String imageVersionId)
     {
       this();
       this.userToken = userToken;
@@ -31078,11 +31796,12 @@ public class SatelliteServer {
       this.imageVersionId = null;
     }
 
-    public String getUserToken() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getUserToken() {
       return this.userToken;
     }
 
-    public deleteImageVersion_args setUserToken(String userToken) {
+    public deleteImageVersion_args setUserToken(@org.apache.thrift.annotation.Nullable java.lang.String userToken) {
       this.userToken = userToken;
       return this;
     }
@@ -31102,11 +31821,12 @@ public class SatelliteServer {
       }
     }
 
-    public String getImageVersionId() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getImageVersionId() {
       return this.imageVersionId;
     }
 
-    public deleteImageVersion_args setImageVersionId(String imageVersionId) {
+    public deleteImageVersion_args setImageVersionId(@org.apache.thrift.annotation.Nullable java.lang.String imageVersionId) {
       this.imageVersionId = imageVersionId;
       return this;
     }
@@ -31126,13 +31846,13 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case USER_TOKEN:
         if (value == null) {
           unsetUserToken();
         } else {
-          setUserToken((String)value);
+          setUserToken((java.lang.String)value);
         }
         break;
 
@@ -31140,14 +31860,15 @@ public class SatelliteServer {
         if (value == null) {
           unsetImageVersionId();
         } else {
-          setImageVersionId((String)value);
+          setImageVersionId((java.lang.String)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case USER_TOKEN:
         return getUserToken();
@@ -31156,13 +31877,13 @@ public class SatelliteServer {
         return getImageVersionId();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -31171,13 +31892,11 @@ public class SatelliteServer {
       case IMAGE_VERSION_ID:
         return isSetImageVersionId();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof deleteImageVersion_args)
         return this.equals((deleteImageVersion_args)that);
       return false;
@@ -31186,6 +31905,8 @@ public class SatelliteServer {
     public boolean equals(deleteImageVersion_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_userToken = true && this.isSetUserToken();
       boolean that_present_userToken = true && that.isSetUserToken();
@@ -31210,19 +31931,17 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_userToken = true && (isSetUserToken());
-      list.add(present_userToken);
-      if (present_userToken)
-        list.add(userToken);
+      hashCode = hashCode * 8191 + ((isSetUserToken()) ? 131071 : 524287);
+      if (isSetUserToken())
+        hashCode = hashCode * 8191 + userToken.hashCode();
 
-      boolean present_imageVersionId = true && (isSetImageVersionId());
-      list.add(present_imageVersionId);
-      if (present_imageVersionId)
-        list.add(imageVersionId);
+      hashCode = hashCode * 8191 + ((isSetImageVersionId()) ? 131071 : 524287);
+      if (isSetImageVersionId())
+        hashCode = hashCode * 8191 + imageVersionId.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -31233,7 +31952,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetUserToken()).compareTo(other.isSetUserToken());
+      lastComparison = java.lang.Boolean.compare(isSetUserToken(), other.isSetUserToken());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -31243,7 +31962,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetImageVersionId()).compareTo(other.isSetImageVersionId());
+      lastComparison = java.lang.Boolean.compare(isSetImageVersionId(), other.isSetImageVersionId());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -31256,21 +31975,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("deleteImageVersion_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("deleteImageVersion_args(");
       boolean first = true;
 
       sb.append("userToken:");
@@ -31305,7 +32025,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -31313,13 +32033,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class deleteImageVersion_argsStandardSchemeFactory implements SchemeFactory {
+    private static class deleteImageVersion_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public deleteImageVersion_argsStandardScheme getScheme() {
         return new deleteImageVersion_argsStandardScheme();
       }
     }
 
-    private static class deleteImageVersion_argsStandardScheme extends StandardScheme<deleteImageVersion_args> {
+    private static class deleteImageVersion_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<deleteImageVersion_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, deleteImageVersion_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -31378,18 +32098,18 @@ public class SatelliteServer {
 
     }
 
-    private static class deleteImageVersion_argsTupleSchemeFactory implements SchemeFactory {
+    private static class deleteImageVersion_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public deleteImageVersion_argsTupleScheme getScheme() {
         return new deleteImageVersion_argsTupleScheme();
       }
     }
 
-    private static class deleteImageVersion_argsTupleScheme extends TupleScheme<deleteImageVersion_args> {
+    private static class deleteImageVersion_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<deleteImageVersion_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, deleteImageVersion_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetUserToken()) {
           optionals.set(0);
         }
@@ -31407,8 +32127,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, deleteImageVersion_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(2);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           struct.userToken = iprot.readString();
           struct.setUserTokenIsSet(true);
@@ -31420,6 +32140,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class deleteImageVersion_result implements org.apache.thrift.TBase<deleteImageVersion_result, deleteImageVersion_result._Fields>, java.io.Serializable, Cloneable, Comparable<deleteImageVersion_result>   {
@@ -31429,15 +32152,12 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField NOT_FOUND_FIELD_DESC = new org.apache.thrift.protocol.TField("notFound", org.apache.thrift.protocol.TType.STRUCT, (short)2);
     private static final org.apache.thrift.protocol.TField SERVER_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("serverError", org.apache.thrift.protocol.TType.STRUCT, (short)3);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new deleteImageVersion_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new deleteImageVersion_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new deleteImageVersion_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new deleteImageVersion_resultTupleSchemeFactory();
 
-    public TAuthorizationException authError; // required
-    public TNotFoundException notFound; // required
-    public TInvocationException serverError; // required
+    public @org.apache.thrift.annotation.Nullable TAuthorizationException authError; // required
+    public @org.apache.thrift.annotation.Nullable TNotFoundException notFound; // required
+    public @org.apache.thrift.annotation.Nullable TInvocationException serverError; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -31445,10 +32165,10 @@ public class SatelliteServer {
       NOT_FOUND((short)2, "notFound"),
       SERVER_ERROR((short)3, "serverError");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -31456,6 +32176,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // AUTH_ERROR
@@ -31475,21 +32196,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -31498,22 +32220,22 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.AUTH_ERROR, new org.apache.thrift.meta_data.FieldMetaData("authError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class)));
       tmpMap.put(_Fields.NOT_FOUND, new org.apache.thrift.meta_data.FieldMetaData("notFound", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TNotFoundException.class)));
       tmpMap.put(_Fields.SERVER_ERROR, new org.apache.thrift.meta_data.FieldMetaData("serverError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(deleteImageVersion_result.class, metaDataMap);
     }
 
@@ -31557,11 +32279,12 @@ public class SatelliteServer {
       this.serverError = null;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TAuthorizationException getAuthError() {
       return this.authError;
     }
 
-    public deleteImageVersion_result setAuthError(TAuthorizationException authError) {
+    public deleteImageVersion_result setAuthError(@org.apache.thrift.annotation.Nullable TAuthorizationException authError) {
       this.authError = authError;
       return this;
     }
@@ -31581,11 +32304,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TNotFoundException getNotFound() {
       return this.notFound;
     }
 
-    public deleteImageVersion_result setNotFound(TNotFoundException notFound) {
+    public deleteImageVersion_result setNotFound(@org.apache.thrift.annotation.Nullable TNotFoundException notFound) {
       this.notFound = notFound;
       return this;
     }
@@ -31605,11 +32329,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvocationException getServerError() {
       return this.serverError;
     }
 
-    public deleteImageVersion_result setServerError(TInvocationException serverError) {
+    public deleteImageVersion_result setServerError(@org.apache.thrift.annotation.Nullable TInvocationException serverError) {
       this.serverError = serverError;
       return this;
     }
@@ -31629,7 +32354,7 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case AUTH_ERROR:
         if (value == null) {
@@ -31658,7 +32383,8 @@ public class SatelliteServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case AUTH_ERROR:
         return getAuthError();
@@ -31670,13 +32396,13 @@ public class SatelliteServer {
         return getServerError();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -31687,13 +32413,11 @@ public class SatelliteServer {
       case SERVER_ERROR:
         return isSetServerError();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof deleteImageVersion_result)
         return this.equals((deleteImageVersion_result)that);
       return false;
@@ -31702,6 +32426,8 @@ public class SatelliteServer {
     public boolean equals(deleteImageVersion_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_authError = true && this.isSetAuthError();
       boolean that_present_authError = true && that.isSetAuthError();
@@ -31735,24 +32461,21 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_authError = true && (isSetAuthError());
-      list.add(present_authError);
-      if (present_authError)
-        list.add(authError);
+      hashCode = hashCode * 8191 + ((isSetAuthError()) ? 131071 : 524287);
+      if (isSetAuthError())
+        hashCode = hashCode * 8191 + authError.hashCode();
 
-      boolean present_notFound = true && (isSetNotFound());
-      list.add(present_notFound);
-      if (present_notFound)
-        list.add(notFound);
+      hashCode = hashCode * 8191 + ((isSetNotFound()) ? 131071 : 524287);
+      if (isSetNotFound())
+        hashCode = hashCode * 8191 + notFound.hashCode();
 
-      boolean present_serverError = true && (isSetServerError());
-      list.add(present_serverError);
-      if (present_serverError)
-        list.add(serverError);
+      hashCode = hashCode * 8191 + ((isSetServerError()) ? 131071 : 524287);
+      if (isSetServerError())
+        hashCode = hashCode * 8191 + serverError.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -31763,7 +32486,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetAuthError()).compareTo(other.isSetAuthError());
+      lastComparison = java.lang.Boolean.compare(isSetAuthError(), other.isSetAuthError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -31773,7 +32496,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetNotFound()).compareTo(other.isSetNotFound());
+      lastComparison = java.lang.Boolean.compare(isSetNotFound(), other.isSetNotFound());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -31783,7 +32506,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetServerError()).compareTo(other.isSetServerError());
+      lastComparison = java.lang.Boolean.compare(isSetServerError(), other.isSetServerError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -31796,21 +32519,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("deleteImageVersion_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("deleteImageVersion_result(");
       boolean first = true;
 
       sb.append("authError:");
@@ -31853,7 +32577,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -31861,13 +32585,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class deleteImageVersion_resultStandardSchemeFactory implements SchemeFactory {
+    private static class deleteImageVersion_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public deleteImageVersion_resultStandardScheme getScheme() {
         return new deleteImageVersion_resultStandardScheme();
       }
     }
 
-    private static class deleteImageVersion_resultStandardScheme extends StandardScheme<deleteImageVersion_result> {
+    private static class deleteImageVersion_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<deleteImageVersion_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, deleteImageVersion_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -31942,18 +32666,18 @@ public class SatelliteServer {
 
     }
 
-    private static class deleteImageVersion_resultTupleSchemeFactory implements SchemeFactory {
+    private static class deleteImageVersion_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public deleteImageVersion_resultTupleScheme getScheme() {
         return new deleteImageVersion_resultTupleScheme();
       }
     }
 
-    private static class deleteImageVersion_resultTupleScheme extends TupleScheme<deleteImageVersion_result> {
+    private static class deleteImageVersion_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<deleteImageVersion_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, deleteImageVersion_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetAuthError()) {
           optionals.set(0);
         }
@@ -31977,8 +32701,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, deleteImageVersion_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(3);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           struct.authError = new TAuthorizationException();
           struct.authError.read(iprot);
@@ -31997,6 +32721,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class deleteImageBase_args implements org.apache.thrift.TBase<deleteImageBase_args, deleteImageBase_args._Fields>, java.io.Serializable, Cloneable, Comparable<deleteImageBase_args>   {
@@ -32005,24 +32732,21 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField USER_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("userToken", org.apache.thrift.protocol.TType.STRING, (short)1);
     private static final org.apache.thrift.protocol.TField IMAGE_BASE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("imageBaseId", org.apache.thrift.protocol.TType.STRING, (short)2);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new deleteImageBase_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new deleteImageBase_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new deleteImageBase_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new deleteImageBase_argsTupleSchemeFactory();
 
-    public String userToken; // required
-    public String imageBaseId; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String userToken; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String imageBaseId; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       USER_TOKEN((short)1, "userToken"),
       IMAGE_BASE_ID((short)2, "imageBaseId");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -32030,6 +32754,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // USER_TOKEN
@@ -32047,21 +32772,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -32070,20 +32796,20 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.USER_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("userToken", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
       tmpMap.put(_Fields.IMAGE_BASE_ID, new org.apache.thrift.meta_data.FieldMetaData("imageBaseId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "UUID")));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(deleteImageBase_args.class, metaDataMap);
     }
 
@@ -32091,8 +32817,8 @@ public class SatelliteServer {
     }
 
     public deleteImageBase_args(
-      String userToken,
-      String imageBaseId)
+      java.lang.String userToken,
+      java.lang.String imageBaseId)
     {
       this();
       this.userToken = userToken;
@@ -32121,11 +32847,12 @@ public class SatelliteServer {
       this.imageBaseId = null;
     }
 
-    public String getUserToken() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getUserToken() {
       return this.userToken;
     }
 
-    public deleteImageBase_args setUserToken(String userToken) {
+    public deleteImageBase_args setUserToken(@org.apache.thrift.annotation.Nullable java.lang.String userToken) {
       this.userToken = userToken;
       return this;
     }
@@ -32145,11 +32872,12 @@ public class SatelliteServer {
       }
     }
 
-    public String getImageBaseId() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getImageBaseId() {
       return this.imageBaseId;
     }
 
-    public deleteImageBase_args setImageBaseId(String imageBaseId) {
+    public deleteImageBase_args setImageBaseId(@org.apache.thrift.annotation.Nullable java.lang.String imageBaseId) {
       this.imageBaseId = imageBaseId;
       return this;
     }
@@ -32169,13 +32897,13 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case USER_TOKEN:
         if (value == null) {
           unsetUserToken();
         } else {
-          setUserToken((String)value);
+          setUserToken((java.lang.String)value);
         }
         break;
 
@@ -32183,14 +32911,15 @@ public class SatelliteServer {
         if (value == null) {
           unsetImageBaseId();
         } else {
-          setImageBaseId((String)value);
+          setImageBaseId((java.lang.String)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case USER_TOKEN:
         return getUserToken();
@@ -32199,13 +32928,13 @@ public class SatelliteServer {
         return getImageBaseId();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -32214,13 +32943,11 @@ public class SatelliteServer {
       case IMAGE_BASE_ID:
         return isSetImageBaseId();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof deleteImageBase_args)
         return this.equals((deleteImageBase_args)that);
       return false;
@@ -32229,6 +32956,8 @@ public class SatelliteServer {
     public boolean equals(deleteImageBase_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_userToken = true && this.isSetUserToken();
       boolean that_present_userToken = true && that.isSetUserToken();
@@ -32253,19 +32982,17 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_userToken = true && (isSetUserToken());
-      list.add(present_userToken);
-      if (present_userToken)
-        list.add(userToken);
+      hashCode = hashCode * 8191 + ((isSetUserToken()) ? 131071 : 524287);
+      if (isSetUserToken())
+        hashCode = hashCode * 8191 + userToken.hashCode();
 
-      boolean present_imageBaseId = true && (isSetImageBaseId());
-      list.add(present_imageBaseId);
-      if (present_imageBaseId)
-        list.add(imageBaseId);
+      hashCode = hashCode * 8191 + ((isSetImageBaseId()) ? 131071 : 524287);
+      if (isSetImageBaseId())
+        hashCode = hashCode * 8191 + imageBaseId.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -32276,7 +33003,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetUserToken()).compareTo(other.isSetUserToken());
+      lastComparison = java.lang.Boolean.compare(isSetUserToken(), other.isSetUserToken());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -32286,7 +33013,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetImageBaseId()).compareTo(other.isSetImageBaseId());
+      lastComparison = java.lang.Boolean.compare(isSetImageBaseId(), other.isSetImageBaseId());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -32299,21 +33026,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("deleteImageBase_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("deleteImageBase_args(");
       boolean first = true;
 
       sb.append("userToken:");
@@ -32348,7 +33076,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -32356,13 +33084,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class deleteImageBase_argsStandardSchemeFactory implements SchemeFactory {
+    private static class deleteImageBase_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public deleteImageBase_argsStandardScheme getScheme() {
         return new deleteImageBase_argsStandardScheme();
       }
     }
 
-    private static class deleteImageBase_argsStandardScheme extends StandardScheme<deleteImageBase_args> {
+    private static class deleteImageBase_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<deleteImageBase_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, deleteImageBase_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -32421,18 +33149,18 @@ public class SatelliteServer {
 
     }
 
-    private static class deleteImageBase_argsTupleSchemeFactory implements SchemeFactory {
+    private static class deleteImageBase_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public deleteImageBase_argsTupleScheme getScheme() {
         return new deleteImageBase_argsTupleScheme();
       }
     }
 
-    private static class deleteImageBase_argsTupleScheme extends TupleScheme<deleteImageBase_args> {
+    private static class deleteImageBase_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<deleteImageBase_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, deleteImageBase_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetUserToken()) {
           optionals.set(0);
         }
@@ -32450,8 +33178,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, deleteImageBase_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(2);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           struct.userToken = iprot.readString();
           struct.setUserTokenIsSet(true);
@@ -32463,6 +33191,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class deleteImageBase_result implements org.apache.thrift.TBase<deleteImageBase_result, deleteImageBase_result._Fields>, java.io.Serializable, Cloneable, Comparable<deleteImageBase_result>   {
@@ -32472,15 +33203,12 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField NOT_FOUND_FIELD_DESC = new org.apache.thrift.protocol.TField("notFound", org.apache.thrift.protocol.TType.STRUCT, (short)2);
     private static final org.apache.thrift.protocol.TField SERVER_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("serverError", org.apache.thrift.protocol.TType.STRUCT, (short)3);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new deleteImageBase_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new deleteImageBase_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new deleteImageBase_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new deleteImageBase_resultTupleSchemeFactory();
 
-    public TAuthorizationException authError; // required
-    public TNotFoundException notFound; // required
-    public TInvocationException serverError; // required
+    public @org.apache.thrift.annotation.Nullable TAuthorizationException authError; // required
+    public @org.apache.thrift.annotation.Nullable TNotFoundException notFound; // required
+    public @org.apache.thrift.annotation.Nullable TInvocationException serverError; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -32488,10 +33216,10 @@ public class SatelliteServer {
       NOT_FOUND((short)2, "notFound"),
       SERVER_ERROR((short)3, "serverError");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -32499,6 +33227,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // AUTH_ERROR
@@ -32518,21 +33247,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -32541,22 +33271,22 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.AUTH_ERROR, new org.apache.thrift.meta_data.FieldMetaData("authError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class)));
       tmpMap.put(_Fields.NOT_FOUND, new org.apache.thrift.meta_data.FieldMetaData("notFound", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TNotFoundException.class)));
       tmpMap.put(_Fields.SERVER_ERROR, new org.apache.thrift.meta_data.FieldMetaData("serverError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(deleteImageBase_result.class, metaDataMap);
     }
 
@@ -32600,11 +33330,12 @@ public class SatelliteServer {
       this.serverError = null;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TAuthorizationException getAuthError() {
       return this.authError;
     }
 
-    public deleteImageBase_result setAuthError(TAuthorizationException authError) {
+    public deleteImageBase_result setAuthError(@org.apache.thrift.annotation.Nullable TAuthorizationException authError) {
       this.authError = authError;
       return this;
     }
@@ -32624,11 +33355,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TNotFoundException getNotFound() {
       return this.notFound;
     }
 
-    public deleteImageBase_result setNotFound(TNotFoundException notFound) {
+    public deleteImageBase_result setNotFound(@org.apache.thrift.annotation.Nullable TNotFoundException notFound) {
       this.notFound = notFound;
       return this;
     }
@@ -32648,11 +33380,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvocationException getServerError() {
       return this.serverError;
     }
 
-    public deleteImageBase_result setServerError(TInvocationException serverError) {
+    public deleteImageBase_result setServerError(@org.apache.thrift.annotation.Nullable TInvocationException serverError) {
       this.serverError = serverError;
       return this;
     }
@@ -32672,7 +33405,7 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case AUTH_ERROR:
         if (value == null) {
@@ -32701,7 +33434,8 @@ public class SatelliteServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case AUTH_ERROR:
         return getAuthError();
@@ -32713,13 +33447,13 @@ public class SatelliteServer {
         return getServerError();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -32730,13 +33464,11 @@ public class SatelliteServer {
       case SERVER_ERROR:
         return isSetServerError();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof deleteImageBase_result)
         return this.equals((deleteImageBase_result)that);
       return false;
@@ -32745,6 +33477,8 @@ public class SatelliteServer {
     public boolean equals(deleteImageBase_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_authError = true && this.isSetAuthError();
       boolean that_present_authError = true && that.isSetAuthError();
@@ -32778,24 +33512,21 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_authError = true && (isSetAuthError());
-      list.add(present_authError);
-      if (present_authError)
-        list.add(authError);
+      hashCode = hashCode * 8191 + ((isSetAuthError()) ? 131071 : 524287);
+      if (isSetAuthError())
+        hashCode = hashCode * 8191 + authError.hashCode();
 
-      boolean present_notFound = true && (isSetNotFound());
-      list.add(present_notFound);
-      if (present_notFound)
-        list.add(notFound);
+      hashCode = hashCode * 8191 + ((isSetNotFound()) ? 131071 : 524287);
+      if (isSetNotFound())
+        hashCode = hashCode * 8191 + notFound.hashCode();
 
-      boolean present_serverError = true && (isSetServerError());
-      list.add(present_serverError);
-      if (present_serverError)
-        list.add(serverError);
+      hashCode = hashCode * 8191 + ((isSetServerError()) ? 131071 : 524287);
+      if (isSetServerError())
+        hashCode = hashCode * 8191 + serverError.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -32806,7 +33537,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetAuthError()).compareTo(other.isSetAuthError());
+      lastComparison = java.lang.Boolean.compare(isSetAuthError(), other.isSetAuthError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -32816,7 +33547,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetNotFound()).compareTo(other.isSetNotFound());
+      lastComparison = java.lang.Boolean.compare(isSetNotFound(), other.isSetNotFound());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -32826,7 +33557,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetServerError()).compareTo(other.isSetServerError());
+      lastComparison = java.lang.Boolean.compare(isSetServerError(), other.isSetServerError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -32839,21 +33570,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("deleteImageBase_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("deleteImageBase_result(");
       boolean first = true;
 
       sb.append("authError:");
@@ -32896,7 +33628,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -32904,13 +33636,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class deleteImageBase_resultStandardSchemeFactory implements SchemeFactory {
+    private static class deleteImageBase_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public deleteImageBase_resultStandardScheme getScheme() {
         return new deleteImageBase_resultStandardScheme();
       }
     }
 
-    private static class deleteImageBase_resultStandardScheme extends StandardScheme<deleteImageBase_result> {
+    private static class deleteImageBase_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<deleteImageBase_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, deleteImageBase_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -32985,18 +33717,18 @@ public class SatelliteServer {
 
     }
 
-    private static class deleteImageBase_resultTupleSchemeFactory implements SchemeFactory {
+    private static class deleteImageBase_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public deleteImageBase_resultTupleScheme getScheme() {
         return new deleteImageBase_resultTupleScheme();
       }
     }
 
-    private static class deleteImageBase_resultTupleScheme extends TupleScheme<deleteImageBase_result> {
+    private static class deleteImageBase_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<deleteImageBase_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, deleteImageBase_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetAuthError()) {
           optionals.set(0);
         }
@@ -33020,8 +33752,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, deleteImageBase_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(3);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           struct.authError = new TAuthorizationException();
           struct.authError.read(iprot);
@@ -33040,6 +33772,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class writeImagePermissions_args implements org.apache.thrift.TBase<writeImagePermissions_args, writeImagePermissions_args._Fields>, java.io.Serializable, Cloneable, Comparable<writeImagePermissions_args>   {
@@ -33049,15 +33784,12 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField IMAGE_BASE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("imageBaseId", org.apache.thrift.protocol.TType.STRING, (short)2);
     private static final org.apache.thrift.protocol.TField PERMISSIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("permissions", org.apache.thrift.protocol.TType.MAP, (short)3);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new writeImagePermissions_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new writeImagePermissions_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new writeImagePermissions_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new writeImagePermissions_argsTupleSchemeFactory();
 
-    public String userToken; // required
-    public String imageBaseId; // required
-    public Map<String,ImagePermissions> permissions; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String userToken; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String imageBaseId; // required
+    public @org.apache.thrift.annotation.Nullable java.util.Map<java.lang.String,ImagePermissions> permissions; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -33065,10 +33797,10 @@ public class SatelliteServer {
       IMAGE_BASE_ID((short)2, "imageBaseId"),
       PERMISSIONS((short)3, "permissions");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -33076,6 +33808,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // USER_TOKEN
@@ -33095,21 +33828,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -33118,15 +33852,15 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.USER_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("userToken", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
       tmpMap.put(_Fields.IMAGE_BASE_ID, new org.apache.thrift.meta_data.FieldMetaData("imageBaseId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -33135,7 +33869,7 @@ public class SatelliteServer {
           new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
               new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING              , "UUID"), 
               new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ImagePermissions.class))));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(writeImagePermissions_args.class, metaDataMap);
     }
 
@@ -33143,9 +33877,9 @@ public class SatelliteServer {
     }
 
     public writeImagePermissions_args(
-      String userToken,
-      String imageBaseId,
-      Map<String,ImagePermissions> permissions)
+      java.lang.String userToken,
+      java.lang.String imageBaseId,
+      java.util.Map<java.lang.String,ImagePermissions> permissions)
     {
       this();
       this.userToken = userToken;
@@ -33164,13 +33898,13 @@ public class SatelliteServer {
         this.imageBaseId = other.imageBaseId;
       }
       if (other.isSetPermissions()) {
-        Map<String,ImagePermissions> __this__permissions = new HashMap<String,ImagePermissions>(other.permissions.size());
-        for (Map.Entry<String, ImagePermissions> other_element : other.permissions.entrySet()) {
+        java.util.Map<java.lang.String,ImagePermissions> __this__permissions = new java.util.HashMap<java.lang.String,ImagePermissions>(other.permissions.size());
+        for (java.util.Map.Entry<java.lang.String, ImagePermissions> other_element : other.permissions.entrySet()) {
 
-          String other_element_key = other_element.getKey();
+          java.lang.String other_element_key = other_element.getKey();
           ImagePermissions other_element_value = other_element.getValue();
 
-          String __this__permissions_copy_key = other_element_key;
+          java.lang.String __this__permissions_copy_key = other_element_key;
 
           ImagePermissions __this__permissions_copy_value = new ImagePermissions(other_element_value);
 
@@ -33191,11 +33925,12 @@ public class SatelliteServer {
       this.permissions = null;
     }
 
-    public String getUserToken() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getUserToken() {
       return this.userToken;
     }
 
-    public writeImagePermissions_args setUserToken(String userToken) {
+    public writeImagePermissions_args setUserToken(@org.apache.thrift.annotation.Nullable java.lang.String userToken) {
       this.userToken = userToken;
       return this;
     }
@@ -33215,11 +33950,12 @@ public class SatelliteServer {
       }
     }
 
-    public String getImageBaseId() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getImageBaseId() {
       return this.imageBaseId;
     }
 
-    public writeImagePermissions_args setImageBaseId(String imageBaseId) {
+    public writeImagePermissions_args setImageBaseId(@org.apache.thrift.annotation.Nullable java.lang.String imageBaseId) {
       this.imageBaseId = imageBaseId;
       return this;
     }
@@ -33243,18 +33979,19 @@ public class SatelliteServer {
       return (this.permissions == null) ? 0 : this.permissions.size();
     }
 
-    public void putToPermissions(String key, ImagePermissions val) {
+    public void putToPermissions(java.lang.String key, ImagePermissions val) {
       if (this.permissions == null) {
-        this.permissions = new HashMap<String,ImagePermissions>();
+        this.permissions = new java.util.HashMap<java.lang.String,ImagePermissions>();
       }
       this.permissions.put(key, val);
     }
 
-    public Map<String,ImagePermissions> getPermissions() {
+    @org.apache.thrift.annotation.Nullable
+    public java.util.Map<java.lang.String,ImagePermissions> getPermissions() {
       return this.permissions;
     }
 
-    public writeImagePermissions_args setPermissions(Map<String,ImagePermissions> permissions) {
+    public writeImagePermissions_args setPermissions(@org.apache.thrift.annotation.Nullable java.util.Map<java.lang.String,ImagePermissions> permissions) {
       this.permissions = permissions;
       return this;
     }
@@ -33274,13 +34011,13 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case USER_TOKEN:
         if (value == null) {
           unsetUserToken();
         } else {
-          setUserToken((String)value);
+          setUserToken((java.lang.String)value);
         }
         break;
 
@@ -33288,7 +34025,7 @@ public class SatelliteServer {
         if (value == null) {
           unsetImageBaseId();
         } else {
-          setImageBaseId((String)value);
+          setImageBaseId((java.lang.String)value);
         }
         break;
 
@@ -33296,14 +34033,15 @@ public class SatelliteServer {
         if (value == null) {
           unsetPermissions();
         } else {
-          setPermissions((Map<String,ImagePermissions>)value);
+          setPermissions((java.util.Map<java.lang.String,ImagePermissions>)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case USER_TOKEN:
         return getUserToken();
@@ -33315,13 +34053,13 @@ public class SatelliteServer {
         return getPermissions();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -33332,13 +34070,11 @@ public class SatelliteServer {
       case PERMISSIONS:
         return isSetPermissions();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof writeImagePermissions_args)
         return this.equals((writeImagePermissions_args)that);
       return false;
@@ -33347,6 +34083,8 @@ public class SatelliteServer {
     public boolean equals(writeImagePermissions_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_userToken = true && this.isSetUserToken();
       boolean that_present_userToken = true && that.isSetUserToken();
@@ -33380,24 +34118,21 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_userToken = true && (isSetUserToken());
-      list.add(present_userToken);
-      if (present_userToken)
-        list.add(userToken);
+      hashCode = hashCode * 8191 + ((isSetUserToken()) ? 131071 : 524287);
+      if (isSetUserToken())
+        hashCode = hashCode * 8191 + userToken.hashCode();
 
-      boolean present_imageBaseId = true && (isSetImageBaseId());
-      list.add(present_imageBaseId);
-      if (present_imageBaseId)
-        list.add(imageBaseId);
+      hashCode = hashCode * 8191 + ((isSetImageBaseId()) ? 131071 : 524287);
+      if (isSetImageBaseId())
+        hashCode = hashCode * 8191 + imageBaseId.hashCode();
 
-      boolean present_permissions = true && (isSetPermissions());
-      list.add(present_permissions);
-      if (present_permissions)
-        list.add(permissions);
+      hashCode = hashCode * 8191 + ((isSetPermissions()) ? 131071 : 524287);
+      if (isSetPermissions())
+        hashCode = hashCode * 8191 + permissions.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -33408,7 +34143,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetUserToken()).compareTo(other.isSetUserToken());
+      lastComparison = java.lang.Boolean.compare(isSetUserToken(), other.isSetUserToken());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -33418,7 +34153,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetImageBaseId()).compareTo(other.isSetImageBaseId());
+      lastComparison = java.lang.Boolean.compare(isSetImageBaseId(), other.isSetImageBaseId());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -33428,7 +34163,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetPermissions()).compareTo(other.isSetPermissions());
+      lastComparison = java.lang.Boolean.compare(isSetPermissions(), other.isSetPermissions());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -33441,21 +34176,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("writeImagePermissions_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("writeImagePermissions_args(");
       boolean first = true;
 
       sb.append("userToken:");
@@ -33498,7 +34234,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -33506,13 +34242,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class writeImagePermissions_argsStandardSchemeFactory implements SchemeFactory {
+    private static class writeImagePermissions_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public writeImagePermissions_argsStandardScheme getScheme() {
         return new writeImagePermissions_argsStandardScheme();
       }
     }
 
-    private static class writeImagePermissions_argsStandardScheme extends StandardScheme<writeImagePermissions_args> {
+    private static class writeImagePermissions_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<writeImagePermissions_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, writeImagePermissions_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -33543,16 +34279,16 @@ public class SatelliteServer {
             case 3: // PERMISSIONS
               if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  org.apache.thrift.protocol.TMap _map290 = iprot.readMapBegin();
-                  struct.permissions = new HashMap<String,ImagePermissions>(2*_map290.size);
-                  String _key291;
-                  ImagePermissions _val292;
-                  for (int _i293 = 0; _i293 < _map290.size; ++_i293)
+                  org.apache.thrift.protocol.TMap _map370 = iprot.readMapBegin();
+                  struct.permissions = new java.util.HashMap<java.lang.String,ImagePermissions>(2*_map370.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _key371;
+                  @org.apache.thrift.annotation.Nullable ImagePermissions _val372;
+                  for (int _i373 = 0; _i373 < _map370.size; ++_i373)
                   {
-                    _key291 = iprot.readString();
-                    _val292 = new ImagePermissions();
-                    _val292.read(iprot);
-                    struct.permissions.put(_key291, _val292);
+                    _key371 = iprot.readString();
+                    _val372 = new ImagePermissions();
+                    _val372.read(iprot);
+                    struct.permissions.put(_key371, _val372);
                   }
                   iprot.readMapEnd();
                 }
@@ -33590,10 +34326,10 @@ public class SatelliteServer {
           oprot.writeFieldBegin(PERMISSIONS_FIELD_DESC);
           {
             oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.permissions.size()));
-            for (Map.Entry<String, ImagePermissions> _iter294 : struct.permissions.entrySet())
+            for (java.util.Map.Entry<java.lang.String, ImagePermissions> _iter374 : struct.permissions.entrySet())
             {
-              oprot.writeString(_iter294.getKey());
-              _iter294.getValue().write(oprot);
+              oprot.writeString(_iter374.getKey());
+              _iter374.getValue().write(oprot);
             }
             oprot.writeMapEnd();
           }
@@ -33605,18 +34341,18 @@ public class SatelliteServer {
 
     }
 
-    private static class writeImagePermissions_argsTupleSchemeFactory implements SchemeFactory {
+    private static class writeImagePermissions_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public writeImagePermissions_argsTupleScheme getScheme() {
         return new writeImagePermissions_argsTupleScheme();
       }
     }
 
-    private static class writeImagePermissions_argsTupleScheme extends TupleScheme<writeImagePermissions_args> {
+    private static class writeImagePermissions_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<writeImagePermissions_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, writeImagePermissions_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetUserToken()) {
           optionals.set(0);
         }
@@ -33636,10 +34372,10 @@ public class SatelliteServer {
         if (struct.isSetPermissions()) {
           {
             oprot.writeI32(struct.permissions.size());
-            for (Map.Entry<String, ImagePermissions> _iter295 : struct.permissions.entrySet())
+            for (java.util.Map.Entry<java.lang.String, ImagePermissions> _iter375 : struct.permissions.entrySet())
             {
-              oprot.writeString(_iter295.getKey());
-              _iter295.getValue().write(oprot);
+              oprot.writeString(_iter375.getKey());
+              _iter375.getValue().write(oprot);
             }
           }
         }
@@ -33647,8 +34383,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, writeImagePermissions_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(3);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           struct.userToken = iprot.readString();
           struct.setUserTokenIsSet(true);
@@ -33659,16 +34395,16 @@ public class SatelliteServer {
         }
         if (incoming.get(2)) {
           {
-            org.apache.thrift.protocol.TMap _map296 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.permissions = new HashMap<String,ImagePermissions>(2*_map296.size);
-            String _key297;
-            ImagePermissions _val298;
-            for (int _i299 = 0; _i299 < _map296.size; ++_i299)
+            org.apache.thrift.protocol.TMap _map376 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT); 
+            struct.permissions = new java.util.HashMap<java.lang.String,ImagePermissions>(2*_map376.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _key377;
+            @org.apache.thrift.annotation.Nullable ImagePermissions _val378;
+            for (int _i379 = 0; _i379 < _map376.size; ++_i379)
             {
-              _key297 = iprot.readString();
-              _val298 = new ImagePermissions();
-              _val298.read(iprot);
-              struct.permissions.put(_key297, _val298);
+              _key377 = iprot.readString();
+              _val378 = new ImagePermissions();
+              _val378.read(iprot);
+              struct.permissions.put(_key377, _val378);
             }
           }
           struct.setPermissionsIsSet(true);
@@ -33676,6 +34412,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class writeImagePermissions_result implements org.apache.thrift.TBase<writeImagePermissions_result, writeImagePermissions_result._Fields>, java.io.Serializable, Cloneable, Comparable<writeImagePermissions_result>   {
@@ -33685,15 +34424,12 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField NOT_FOUND_FIELD_DESC = new org.apache.thrift.protocol.TField("notFound", org.apache.thrift.protocol.TType.STRUCT, (short)2);
     private static final org.apache.thrift.protocol.TField SERVER_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("serverError", org.apache.thrift.protocol.TType.STRUCT, (short)3);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new writeImagePermissions_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new writeImagePermissions_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new writeImagePermissions_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new writeImagePermissions_resultTupleSchemeFactory();
 
-    public TAuthorizationException authError; // required
-    public TNotFoundException notFound; // required
-    public TInvocationException serverError; // required
+    public @org.apache.thrift.annotation.Nullable TAuthorizationException authError; // required
+    public @org.apache.thrift.annotation.Nullable TNotFoundException notFound; // required
+    public @org.apache.thrift.annotation.Nullable TInvocationException serverError; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -33701,10 +34437,10 @@ public class SatelliteServer {
       NOT_FOUND((short)2, "notFound"),
       SERVER_ERROR((short)3, "serverError");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -33712,6 +34448,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // AUTH_ERROR
@@ -33731,21 +34468,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -33754,22 +34492,22 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.AUTH_ERROR, new org.apache.thrift.meta_data.FieldMetaData("authError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class)));
       tmpMap.put(_Fields.NOT_FOUND, new org.apache.thrift.meta_data.FieldMetaData("notFound", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TNotFoundException.class)));
       tmpMap.put(_Fields.SERVER_ERROR, new org.apache.thrift.meta_data.FieldMetaData("serverError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(writeImagePermissions_result.class, metaDataMap);
     }
 
@@ -33813,11 +34551,12 @@ public class SatelliteServer {
       this.serverError = null;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TAuthorizationException getAuthError() {
       return this.authError;
     }
 
-    public writeImagePermissions_result setAuthError(TAuthorizationException authError) {
+    public writeImagePermissions_result setAuthError(@org.apache.thrift.annotation.Nullable TAuthorizationException authError) {
       this.authError = authError;
       return this;
     }
@@ -33837,11 +34576,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TNotFoundException getNotFound() {
       return this.notFound;
     }
 
-    public writeImagePermissions_result setNotFound(TNotFoundException notFound) {
+    public writeImagePermissions_result setNotFound(@org.apache.thrift.annotation.Nullable TNotFoundException notFound) {
       this.notFound = notFound;
       return this;
     }
@@ -33861,11 +34601,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvocationException getServerError() {
       return this.serverError;
     }
 
-    public writeImagePermissions_result setServerError(TInvocationException serverError) {
+    public writeImagePermissions_result setServerError(@org.apache.thrift.annotation.Nullable TInvocationException serverError) {
       this.serverError = serverError;
       return this;
     }
@@ -33885,7 +34626,7 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case AUTH_ERROR:
         if (value == null) {
@@ -33914,7 +34655,8 @@ public class SatelliteServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case AUTH_ERROR:
         return getAuthError();
@@ -33926,13 +34668,13 @@ public class SatelliteServer {
         return getServerError();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -33943,13 +34685,11 @@ public class SatelliteServer {
       case SERVER_ERROR:
         return isSetServerError();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof writeImagePermissions_result)
         return this.equals((writeImagePermissions_result)that);
       return false;
@@ -33958,6 +34698,8 @@ public class SatelliteServer {
     public boolean equals(writeImagePermissions_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_authError = true && this.isSetAuthError();
       boolean that_present_authError = true && that.isSetAuthError();
@@ -33991,24 +34733,21 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_authError = true && (isSetAuthError());
-      list.add(present_authError);
-      if (present_authError)
-        list.add(authError);
+      hashCode = hashCode * 8191 + ((isSetAuthError()) ? 131071 : 524287);
+      if (isSetAuthError())
+        hashCode = hashCode * 8191 + authError.hashCode();
 
-      boolean present_notFound = true && (isSetNotFound());
-      list.add(present_notFound);
-      if (present_notFound)
-        list.add(notFound);
+      hashCode = hashCode * 8191 + ((isSetNotFound()) ? 131071 : 524287);
+      if (isSetNotFound())
+        hashCode = hashCode * 8191 + notFound.hashCode();
 
-      boolean present_serverError = true && (isSetServerError());
-      list.add(present_serverError);
-      if (present_serverError)
-        list.add(serverError);
+      hashCode = hashCode * 8191 + ((isSetServerError()) ? 131071 : 524287);
+      if (isSetServerError())
+        hashCode = hashCode * 8191 + serverError.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -34019,7 +34758,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetAuthError()).compareTo(other.isSetAuthError());
+      lastComparison = java.lang.Boolean.compare(isSetAuthError(), other.isSetAuthError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -34029,7 +34768,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetNotFound()).compareTo(other.isSetNotFound());
+      lastComparison = java.lang.Boolean.compare(isSetNotFound(), other.isSetNotFound());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -34039,7 +34778,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetServerError()).compareTo(other.isSetServerError());
+      lastComparison = java.lang.Boolean.compare(isSetServerError(), other.isSetServerError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -34052,21 +34791,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("writeImagePermissions_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("writeImagePermissions_result(");
       boolean first = true;
 
       sb.append("authError:");
@@ -34109,7 +34849,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -34117,13 +34857,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class writeImagePermissions_resultStandardSchemeFactory implements SchemeFactory {
+    private static class writeImagePermissions_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public writeImagePermissions_resultStandardScheme getScheme() {
         return new writeImagePermissions_resultStandardScheme();
       }
     }
 
-    private static class writeImagePermissions_resultStandardScheme extends StandardScheme<writeImagePermissions_result> {
+    private static class writeImagePermissions_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<writeImagePermissions_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, writeImagePermissions_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -34198,18 +34938,18 @@ public class SatelliteServer {
 
     }
 
-    private static class writeImagePermissions_resultTupleSchemeFactory implements SchemeFactory {
+    private static class writeImagePermissions_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public writeImagePermissions_resultTupleScheme getScheme() {
         return new writeImagePermissions_resultTupleScheme();
       }
     }
 
-    private static class writeImagePermissions_resultTupleScheme extends TupleScheme<writeImagePermissions_result> {
+    private static class writeImagePermissions_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<writeImagePermissions_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, writeImagePermissions_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetAuthError()) {
           optionals.set(0);
         }
@@ -34233,8 +34973,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, writeImagePermissions_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(3);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           struct.authError = new TAuthorizationException();
           struct.authError.read(iprot);
@@ -34253,6 +34993,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getImagePermissions_args implements org.apache.thrift.TBase<getImagePermissions_args, getImagePermissions_args._Fields>, java.io.Serializable, Cloneable, Comparable<getImagePermissions_args>   {
@@ -34261,24 +35004,21 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField USER_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("userToken", org.apache.thrift.protocol.TType.STRING, (short)1);
     private static final org.apache.thrift.protocol.TField IMAGE_BASE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("imageBaseId", org.apache.thrift.protocol.TType.STRING, (short)2);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getImagePermissions_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getImagePermissions_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getImagePermissions_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getImagePermissions_argsTupleSchemeFactory();
 
-    public String userToken; // required
-    public String imageBaseId; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String userToken; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String imageBaseId; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       USER_TOKEN((short)1, "userToken"),
       IMAGE_BASE_ID((short)2, "imageBaseId");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -34286,6 +35026,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // USER_TOKEN
@@ -34303,21 +35044,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -34326,20 +35068,20 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.USER_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("userToken", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
       tmpMap.put(_Fields.IMAGE_BASE_ID, new org.apache.thrift.meta_data.FieldMetaData("imageBaseId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "UUID")));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getImagePermissions_args.class, metaDataMap);
     }
 
@@ -34347,8 +35089,8 @@ public class SatelliteServer {
     }
 
     public getImagePermissions_args(
-      String userToken,
-      String imageBaseId)
+      java.lang.String userToken,
+      java.lang.String imageBaseId)
     {
       this();
       this.userToken = userToken;
@@ -34377,11 +35119,12 @@ public class SatelliteServer {
       this.imageBaseId = null;
     }
 
-    public String getUserToken() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getUserToken() {
       return this.userToken;
     }
 
-    public getImagePermissions_args setUserToken(String userToken) {
+    public getImagePermissions_args setUserToken(@org.apache.thrift.annotation.Nullable java.lang.String userToken) {
       this.userToken = userToken;
       return this;
     }
@@ -34401,11 +35144,12 @@ public class SatelliteServer {
       }
     }
 
-    public String getImageBaseId() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getImageBaseId() {
       return this.imageBaseId;
     }
 
-    public getImagePermissions_args setImageBaseId(String imageBaseId) {
+    public getImagePermissions_args setImageBaseId(@org.apache.thrift.annotation.Nullable java.lang.String imageBaseId) {
       this.imageBaseId = imageBaseId;
       return this;
     }
@@ -34425,13 +35169,13 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case USER_TOKEN:
         if (value == null) {
           unsetUserToken();
         } else {
-          setUserToken((String)value);
+          setUserToken((java.lang.String)value);
         }
         break;
 
@@ -34439,14 +35183,15 @@ public class SatelliteServer {
         if (value == null) {
           unsetImageBaseId();
         } else {
-          setImageBaseId((String)value);
+          setImageBaseId((java.lang.String)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case USER_TOKEN:
         return getUserToken();
@@ -34455,13 +35200,13 @@ public class SatelliteServer {
         return getImageBaseId();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -34470,13 +35215,11 @@ public class SatelliteServer {
       case IMAGE_BASE_ID:
         return isSetImageBaseId();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getImagePermissions_args)
         return this.equals((getImagePermissions_args)that);
       return false;
@@ -34485,6 +35228,8 @@ public class SatelliteServer {
     public boolean equals(getImagePermissions_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_userToken = true && this.isSetUserToken();
       boolean that_present_userToken = true && that.isSetUserToken();
@@ -34509,19 +35254,17 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_userToken = true && (isSetUserToken());
-      list.add(present_userToken);
-      if (present_userToken)
-        list.add(userToken);
+      hashCode = hashCode * 8191 + ((isSetUserToken()) ? 131071 : 524287);
+      if (isSetUserToken())
+        hashCode = hashCode * 8191 + userToken.hashCode();
 
-      boolean present_imageBaseId = true && (isSetImageBaseId());
-      list.add(present_imageBaseId);
-      if (present_imageBaseId)
-        list.add(imageBaseId);
+      hashCode = hashCode * 8191 + ((isSetImageBaseId()) ? 131071 : 524287);
+      if (isSetImageBaseId())
+        hashCode = hashCode * 8191 + imageBaseId.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -34532,7 +35275,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetUserToken()).compareTo(other.isSetUserToken());
+      lastComparison = java.lang.Boolean.compare(isSetUserToken(), other.isSetUserToken());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -34542,7 +35285,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetImageBaseId()).compareTo(other.isSetImageBaseId());
+      lastComparison = java.lang.Boolean.compare(isSetImageBaseId(), other.isSetImageBaseId());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -34555,21 +35298,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getImagePermissions_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getImagePermissions_args(");
       boolean first = true;
 
       sb.append("userToken:");
@@ -34604,7 +35348,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -34612,13 +35356,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class getImagePermissions_argsStandardSchemeFactory implements SchemeFactory {
+    private static class getImagePermissions_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getImagePermissions_argsStandardScheme getScheme() {
         return new getImagePermissions_argsStandardScheme();
       }
     }
 
-    private static class getImagePermissions_argsStandardScheme extends StandardScheme<getImagePermissions_args> {
+    private static class getImagePermissions_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<getImagePermissions_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getImagePermissions_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -34677,18 +35421,18 @@ public class SatelliteServer {
 
     }
 
-    private static class getImagePermissions_argsTupleSchemeFactory implements SchemeFactory {
+    private static class getImagePermissions_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getImagePermissions_argsTupleScheme getScheme() {
         return new getImagePermissions_argsTupleScheme();
       }
     }
 
-    private static class getImagePermissions_argsTupleScheme extends TupleScheme<getImagePermissions_args> {
+    private static class getImagePermissions_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<getImagePermissions_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getImagePermissions_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetUserToken()) {
           optionals.set(0);
         }
@@ -34706,8 +35450,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getImagePermissions_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(2);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           struct.userToken = iprot.readString();
           struct.setUserTokenIsSet(true);
@@ -34719,6 +35463,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getImagePermissions_result implements org.apache.thrift.TBase<getImagePermissions_result, getImagePermissions_result._Fields>, java.io.Serializable, Cloneable, Comparable<getImagePermissions_result>   {
@@ -34729,16 +35476,13 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField NOT_FOUND_FIELD_DESC = new org.apache.thrift.protocol.TField("notFound", org.apache.thrift.protocol.TType.STRUCT, (short)2);
     private static final org.apache.thrift.protocol.TField SERVER_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("serverError", org.apache.thrift.protocol.TType.STRUCT, (short)3);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getImagePermissions_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getImagePermissions_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getImagePermissions_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getImagePermissions_resultTupleSchemeFactory();
 
-    public Map<String,ImagePermissions> success; // required
-    public TAuthorizationException authError; // required
-    public TNotFoundException notFound; // required
-    public TInvocationException serverError; // required
+    public @org.apache.thrift.annotation.Nullable java.util.Map<java.lang.String,ImagePermissions> success; // required
+    public @org.apache.thrift.annotation.Nullable TAuthorizationException authError; // required
+    public @org.apache.thrift.annotation.Nullable TNotFoundException notFound; // required
+    public @org.apache.thrift.annotation.Nullable TInvocationException serverError; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -34747,10 +35491,10 @@ public class SatelliteServer {
       NOT_FOUND((short)2, "notFound"),
       SERVER_ERROR((short)3, "serverError");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -34758,6 +35502,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
@@ -34779,21 +35524,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -34802,26 +35548,26 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
               new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING              , "UUID"), 
               new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ImagePermissions.class))));
       tmpMap.put(_Fields.AUTH_ERROR, new org.apache.thrift.meta_data.FieldMetaData("authError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class)));
       tmpMap.put(_Fields.NOT_FOUND, new org.apache.thrift.meta_data.FieldMetaData("notFound", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TNotFoundException.class)));
       tmpMap.put(_Fields.SERVER_ERROR, new org.apache.thrift.meta_data.FieldMetaData("serverError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getImagePermissions_result.class, metaDataMap);
     }
 
@@ -34829,7 +35575,7 @@ public class SatelliteServer {
     }
 
     public getImagePermissions_result(
-      Map<String,ImagePermissions> success,
+      java.util.Map<java.lang.String,ImagePermissions> success,
       TAuthorizationException authError,
       TNotFoundException notFound,
       TInvocationException serverError)
@@ -34846,13 +35592,13 @@ public class SatelliteServer {
      */
     public getImagePermissions_result(getImagePermissions_result other) {
       if (other.isSetSuccess()) {
-        Map<String,ImagePermissions> __this__success = new HashMap<String,ImagePermissions>(other.success.size());
-        for (Map.Entry<String, ImagePermissions> other_element : other.success.entrySet()) {
+        java.util.Map<java.lang.String,ImagePermissions> __this__success = new java.util.HashMap<java.lang.String,ImagePermissions>(other.success.size());
+        for (java.util.Map.Entry<java.lang.String, ImagePermissions> other_element : other.success.entrySet()) {
 
-          String other_element_key = other_element.getKey();
+          java.lang.String other_element_key = other_element.getKey();
           ImagePermissions other_element_value = other_element.getValue();
 
-          String __this__success_copy_key = other_element_key;
+          java.lang.String __this__success_copy_key = other_element_key;
 
           ImagePermissions __this__success_copy_value = new ImagePermissions(other_element_value);
 
@@ -34887,18 +35633,19 @@ public class SatelliteServer {
       return (this.success == null) ? 0 : this.success.size();
     }
 
-    public void putToSuccess(String key, ImagePermissions val) {
+    public void putToSuccess(java.lang.String key, ImagePermissions val) {
       if (this.success == null) {
-        this.success = new HashMap<String,ImagePermissions>();
+        this.success = new java.util.HashMap<java.lang.String,ImagePermissions>();
       }
       this.success.put(key, val);
     }
 
-    public Map<String,ImagePermissions> getSuccess() {
+    @org.apache.thrift.annotation.Nullable
+    public java.util.Map<java.lang.String,ImagePermissions> getSuccess() {
       return this.success;
     }
 
-    public getImagePermissions_result setSuccess(Map<String,ImagePermissions> success) {
+    public getImagePermissions_result setSuccess(@org.apache.thrift.annotation.Nullable java.util.Map<java.lang.String,ImagePermissions> success) {
       this.success = success;
       return this;
     }
@@ -34918,11 +35665,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TAuthorizationException getAuthError() {
       return this.authError;
     }
 
-    public getImagePermissions_result setAuthError(TAuthorizationException authError) {
+    public getImagePermissions_result setAuthError(@org.apache.thrift.annotation.Nullable TAuthorizationException authError) {
       this.authError = authError;
       return this;
     }
@@ -34942,11 +35690,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TNotFoundException getNotFound() {
       return this.notFound;
     }
 
-    public getImagePermissions_result setNotFound(TNotFoundException notFound) {
+    public getImagePermissions_result setNotFound(@org.apache.thrift.annotation.Nullable TNotFoundException notFound) {
       this.notFound = notFound;
       return this;
     }
@@ -34966,11 +35715,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvocationException getServerError() {
       return this.serverError;
     }
 
-    public getImagePermissions_result setServerError(TInvocationException serverError) {
+    public getImagePermissions_result setServerError(@org.apache.thrift.annotation.Nullable TInvocationException serverError) {
       this.serverError = serverError;
       return this;
     }
@@ -34990,13 +35740,13 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
           unsetSuccess();
         } else {
-          setSuccess((Map<String,ImagePermissions>)value);
+          setSuccess((java.util.Map<java.lang.String,ImagePermissions>)value);
         }
         break;
 
@@ -35027,7 +35777,8 @@ public class SatelliteServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
         return getSuccess();
@@ -35042,13 +35793,13 @@ public class SatelliteServer {
         return getServerError();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -35061,13 +35812,11 @@ public class SatelliteServer {
       case SERVER_ERROR:
         return isSetServerError();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getImagePermissions_result)
         return this.equals((getImagePermissions_result)that);
       return false;
@@ -35076,6 +35825,8 @@ public class SatelliteServer {
     public boolean equals(getImagePermissions_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_success = true && this.isSetSuccess();
       boolean that_present_success = true && that.isSetSuccess();
@@ -35118,29 +35869,25 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
 
-      boolean present_authError = true && (isSetAuthError());
-      list.add(present_authError);
-      if (present_authError)
-        list.add(authError);
+      hashCode = hashCode * 8191 + ((isSetAuthError()) ? 131071 : 524287);
+      if (isSetAuthError())
+        hashCode = hashCode * 8191 + authError.hashCode();
 
-      boolean present_notFound = true && (isSetNotFound());
-      list.add(present_notFound);
-      if (present_notFound)
-        list.add(notFound);
+      hashCode = hashCode * 8191 + ((isSetNotFound()) ? 131071 : 524287);
+      if (isSetNotFound())
+        hashCode = hashCode * 8191 + notFound.hashCode();
 
-      boolean present_serverError = true && (isSetServerError());
-      list.add(present_serverError);
-      if (present_serverError)
-        list.add(serverError);
+      hashCode = hashCode * 8191 + ((isSetServerError()) ? 131071 : 524287);
+      if (isSetServerError())
+        hashCode = hashCode * 8191 + serverError.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -35151,7 +35898,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -35161,7 +35908,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetAuthError()).compareTo(other.isSetAuthError());
+      lastComparison = java.lang.Boolean.compare(isSetAuthError(), other.isSetAuthError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -35171,7 +35918,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetNotFound()).compareTo(other.isSetNotFound());
+      lastComparison = java.lang.Boolean.compare(isSetNotFound(), other.isSetNotFound());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -35181,7 +35928,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetServerError()).compareTo(other.isSetServerError());
+      lastComparison = java.lang.Boolean.compare(isSetServerError(), other.isSetServerError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -35194,21 +35941,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getImagePermissions_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getImagePermissions_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -35259,7 +36007,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -35267,13 +36015,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class getImagePermissions_resultStandardSchemeFactory implements SchemeFactory {
+    private static class getImagePermissions_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getImagePermissions_resultStandardScheme getScheme() {
         return new getImagePermissions_resultStandardScheme();
       }
     }
 
-    private static class getImagePermissions_resultStandardScheme extends StandardScheme<getImagePermissions_result> {
+    private static class getImagePermissions_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<getImagePermissions_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getImagePermissions_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -35288,16 +36036,16 @@ public class SatelliteServer {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  org.apache.thrift.protocol.TMap _map300 = iprot.readMapBegin();
-                  struct.success = new HashMap<String,ImagePermissions>(2*_map300.size);
-                  String _key301;
-                  ImagePermissions _val302;
-                  for (int _i303 = 0; _i303 < _map300.size; ++_i303)
+                  org.apache.thrift.protocol.TMap _map380 = iprot.readMapBegin();
+                  struct.success = new java.util.HashMap<java.lang.String,ImagePermissions>(2*_map380.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _key381;
+                  @org.apache.thrift.annotation.Nullable ImagePermissions _val382;
+                  for (int _i383 = 0; _i383 < _map380.size; ++_i383)
                   {
-                    _key301 = iprot.readString();
-                    _val302 = new ImagePermissions();
-                    _val302.read(iprot);
-                    struct.success.put(_key301, _val302);
+                    _key381 = iprot.readString();
+                    _val382 = new ImagePermissions();
+                    _val382.read(iprot);
+                    struct.success.put(_key381, _val382);
                   }
                   iprot.readMapEnd();
                 }
@@ -35352,10 +36100,10 @@ public class SatelliteServer {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
-            for (Map.Entry<String, ImagePermissions> _iter304 : struct.success.entrySet())
+            for (java.util.Map.Entry<java.lang.String, ImagePermissions> _iter384 : struct.success.entrySet())
             {
-              oprot.writeString(_iter304.getKey());
-              _iter304.getValue().write(oprot);
+              oprot.writeString(_iter384.getKey());
+              _iter384.getValue().write(oprot);
             }
             oprot.writeMapEnd();
           }
@@ -35382,18 +36130,18 @@ public class SatelliteServer {
 
     }
 
-    private static class getImagePermissions_resultTupleSchemeFactory implements SchemeFactory {
+    private static class getImagePermissions_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getImagePermissions_resultTupleScheme getScheme() {
         return new getImagePermissions_resultTupleScheme();
       }
     }
 
-    private static class getImagePermissions_resultTupleScheme extends TupleScheme<getImagePermissions_result> {
+    private static class getImagePermissions_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<getImagePermissions_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getImagePermissions_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
           optionals.set(0);
         }
@@ -35410,10 +36158,10 @@ public class SatelliteServer {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (Map.Entry<String, ImagePermissions> _iter305 : struct.success.entrySet())
+            for (java.util.Map.Entry<java.lang.String, ImagePermissions> _iter385 : struct.success.entrySet())
             {
-              oprot.writeString(_iter305.getKey());
-              _iter305.getValue().write(oprot);
+              oprot.writeString(_iter385.getKey());
+              _iter385.getValue().write(oprot);
             }
           }
         }
@@ -35430,20 +36178,20 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getImagePermissions_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(4);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(4);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TMap _map306 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new HashMap<String,ImagePermissions>(2*_map306.size);
-            String _key307;
-            ImagePermissions _val308;
-            for (int _i309 = 0; _i309 < _map306.size; ++_i309)
+            org.apache.thrift.protocol.TMap _map386 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT); 
+            struct.success = new java.util.HashMap<java.lang.String,ImagePermissions>(2*_map386.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _key387;
+            @org.apache.thrift.annotation.Nullable ImagePermissions _val388;
+            for (int _i389 = 0; _i389 < _map386.size; ++_i389)
             {
-              _key307 = iprot.readString();
-              _val308 = new ImagePermissions();
-              _val308.read(iprot);
-              struct.success.put(_key307, _val308);
+              _key387 = iprot.readString();
+              _val388 = new ImagePermissions();
+              _val388.read(iprot);
+              struct.success.put(_key387, _val388);
             }
           }
           struct.setSuccessIsSet(true);
@@ -35466,6 +36214,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class setImageOwner_args implements org.apache.thrift.TBase<setImageOwner_args, setImageOwner_args._Fields>, java.io.Serializable, Cloneable, Comparable<setImageOwner_args>   {
@@ -35475,15 +36226,12 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField IMAGE_BASE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("imageBaseId", org.apache.thrift.protocol.TType.STRING, (short)2);
     private static final org.apache.thrift.protocol.TField NEW_OWNER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("newOwnerId", org.apache.thrift.protocol.TType.STRING, (short)3);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new setImageOwner_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new setImageOwner_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setImageOwner_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setImageOwner_argsTupleSchemeFactory();
 
-    public String userToken; // required
-    public String imageBaseId; // required
-    public String newOwnerId; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String userToken; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String imageBaseId; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String newOwnerId; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -35491,10 +36239,10 @@ public class SatelliteServer {
       IMAGE_BASE_ID((short)2, "imageBaseId"),
       NEW_OWNER_ID((short)3, "newOwnerId");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -35502,6 +36250,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // USER_TOKEN
@@ -35521,21 +36270,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -35544,22 +36294,22 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.USER_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("userToken", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
       tmpMap.put(_Fields.IMAGE_BASE_ID, new org.apache.thrift.meta_data.FieldMetaData("imageBaseId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "UUID")));
       tmpMap.put(_Fields.NEW_OWNER_ID, new org.apache.thrift.meta_data.FieldMetaData("newOwnerId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "UUID")));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setImageOwner_args.class, metaDataMap);
     }
 
@@ -35567,9 +36317,9 @@ public class SatelliteServer {
     }
 
     public setImageOwner_args(
-      String userToken,
-      String imageBaseId,
-      String newOwnerId)
+      java.lang.String userToken,
+      java.lang.String imageBaseId,
+      java.lang.String newOwnerId)
     {
       this();
       this.userToken = userToken;
@@ -35603,11 +36353,12 @@ public class SatelliteServer {
       this.newOwnerId = null;
     }
 
-    public String getUserToken() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getUserToken() {
       return this.userToken;
     }
 
-    public setImageOwner_args setUserToken(String userToken) {
+    public setImageOwner_args setUserToken(@org.apache.thrift.annotation.Nullable java.lang.String userToken) {
       this.userToken = userToken;
       return this;
     }
@@ -35627,11 +36378,12 @@ public class SatelliteServer {
       }
     }
 
-    public String getImageBaseId() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getImageBaseId() {
       return this.imageBaseId;
     }
 
-    public setImageOwner_args setImageBaseId(String imageBaseId) {
+    public setImageOwner_args setImageBaseId(@org.apache.thrift.annotation.Nullable java.lang.String imageBaseId) {
       this.imageBaseId = imageBaseId;
       return this;
     }
@@ -35651,11 +36403,12 @@ public class SatelliteServer {
       }
     }
 
-    public String getNewOwnerId() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getNewOwnerId() {
       return this.newOwnerId;
     }
 
-    public setImageOwner_args setNewOwnerId(String newOwnerId) {
+    public setImageOwner_args setNewOwnerId(@org.apache.thrift.annotation.Nullable java.lang.String newOwnerId) {
       this.newOwnerId = newOwnerId;
       return this;
     }
@@ -35675,13 +36428,13 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case USER_TOKEN:
         if (value == null) {
           unsetUserToken();
         } else {
-          setUserToken((String)value);
+          setUserToken((java.lang.String)value);
         }
         break;
 
@@ -35689,7 +36442,7 @@ public class SatelliteServer {
         if (value == null) {
           unsetImageBaseId();
         } else {
-          setImageBaseId((String)value);
+          setImageBaseId((java.lang.String)value);
         }
         break;
 
@@ -35697,14 +36450,15 @@ public class SatelliteServer {
         if (value == null) {
           unsetNewOwnerId();
         } else {
-          setNewOwnerId((String)value);
+          setNewOwnerId((java.lang.String)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case USER_TOKEN:
         return getUserToken();
@@ -35716,13 +36470,13 @@ public class SatelliteServer {
         return getNewOwnerId();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -35733,13 +36487,11 @@ public class SatelliteServer {
       case NEW_OWNER_ID:
         return isSetNewOwnerId();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof setImageOwner_args)
         return this.equals((setImageOwner_args)that);
       return false;
@@ -35748,6 +36500,8 @@ public class SatelliteServer {
     public boolean equals(setImageOwner_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_userToken = true && this.isSetUserToken();
       boolean that_present_userToken = true && that.isSetUserToken();
@@ -35781,24 +36535,21 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_userToken = true && (isSetUserToken());
-      list.add(present_userToken);
-      if (present_userToken)
-        list.add(userToken);
+      hashCode = hashCode * 8191 + ((isSetUserToken()) ? 131071 : 524287);
+      if (isSetUserToken())
+        hashCode = hashCode * 8191 + userToken.hashCode();
 
-      boolean present_imageBaseId = true && (isSetImageBaseId());
-      list.add(present_imageBaseId);
-      if (present_imageBaseId)
-        list.add(imageBaseId);
+      hashCode = hashCode * 8191 + ((isSetImageBaseId()) ? 131071 : 524287);
+      if (isSetImageBaseId())
+        hashCode = hashCode * 8191 + imageBaseId.hashCode();
 
-      boolean present_newOwnerId = true && (isSetNewOwnerId());
-      list.add(present_newOwnerId);
-      if (present_newOwnerId)
-        list.add(newOwnerId);
+      hashCode = hashCode * 8191 + ((isSetNewOwnerId()) ? 131071 : 524287);
+      if (isSetNewOwnerId())
+        hashCode = hashCode * 8191 + newOwnerId.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -35809,7 +36560,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetUserToken()).compareTo(other.isSetUserToken());
+      lastComparison = java.lang.Boolean.compare(isSetUserToken(), other.isSetUserToken());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -35819,7 +36570,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetImageBaseId()).compareTo(other.isSetImageBaseId());
+      lastComparison = java.lang.Boolean.compare(isSetImageBaseId(), other.isSetImageBaseId());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -35829,7 +36580,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetNewOwnerId()).compareTo(other.isSetNewOwnerId());
+      lastComparison = java.lang.Boolean.compare(isSetNewOwnerId(), other.isSetNewOwnerId());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -35842,21 +36593,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("setImageOwner_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("setImageOwner_args(");
       boolean first = true;
 
       sb.append("userToken:");
@@ -35899,7 +36651,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -35907,13 +36659,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class setImageOwner_argsStandardSchemeFactory implements SchemeFactory {
+    private static class setImageOwner_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public setImageOwner_argsStandardScheme getScheme() {
         return new setImageOwner_argsStandardScheme();
       }
     }
 
-    private static class setImageOwner_argsStandardScheme extends StandardScheme<setImageOwner_args> {
+    private static class setImageOwner_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<setImageOwner_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, setImageOwner_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -35985,18 +36737,18 @@ public class SatelliteServer {
 
     }
 
-    private static class setImageOwner_argsTupleSchemeFactory implements SchemeFactory {
+    private static class setImageOwner_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public setImageOwner_argsTupleScheme getScheme() {
         return new setImageOwner_argsTupleScheme();
       }
     }
 
-    private static class setImageOwner_argsTupleScheme extends TupleScheme<setImageOwner_args> {
+    private static class setImageOwner_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<setImageOwner_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, setImageOwner_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetUserToken()) {
           optionals.set(0);
         }
@@ -36020,8 +36772,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, setImageOwner_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(3);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           struct.userToken = iprot.readString();
           struct.setUserTokenIsSet(true);
@@ -36037,6 +36789,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class setImageOwner_result implements org.apache.thrift.TBase<setImageOwner_result, setImageOwner_result._Fields>, java.io.Serializable, Cloneable, Comparable<setImageOwner_result>   {
@@ -36046,15 +36801,12 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField NOT_FOUND_FIELD_DESC = new org.apache.thrift.protocol.TField("notFound", org.apache.thrift.protocol.TType.STRUCT, (short)2);
     private static final org.apache.thrift.protocol.TField SERVER_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("serverError", org.apache.thrift.protocol.TType.STRUCT, (short)3);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new setImageOwner_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new setImageOwner_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setImageOwner_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setImageOwner_resultTupleSchemeFactory();
 
-    public TAuthorizationException authError; // required
-    public TNotFoundException notFound; // required
-    public TInvocationException serverError; // required
+    public @org.apache.thrift.annotation.Nullable TAuthorizationException authError; // required
+    public @org.apache.thrift.annotation.Nullable TNotFoundException notFound; // required
+    public @org.apache.thrift.annotation.Nullable TInvocationException serverError; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -36062,10 +36814,10 @@ public class SatelliteServer {
       NOT_FOUND((short)2, "notFound"),
       SERVER_ERROR((short)3, "serverError");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -36073,6 +36825,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // AUTH_ERROR
@@ -36092,21 +36845,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -36115,22 +36869,22 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.AUTH_ERROR, new org.apache.thrift.meta_data.FieldMetaData("authError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class)));
       tmpMap.put(_Fields.NOT_FOUND, new org.apache.thrift.meta_data.FieldMetaData("notFound", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TNotFoundException.class)));
       tmpMap.put(_Fields.SERVER_ERROR, new org.apache.thrift.meta_data.FieldMetaData("serverError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setImageOwner_result.class, metaDataMap);
     }
 
@@ -36174,11 +36928,12 @@ public class SatelliteServer {
       this.serverError = null;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TAuthorizationException getAuthError() {
       return this.authError;
     }
 
-    public setImageOwner_result setAuthError(TAuthorizationException authError) {
+    public setImageOwner_result setAuthError(@org.apache.thrift.annotation.Nullable TAuthorizationException authError) {
       this.authError = authError;
       return this;
     }
@@ -36198,11 +36953,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TNotFoundException getNotFound() {
       return this.notFound;
     }
 
-    public setImageOwner_result setNotFound(TNotFoundException notFound) {
+    public setImageOwner_result setNotFound(@org.apache.thrift.annotation.Nullable TNotFoundException notFound) {
       this.notFound = notFound;
       return this;
     }
@@ -36222,11 +36978,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvocationException getServerError() {
       return this.serverError;
     }
 
-    public setImageOwner_result setServerError(TInvocationException serverError) {
+    public setImageOwner_result setServerError(@org.apache.thrift.annotation.Nullable TInvocationException serverError) {
       this.serverError = serverError;
       return this;
     }
@@ -36246,7 +37003,7 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case AUTH_ERROR:
         if (value == null) {
@@ -36275,7 +37032,8 @@ public class SatelliteServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case AUTH_ERROR:
         return getAuthError();
@@ -36287,13 +37045,13 @@ public class SatelliteServer {
         return getServerError();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -36304,13 +37062,11 @@ public class SatelliteServer {
       case SERVER_ERROR:
         return isSetServerError();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof setImageOwner_result)
         return this.equals((setImageOwner_result)that);
       return false;
@@ -36319,6 +37075,8 @@ public class SatelliteServer {
     public boolean equals(setImageOwner_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_authError = true && this.isSetAuthError();
       boolean that_present_authError = true && that.isSetAuthError();
@@ -36352,24 +37110,21 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_authError = true && (isSetAuthError());
-      list.add(present_authError);
-      if (present_authError)
-        list.add(authError);
+      hashCode = hashCode * 8191 + ((isSetAuthError()) ? 131071 : 524287);
+      if (isSetAuthError())
+        hashCode = hashCode * 8191 + authError.hashCode();
 
-      boolean present_notFound = true && (isSetNotFound());
-      list.add(present_notFound);
-      if (present_notFound)
-        list.add(notFound);
+      hashCode = hashCode * 8191 + ((isSetNotFound()) ? 131071 : 524287);
+      if (isSetNotFound())
+        hashCode = hashCode * 8191 + notFound.hashCode();
 
-      boolean present_serverError = true && (isSetServerError());
-      list.add(present_serverError);
-      if (present_serverError)
-        list.add(serverError);
+      hashCode = hashCode * 8191 + ((isSetServerError()) ? 131071 : 524287);
+      if (isSetServerError())
+        hashCode = hashCode * 8191 + serverError.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -36380,7 +37135,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetAuthError()).compareTo(other.isSetAuthError());
+      lastComparison = java.lang.Boolean.compare(isSetAuthError(), other.isSetAuthError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -36390,7 +37145,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetNotFound()).compareTo(other.isSetNotFound());
+      lastComparison = java.lang.Boolean.compare(isSetNotFound(), other.isSetNotFound());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -36400,7 +37155,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetServerError()).compareTo(other.isSetServerError());
+      lastComparison = java.lang.Boolean.compare(isSetServerError(), other.isSetServerError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -36413,21 +37168,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("setImageOwner_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("setImageOwner_result(");
       boolean first = true;
 
       sb.append("authError:");
@@ -36470,7 +37226,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -36478,13 +37234,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class setImageOwner_resultStandardSchemeFactory implements SchemeFactory {
+    private static class setImageOwner_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public setImageOwner_resultStandardScheme getScheme() {
         return new setImageOwner_resultStandardScheme();
       }
     }
 
-    private static class setImageOwner_resultStandardScheme extends StandardScheme<setImageOwner_result> {
+    private static class setImageOwner_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<setImageOwner_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, setImageOwner_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -36559,18 +37315,18 @@ public class SatelliteServer {
 
     }
 
-    private static class setImageOwner_resultTupleSchemeFactory implements SchemeFactory {
+    private static class setImageOwner_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public setImageOwner_resultTupleScheme getScheme() {
         return new setImageOwner_resultTupleScheme();
       }
     }
 
-    private static class setImageOwner_resultTupleScheme extends TupleScheme<setImageOwner_result> {
+    private static class setImageOwner_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<setImageOwner_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, setImageOwner_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetAuthError()) {
           optionals.set(0);
         }
@@ -36594,8 +37350,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, setImageOwner_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(3);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           struct.authError = new TAuthorizationException();
           struct.authError.read(iprot);
@@ -36614,6 +37370,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class setImageVersionExpiry_args implements org.apache.thrift.TBase<setImageVersionExpiry_args, setImageVersionExpiry_args._Fields>, java.io.Serializable, Cloneable, Comparable<setImageVersionExpiry_args>   {
@@ -36623,14 +37382,11 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField IMAGE_BASE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("imageBaseId", org.apache.thrift.protocol.TType.STRING, (short)2);
     private static final org.apache.thrift.protocol.TField EXPIRE_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("expireTime", org.apache.thrift.protocol.TType.I64, (short)3);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new setImageVersionExpiry_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new setImageVersionExpiry_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setImageVersionExpiry_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setImageVersionExpiry_argsTupleSchemeFactory();
 
-    public String userToken; // required
-    public String imageBaseId; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String userToken; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String imageBaseId; // required
     public long expireTime; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@@ -36639,10 +37395,10 @@ public class SatelliteServer {
       IMAGE_BASE_ID((short)2, "imageBaseId"),
       EXPIRE_TIME((short)3, "expireTime");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -36650,6 +37406,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // USER_TOKEN
@@ -36669,21 +37426,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -36692,7 +37450,7 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
@@ -36700,16 +37458,16 @@ public class SatelliteServer {
     // isset id assignments
     private static final int __EXPIRETIME_ISSET_ID = 0;
     private byte __isset_bitfield = 0;
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.USER_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("userToken", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
       tmpMap.put(_Fields.IMAGE_BASE_ID, new org.apache.thrift.meta_data.FieldMetaData("imageBaseId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "UUID")));
       tmpMap.put(_Fields.EXPIRE_TIME, new org.apache.thrift.meta_data.FieldMetaData("expireTime", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64          , "UnixTimestamp")));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setImageVersionExpiry_args.class, metaDataMap);
     }
 
@@ -36717,8 +37475,8 @@ public class SatelliteServer {
     }
 
     public setImageVersionExpiry_args(
-      String userToken,
-      String imageBaseId,
+      java.lang.String userToken,
+      java.lang.String imageBaseId,
       long expireTime)
     {
       this();
@@ -36754,11 +37512,12 @@ public class SatelliteServer {
       this.expireTime = 0;
     }
 
-    public String getUserToken() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getUserToken() {
       return this.userToken;
     }
 
-    public setImageVersionExpiry_args setUserToken(String userToken) {
+    public setImageVersionExpiry_args setUserToken(@org.apache.thrift.annotation.Nullable java.lang.String userToken) {
       this.userToken = userToken;
       return this;
     }
@@ -36778,11 +37537,12 @@ public class SatelliteServer {
       }
     }
 
-    public String getImageBaseId() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getImageBaseId() {
       return this.imageBaseId;
     }
 
-    public setImageVersionExpiry_args setImageBaseId(String imageBaseId) {
+    public setImageVersionExpiry_args setImageBaseId(@org.apache.thrift.annotation.Nullable java.lang.String imageBaseId) {
       this.imageBaseId = imageBaseId;
       return this;
     }
@@ -36813,25 +37573,25 @@ public class SatelliteServer {
     }
 
     public void unsetExpireTime() {
-      __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __EXPIRETIME_ISSET_ID);
+      __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __EXPIRETIME_ISSET_ID);
     }
 
     /** Returns true if field expireTime is set (has been assigned a value) and false otherwise */
     public boolean isSetExpireTime() {
-      return EncodingUtils.testBit(__isset_bitfield, __EXPIRETIME_ISSET_ID);
+      return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __EXPIRETIME_ISSET_ID);
     }
 
     public void setExpireTimeIsSet(boolean value) {
-      __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __EXPIRETIME_ISSET_ID, value);
+      __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __EXPIRETIME_ISSET_ID, value);
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case USER_TOKEN:
         if (value == null) {
           unsetUserToken();
         } else {
-          setUserToken((String)value);
+          setUserToken((java.lang.String)value);
         }
         break;
 
@@ -36839,7 +37599,7 @@ public class SatelliteServer {
         if (value == null) {
           unsetImageBaseId();
         } else {
-          setImageBaseId((String)value);
+          setImageBaseId((java.lang.String)value);
         }
         break;
 
@@ -36847,14 +37607,15 @@ public class SatelliteServer {
         if (value == null) {
           unsetExpireTime();
         } else {
-          setExpireTime((Long)value);
+          setExpireTime((java.lang.Long)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case USER_TOKEN:
         return getUserToken();
@@ -36866,13 +37627,13 @@ public class SatelliteServer {
         return getExpireTime();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -36883,13 +37644,11 @@ public class SatelliteServer {
       case EXPIRE_TIME:
         return isSetExpireTime();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof setImageVersionExpiry_args)
         return this.equals((setImageVersionExpiry_args)that);
       return false;
@@ -36898,6 +37657,8 @@ public class SatelliteServer {
     public boolean equals(setImageVersionExpiry_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_userToken = true && this.isSetUserToken();
       boolean that_present_userToken = true && that.isSetUserToken();
@@ -36931,24 +37692,19 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_userToken = true && (isSetUserToken());
-      list.add(present_userToken);
-      if (present_userToken)
-        list.add(userToken);
+      hashCode = hashCode * 8191 + ((isSetUserToken()) ? 131071 : 524287);
+      if (isSetUserToken())
+        hashCode = hashCode * 8191 + userToken.hashCode();
 
-      boolean present_imageBaseId = true && (isSetImageBaseId());
-      list.add(present_imageBaseId);
-      if (present_imageBaseId)
-        list.add(imageBaseId);
+      hashCode = hashCode * 8191 + ((isSetImageBaseId()) ? 131071 : 524287);
+      if (isSetImageBaseId())
+        hashCode = hashCode * 8191 + imageBaseId.hashCode();
 
-      boolean present_expireTime = true;
-      list.add(present_expireTime);
-      if (present_expireTime)
-        list.add(expireTime);
+      hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(expireTime);
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -36959,7 +37715,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetUserToken()).compareTo(other.isSetUserToken());
+      lastComparison = java.lang.Boolean.compare(isSetUserToken(), other.isSetUserToken());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -36969,7 +37725,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetImageBaseId()).compareTo(other.isSetImageBaseId());
+      lastComparison = java.lang.Boolean.compare(isSetImageBaseId(), other.isSetImageBaseId());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -36979,7 +37735,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetExpireTime()).compareTo(other.isSetExpireTime());
+      lastComparison = java.lang.Boolean.compare(isSetExpireTime(), other.isSetExpireTime());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -36992,21 +37748,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("setImageVersionExpiry_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("setImageVersionExpiry_args(");
       boolean first = true;
 
       sb.append("userToken:");
@@ -37045,7 +37802,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
         __isset_bitfield = 0;
@@ -37055,13 +37812,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class setImageVersionExpiry_argsStandardSchemeFactory implements SchemeFactory {
+    private static class setImageVersionExpiry_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public setImageVersionExpiry_argsStandardScheme getScheme() {
         return new setImageVersionExpiry_argsStandardScheme();
       }
     }
 
-    private static class setImageVersionExpiry_argsStandardScheme extends StandardScheme<setImageVersionExpiry_args> {
+    private static class setImageVersionExpiry_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<setImageVersionExpiry_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, setImageVersionExpiry_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -37131,18 +37888,18 @@ public class SatelliteServer {
 
     }
 
-    private static class setImageVersionExpiry_argsTupleSchemeFactory implements SchemeFactory {
+    private static class setImageVersionExpiry_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public setImageVersionExpiry_argsTupleScheme getScheme() {
         return new setImageVersionExpiry_argsTupleScheme();
       }
     }
 
-    private static class setImageVersionExpiry_argsTupleScheme extends TupleScheme<setImageVersionExpiry_args> {
+    private static class setImageVersionExpiry_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<setImageVersionExpiry_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, setImageVersionExpiry_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetUserToken()) {
           optionals.set(0);
         }
@@ -37166,8 +37923,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, setImageVersionExpiry_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(3);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           struct.userToken = iprot.readString();
           struct.setUserTokenIsSet(true);
@@ -37183,6 +37940,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class setImageVersionExpiry_result implements org.apache.thrift.TBase<setImageVersionExpiry_result, setImageVersionExpiry_result._Fields>, java.io.Serializable, Cloneable, Comparable<setImageVersionExpiry_result>   {
@@ -37193,16 +37953,13 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField SERVER_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("serverError", org.apache.thrift.protocol.TType.STRUCT, (short)3);
     private static final org.apache.thrift.protocol.TField DATE_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("dateError", org.apache.thrift.protocol.TType.STRUCT, (short)4);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new setImageVersionExpiry_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new setImageVersionExpiry_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setImageVersionExpiry_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setImageVersionExpiry_resultTupleSchemeFactory();
 
-    public TAuthorizationException authError; // required
-    public TNotFoundException notFound; // required
-    public TInvocationException serverError; // required
-    public TInvalidDateParam dateError; // required
+    public @org.apache.thrift.annotation.Nullable TAuthorizationException authError; // required
+    public @org.apache.thrift.annotation.Nullable TNotFoundException notFound; // required
+    public @org.apache.thrift.annotation.Nullable TInvocationException serverError; // required
+    public @org.apache.thrift.annotation.Nullable TInvalidDateParam dateError; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -37211,10 +37968,10 @@ public class SatelliteServer {
       SERVER_ERROR((short)3, "serverError"),
       DATE_ERROR((short)4, "dateError");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -37222,6 +37979,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // AUTH_ERROR
@@ -37243,21 +38001,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -37266,24 +38025,24 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.AUTH_ERROR, new org.apache.thrift.meta_data.FieldMetaData("authError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class)));
       tmpMap.put(_Fields.NOT_FOUND, new org.apache.thrift.meta_data.FieldMetaData("notFound", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TNotFoundException.class)));
       tmpMap.put(_Fields.SERVER_ERROR, new org.apache.thrift.meta_data.FieldMetaData("serverError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class)));
       tmpMap.put(_Fields.DATE_ERROR, new org.apache.thrift.meta_data.FieldMetaData("dateError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvalidDateParam.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setImageVersionExpiry_result.class, metaDataMap);
     }
 
@@ -37333,11 +38092,12 @@ public class SatelliteServer {
       this.dateError = null;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TAuthorizationException getAuthError() {
       return this.authError;
     }
 
-    public setImageVersionExpiry_result setAuthError(TAuthorizationException authError) {
+    public setImageVersionExpiry_result setAuthError(@org.apache.thrift.annotation.Nullable TAuthorizationException authError) {
       this.authError = authError;
       return this;
     }
@@ -37357,11 +38117,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TNotFoundException getNotFound() {
       return this.notFound;
     }
 
-    public setImageVersionExpiry_result setNotFound(TNotFoundException notFound) {
+    public setImageVersionExpiry_result setNotFound(@org.apache.thrift.annotation.Nullable TNotFoundException notFound) {
       this.notFound = notFound;
       return this;
     }
@@ -37381,11 +38142,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvocationException getServerError() {
       return this.serverError;
     }
 
-    public setImageVersionExpiry_result setServerError(TInvocationException serverError) {
+    public setImageVersionExpiry_result setServerError(@org.apache.thrift.annotation.Nullable TInvocationException serverError) {
       this.serverError = serverError;
       return this;
     }
@@ -37405,11 +38167,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvalidDateParam getDateError() {
       return this.dateError;
     }
 
-    public setImageVersionExpiry_result setDateError(TInvalidDateParam dateError) {
+    public setImageVersionExpiry_result setDateError(@org.apache.thrift.annotation.Nullable TInvalidDateParam dateError) {
       this.dateError = dateError;
       return this;
     }
@@ -37429,7 +38192,7 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case AUTH_ERROR:
         if (value == null) {
@@ -37466,7 +38229,8 @@ public class SatelliteServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case AUTH_ERROR:
         return getAuthError();
@@ -37481,13 +38245,13 @@ public class SatelliteServer {
         return getDateError();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -37500,13 +38264,11 @@ public class SatelliteServer {
       case DATE_ERROR:
         return isSetDateError();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof setImageVersionExpiry_result)
         return this.equals((setImageVersionExpiry_result)that);
       return false;
@@ -37515,6 +38277,8 @@ public class SatelliteServer {
     public boolean equals(setImageVersionExpiry_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_authError = true && this.isSetAuthError();
       boolean that_present_authError = true && that.isSetAuthError();
@@ -37557,29 +38321,25 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_authError = true && (isSetAuthError());
-      list.add(present_authError);
-      if (present_authError)
-        list.add(authError);
+      hashCode = hashCode * 8191 + ((isSetAuthError()) ? 131071 : 524287);
+      if (isSetAuthError())
+        hashCode = hashCode * 8191 + authError.hashCode();
 
-      boolean present_notFound = true && (isSetNotFound());
-      list.add(present_notFound);
-      if (present_notFound)
-        list.add(notFound);
+      hashCode = hashCode * 8191 + ((isSetNotFound()) ? 131071 : 524287);
+      if (isSetNotFound())
+        hashCode = hashCode * 8191 + notFound.hashCode();
 
-      boolean present_serverError = true && (isSetServerError());
-      list.add(present_serverError);
-      if (present_serverError)
-        list.add(serverError);
+      hashCode = hashCode * 8191 + ((isSetServerError()) ? 131071 : 524287);
+      if (isSetServerError())
+        hashCode = hashCode * 8191 + serverError.hashCode();
 
-      boolean present_dateError = true && (isSetDateError());
-      list.add(present_dateError);
-      if (present_dateError)
-        list.add(dateError);
+      hashCode = hashCode * 8191 + ((isSetDateError()) ? 131071 : 524287);
+      if (isSetDateError())
+        hashCode = hashCode * 8191 + dateError.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -37590,7 +38350,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetAuthError()).compareTo(other.isSetAuthError());
+      lastComparison = java.lang.Boolean.compare(isSetAuthError(), other.isSetAuthError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -37600,7 +38360,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetNotFound()).compareTo(other.isSetNotFound());
+      lastComparison = java.lang.Boolean.compare(isSetNotFound(), other.isSetNotFound());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -37610,7 +38370,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetServerError()).compareTo(other.isSetServerError());
+      lastComparison = java.lang.Boolean.compare(isSetServerError(), other.isSetServerError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -37620,7 +38380,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetDateError()).compareTo(other.isSetDateError());
+      lastComparison = java.lang.Boolean.compare(isSetDateError(), other.isSetDateError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -37633,21 +38393,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("setImageVersionExpiry_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("setImageVersionExpiry_result(");
       boolean first = true;
 
       sb.append("authError:");
@@ -37698,7 +38459,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -37706,13 +38467,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class setImageVersionExpiry_resultStandardSchemeFactory implements SchemeFactory {
+    private static class setImageVersionExpiry_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public setImageVersionExpiry_resultStandardScheme getScheme() {
         return new setImageVersionExpiry_resultStandardScheme();
       }
     }
 
-    private static class setImageVersionExpiry_resultStandardScheme extends StandardScheme<setImageVersionExpiry_result> {
+    private static class setImageVersionExpiry_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<setImageVersionExpiry_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, setImageVersionExpiry_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -37801,18 +38562,18 @@ public class SatelliteServer {
 
     }
 
-    private static class setImageVersionExpiry_resultTupleSchemeFactory implements SchemeFactory {
+    private static class setImageVersionExpiry_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public setImageVersionExpiry_resultTupleScheme getScheme() {
         return new setImageVersionExpiry_resultTupleScheme();
       }
     }
 
-    private static class setImageVersionExpiry_resultTupleScheme extends TupleScheme<setImageVersionExpiry_result> {
+    private static class setImageVersionExpiry_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<setImageVersionExpiry_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, setImageVersionExpiry_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetAuthError()) {
           optionals.set(0);
         }
@@ -37842,8 +38603,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, setImageVersionExpiry_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(4);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(4);
         if (incoming.get(0)) {
           struct.authError = new TAuthorizationException();
           struct.authError.read(iprot);
@@ -37867,6 +38628,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getImageVersionVirtConfig_args implements org.apache.thrift.TBase<getImageVersionVirtConfig_args, getImageVersionVirtConfig_args._Fields>, java.io.Serializable, Cloneable, Comparable<getImageVersionVirtConfig_args>   {
@@ -37875,24 +38639,21 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField USER_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("userToken", org.apache.thrift.protocol.TType.STRING, (short)1);
     private static final org.apache.thrift.protocol.TField IMAGE_VERSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("imageVersionId", org.apache.thrift.protocol.TType.STRING, (short)2);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getImageVersionVirtConfig_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getImageVersionVirtConfig_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getImageVersionVirtConfig_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getImageVersionVirtConfig_argsTupleSchemeFactory();
 
-    public String userToken; // required
-    public String imageVersionId; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String userToken; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String imageVersionId; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       USER_TOKEN((short)1, "userToken"),
       IMAGE_VERSION_ID((short)2, "imageVersionId");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -37900,6 +38661,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // USER_TOKEN
@@ -37917,21 +38679,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -37940,20 +38703,20 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.USER_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("userToken", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
       tmpMap.put(_Fields.IMAGE_VERSION_ID, new org.apache.thrift.meta_data.FieldMetaData("imageVersionId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "UUID")));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getImageVersionVirtConfig_args.class, metaDataMap);
     }
 
@@ -37961,8 +38724,8 @@ public class SatelliteServer {
     }
 
     public getImageVersionVirtConfig_args(
-      String userToken,
-      String imageVersionId)
+      java.lang.String userToken,
+      java.lang.String imageVersionId)
     {
       this();
       this.userToken = userToken;
@@ -37991,11 +38754,12 @@ public class SatelliteServer {
       this.imageVersionId = null;
     }
 
-    public String getUserToken() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getUserToken() {
       return this.userToken;
     }
 
-    public getImageVersionVirtConfig_args setUserToken(String userToken) {
+    public getImageVersionVirtConfig_args setUserToken(@org.apache.thrift.annotation.Nullable java.lang.String userToken) {
       this.userToken = userToken;
       return this;
     }
@@ -38015,11 +38779,12 @@ public class SatelliteServer {
       }
     }
 
-    public String getImageVersionId() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getImageVersionId() {
       return this.imageVersionId;
     }
 
-    public getImageVersionVirtConfig_args setImageVersionId(String imageVersionId) {
+    public getImageVersionVirtConfig_args setImageVersionId(@org.apache.thrift.annotation.Nullable java.lang.String imageVersionId) {
       this.imageVersionId = imageVersionId;
       return this;
     }
@@ -38039,13 +38804,13 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case USER_TOKEN:
         if (value == null) {
           unsetUserToken();
         } else {
-          setUserToken((String)value);
+          setUserToken((java.lang.String)value);
         }
         break;
 
@@ -38053,14 +38818,15 @@ public class SatelliteServer {
         if (value == null) {
           unsetImageVersionId();
         } else {
-          setImageVersionId((String)value);
+          setImageVersionId((java.lang.String)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case USER_TOKEN:
         return getUserToken();
@@ -38069,13 +38835,13 @@ public class SatelliteServer {
         return getImageVersionId();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -38084,13 +38850,11 @@ public class SatelliteServer {
       case IMAGE_VERSION_ID:
         return isSetImageVersionId();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getImageVersionVirtConfig_args)
         return this.equals((getImageVersionVirtConfig_args)that);
       return false;
@@ -38099,6 +38863,8 @@ public class SatelliteServer {
     public boolean equals(getImageVersionVirtConfig_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_userToken = true && this.isSetUserToken();
       boolean that_present_userToken = true && that.isSetUserToken();
@@ -38123,19 +38889,17 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_userToken = true && (isSetUserToken());
-      list.add(present_userToken);
-      if (present_userToken)
-        list.add(userToken);
+      hashCode = hashCode * 8191 + ((isSetUserToken()) ? 131071 : 524287);
+      if (isSetUserToken())
+        hashCode = hashCode * 8191 + userToken.hashCode();
 
-      boolean present_imageVersionId = true && (isSetImageVersionId());
-      list.add(present_imageVersionId);
-      if (present_imageVersionId)
-        list.add(imageVersionId);
+      hashCode = hashCode * 8191 + ((isSetImageVersionId()) ? 131071 : 524287);
+      if (isSetImageVersionId())
+        hashCode = hashCode * 8191 + imageVersionId.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -38146,7 +38910,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetUserToken()).compareTo(other.isSetUserToken());
+      lastComparison = java.lang.Boolean.compare(isSetUserToken(), other.isSetUserToken());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -38156,7 +38920,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetImageVersionId()).compareTo(other.isSetImageVersionId());
+      lastComparison = java.lang.Boolean.compare(isSetImageVersionId(), other.isSetImageVersionId());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -38169,21 +38933,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getImageVersionVirtConfig_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getImageVersionVirtConfig_args(");
       boolean first = true;
 
       sb.append("userToken:");
@@ -38218,7 +38983,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -38226,13 +38991,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class getImageVersionVirtConfig_argsStandardSchemeFactory implements SchemeFactory {
+    private static class getImageVersionVirtConfig_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getImageVersionVirtConfig_argsStandardScheme getScheme() {
         return new getImageVersionVirtConfig_argsStandardScheme();
       }
     }
 
-    private static class getImageVersionVirtConfig_argsStandardScheme extends StandardScheme<getImageVersionVirtConfig_args> {
+    private static class getImageVersionVirtConfig_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<getImageVersionVirtConfig_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getImageVersionVirtConfig_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -38291,18 +39056,18 @@ public class SatelliteServer {
 
     }
 
-    private static class getImageVersionVirtConfig_argsTupleSchemeFactory implements SchemeFactory {
+    private static class getImageVersionVirtConfig_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getImageVersionVirtConfig_argsTupleScheme getScheme() {
         return new getImageVersionVirtConfig_argsTupleScheme();
       }
     }
 
-    private static class getImageVersionVirtConfig_argsTupleScheme extends TupleScheme<getImageVersionVirtConfig_args> {
+    private static class getImageVersionVirtConfig_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<getImageVersionVirtConfig_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getImageVersionVirtConfig_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetUserToken()) {
           optionals.set(0);
         }
@@ -38320,8 +39085,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getImageVersionVirtConfig_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(2);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           struct.userToken = iprot.readString();
           struct.setUserTokenIsSet(true);
@@ -38333,6 +39098,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getImageVersionVirtConfig_result implements org.apache.thrift.TBase<getImageVersionVirtConfig_result, getImageVersionVirtConfig_result._Fields>, java.io.Serializable, Cloneable, Comparable<getImageVersionVirtConfig_result>   {
@@ -38343,16 +39111,13 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField NOT_FOUND_FIELD_DESC = new org.apache.thrift.protocol.TField("notFound", org.apache.thrift.protocol.TType.STRUCT, (short)2);
     private static final org.apache.thrift.protocol.TField SERVER_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("serverError", org.apache.thrift.protocol.TType.STRUCT, (short)3);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getImageVersionVirtConfig_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getImageVersionVirtConfig_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getImageVersionVirtConfig_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getImageVersionVirtConfig_resultTupleSchemeFactory();
 
-    public ByteBuffer success; // required
-    public TAuthorizationException authError; // required
-    public TNotFoundException notFound; // required
-    public TInvocationException serverError; // required
+    public @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer success; // required
+    public @org.apache.thrift.annotation.Nullable TAuthorizationException authError; // required
+    public @org.apache.thrift.annotation.Nullable TNotFoundException notFound; // required
+    public @org.apache.thrift.annotation.Nullable TInvocationException serverError; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -38361,10 +39126,10 @@ public class SatelliteServer {
       NOT_FOUND((short)2, "notFound"),
       SERVER_ERROR((short)3, "serverError");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -38372,6 +39137,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
@@ -38393,21 +39159,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -38416,24 +39183,24 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , true)));
       tmpMap.put(_Fields.AUTH_ERROR, new org.apache.thrift.meta_data.FieldMetaData("authError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class)));
       tmpMap.put(_Fields.NOT_FOUND, new org.apache.thrift.meta_data.FieldMetaData("notFound", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TNotFoundException.class)));
       tmpMap.put(_Fields.SERVER_ERROR, new org.apache.thrift.meta_data.FieldMetaData("serverError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getImageVersionVirtConfig_result.class, metaDataMap);
     }
 
@@ -38441,7 +39208,7 @@ public class SatelliteServer {
     }
 
     public getImageVersionVirtConfig_result(
-      ByteBuffer success,
+      java.nio.ByteBuffer success,
       TAuthorizationException authError,
       TNotFoundException notFound,
       TInvocationException serverError)
@@ -38488,16 +39255,16 @@ public class SatelliteServer {
       return success == null ? null : success.array();
     }
 
-    public ByteBuffer bufferForSuccess() {
+    public java.nio.ByteBuffer bufferForSuccess() {
       return org.apache.thrift.TBaseHelper.copyBinary(success);
     }
 
     public getImageVersionVirtConfig_result setSuccess(byte[] success) {
-      this.success = success == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(success, success.length));
+      this.success = success == null ? (java.nio.ByteBuffer)null     : java.nio.ByteBuffer.wrap(success.clone());
       return this;
     }
 
-    public getImageVersionVirtConfig_result setSuccess(ByteBuffer success) {
+    public getImageVersionVirtConfig_result setSuccess(@org.apache.thrift.annotation.Nullable java.nio.ByteBuffer success) {
       this.success = org.apache.thrift.TBaseHelper.copyBinary(success);
       return this;
     }
@@ -38517,11 +39284,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TAuthorizationException getAuthError() {
       return this.authError;
     }
 
-    public getImageVersionVirtConfig_result setAuthError(TAuthorizationException authError) {
+    public getImageVersionVirtConfig_result setAuthError(@org.apache.thrift.annotation.Nullable TAuthorizationException authError) {
       this.authError = authError;
       return this;
     }
@@ -38541,11 +39309,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TNotFoundException getNotFound() {
       return this.notFound;
     }
 
-    public getImageVersionVirtConfig_result setNotFound(TNotFoundException notFound) {
+    public getImageVersionVirtConfig_result setNotFound(@org.apache.thrift.annotation.Nullable TNotFoundException notFound) {
       this.notFound = notFound;
       return this;
     }
@@ -38565,11 +39334,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvocationException getServerError() {
       return this.serverError;
     }
 
-    public getImageVersionVirtConfig_result setServerError(TInvocationException serverError) {
+    public getImageVersionVirtConfig_result setServerError(@org.apache.thrift.annotation.Nullable TInvocationException serverError) {
       this.serverError = serverError;
       return this;
     }
@@ -38589,13 +39359,17 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
           unsetSuccess();
         } else {
-          setSuccess((ByteBuffer)value);
+          if (value instanceof byte[]) {
+            setSuccess((byte[])value);
+          } else {
+            setSuccess((java.nio.ByteBuffer)value);
+          }
         }
         break;
 
@@ -38626,7 +39400,8 @@ public class SatelliteServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
         return getSuccess();
@@ -38641,13 +39416,13 @@ public class SatelliteServer {
         return getServerError();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -38660,13 +39435,11 @@ public class SatelliteServer {
       case SERVER_ERROR:
         return isSetServerError();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getImageVersionVirtConfig_result)
         return this.equals((getImageVersionVirtConfig_result)that);
       return false;
@@ -38675,6 +39448,8 @@ public class SatelliteServer {
     public boolean equals(getImageVersionVirtConfig_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_success = true && this.isSetSuccess();
       boolean that_present_success = true && that.isSetSuccess();
@@ -38717,29 +39492,25 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
 
-      boolean present_authError = true && (isSetAuthError());
-      list.add(present_authError);
-      if (present_authError)
-        list.add(authError);
+      hashCode = hashCode * 8191 + ((isSetAuthError()) ? 131071 : 524287);
+      if (isSetAuthError())
+        hashCode = hashCode * 8191 + authError.hashCode();
 
-      boolean present_notFound = true && (isSetNotFound());
-      list.add(present_notFound);
-      if (present_notFound)
-        list.add(notFound);
+      hashCode = hashCode * 8191 + ((isSetNotFound()) ? 131071 : 524287);
+      if (isSetNotFound())
+        hashCode = hashCode * 8191 + notFound.hashCode();
 
-      boolean present_serverError = true && (isSetServerError());
-      list.add(present_serverError);
-      if (present_serverError)
-        list.add(serverError);
+      hashCode = hashCode * 8191 + ((isSetServerError()) ? 131071 : 524287);
+      if (isSetServerError())
+        hashCode = hashCode * 8191 + serverError.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -38750,7 +39521,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -38760,7 +39531,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetAuthError()).compareTo(other.isSetAuthError());
+      lastComparison = java.lang.Boolean.compare(isSetAuthError(), other.isSetAuthError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -38770,7 +39541,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetNotFound()).compareTo(other.isSetNotFound());
+      lastComparison = java.lang.Boolean.compare(isSetNotFound(), other.isSetNotFound());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -38780,7 +39551,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetServerError()).compareTo(other.isSetServerError());
+      lastComparison = java.lang.Boolean.compare(isSetServerError(), other.isSetServerError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -38793,21 +39564,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getImageVersionVirtConfig_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getImageVersionVirtConfig_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -38858,7 +39630,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -38866,13 +39638,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class getImageVersionVirtConfig_resultStandardSchemeFactory implements SchemeFactory {
+    private static class getImageVersionVirtConfig_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getImageVersionVirtConfig_resultStandardScheme getScheme() {
         return new getImageVersionVirtConfig_resultStandardScheme();
       }
     }
 
-    private static class getImageVersionVirtConfig_resultStandardScheme extends StandardScheme<getImageVersionVirtConfig_result> {
+    private static class getImageVersionVirtConfig_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<getImageVersionVirtConfig_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getImageVersionVirtConfig_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -38960,18 +39732,18 @@ public class SatelliteServer {
 
     }
 
-    private static class getImageVersionVirtConfig_resultTupleSchemeFactory implements SchemeFactory {
+    private static class getImageVersionVirtConfig_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getImageVersionVirtConfig_resultTupleScheme getScheme() {
         return new getImageVersionVirtConfig_resultTupleScheme();
       }
     }
 
-    private static class getImageVersionVirtConfig_resultTupleScheme extends TupleScheme<getImageVersionVirtConfig_result> {
+    private static class getImageVersionVirtConfig_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<getImageVersionVirtConfig_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getImageVersionVirtConfig_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
           optionals.set(0);
         }
@@ -39001,8 +39773,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getImageVersionVirtConfig_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(4);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(4);
         if (incoming.get(0)) {
           struct.success = iprot.readBinary();
           struct.setSuccessIsSet(true);
@@ -39025,6 +39797,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class setImageVersionVirtConfig_args implements org.apache.thrift.TBase<setImageVersionVirtConfig_args, setImageVersionVirtConfig_args._Fields>, java.io.Serializable, Cloneable, Comparable<setImageVersionVirtConfig_args>   {
@@ -39034,15 +39809,12 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField IMAGE_VERSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("imageVersionId", org.apache.thrift.protocol.TType.STRING, (short)2);
     private static final org.apache.thrift.protocol.TField META_FIELD_DESC = new org.apache.thrift.protocol.TField("meta", org.apache.thrift.protocol.TType.STRING, (short)3);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new setImageVersionVirtConfig_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new setImageVersionVirtConfig_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setImageVersionVirtConfig_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setImageVersionVirtConfig_argsTupleSchemeFactory();
 
-    public String userToken; // required
-    public String imageVersionId; // required
-    public ByteBuffer meta; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String userToken; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String imageVersionId; // required
+    public @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer meta; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -39050,10 +39822,10 @@ public class SatelliteServer {
       IMAGE_VERSION_ID((short)2, "imageVersionId"),
       META((short)3, "meta");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -39061,6 +39833,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // USER_TOKEN
@@ -39080,21 +39853,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -39103,22 +39877,22 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.USER_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("userToken", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
       tmpMap.put(_Fields.IMAGE_VERSION_ID, new org.apache.thrift.meta_data.FieldMetaData("imageVersionId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "UUID")));
       tmpMap.put(_Fields.META, new org.apache.thrift.meta_data.FieldMetaData("meta", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , true)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setImageVersionVirtConfig_args.class, metaDataMap);
     }
 
@@ -39126,9 +39900,9 @@ public class SatelliteServer {
     }
 
     public setImageVersionVirtConfig_args(
-      String userToken,
-      String imageVersionId,
-      ByteBuffer meta)
+      java.lang.String userToken,
+      java.lang.String imageVersionId,
+      java.nio.ByteBuffer meta)
     {
       this();
       this.userToken = userToken;
@@ -39162,11 +39936,12 @@ public class SatelliteServer {
       this.meta = null;
     }
 
-    public String getUserToken() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getUserToken() {
       return this.userToken;
     }
 
-    public setImageVersionVirtConfig_args setUserToken(String userToken) {
+    public setImageVersionVirtConfig_args setUserToken(@org.apache.thrift.annotation.Nullable java.lang.String userToken) {
       this.userToken = userToken;
       return this;
     }
@@ -39186,11 +39961,12 @@ public class SatelliteServer {
       }
     }
 
-    public String getImageVersionId() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getImageVersionId() {
       return this.imageVersionId;
     }
 
-    public setImageVersionVirtConfig_args setImageVersionId(String imageVersionId) {
+    public setImageVersionVirtConfig_args setImageVersionId(@org.apache.thrift.annotation.Nullable java.lang.String imageVersionId) {
       this.imageVersionId = imageVersionId;
       return this;
     }
@@ -39215,16 +39991,16 @@ public class SatelliteServer {
       return meta == null ? null : meta.array();
     }
 
-    public ByteBuffer bufferForMeta() {
+    public java.nio.ByteBuffer bufferForMeta() {
       return org.apache.thrift.TBaseHelper.copyBinary(meta);
     }
 
     public setImageVersionVirtConfig_args setMeta(byte[] meta) {
-      this.meta = meta == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(meta, meta.length));
+      this.meta = meta == null ? (java.nio.ByteBuffer)null     : java.nio.ByteBuffer.wrap(meta.clone());
       return this;
     }
 
-    public setImageVersionVirtConfig_args setMeta(ByteBuffer meta) {
+    public setImageVersionVirtConfig_args setMeta(@org.apache.thrift.annotation.Nullable java.nio.ByteBuffer meta) {
       this.meta = org.apache.thrift.TBaseHelper.copyBinary(meta);
       return this;
     }
@@ -39244,13 +40020,13 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case USER_TOKEN:
         if (value == null) {
           unsetUserToken();
         } else {
-          setUserToken((String)value);
+          setUserToken((java.lang.String)value);
         }
         break;
 
@@ -39258,7 +40034,7 @@ public class SatelliteServer {
         if (value == null) {
           unsetImageVersionId();
         } else {
-          setImageVersionId((String)value);
+          setImageVersionId((java.lang.String)value);
         }
         break;
 
@@ -39266,14 +40042,19 @@ public class SatelliteServer {
         if (value == null) {
           unsetMeta();
         } else {
-          setMeta((ByteBuffer)value);
+          if (value instanceof byte[]) {
+            setMeta((byte[])value);
+          } else {
+            setMeta((java.nio.ByteBuffer)value);
+          }
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case USER_TOKEN:
         return getUserToken();
@@ -39285,13 +40066,13 @@ public class SatelliteServer {
         return getMeta();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -39302,13 +40083,11 @@ public class SatelliteServer {
       case META:
         return isSetMeta();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof setImageVersionVirtConfig_args)
         return this.equals((setImageVersionVirtConfig_args)that);
       return false;
@@ -39317,6 +40096,8 @@ public class SatelliteServer {
     public boolean equals(setImageVersionVirtConfig_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_userToken = true && this.isSetUserToken();
       boolean that_present_userToken = true && that.isSetUserToken();
@@ -39350,24 +40131,21 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_userToken = true && (isSetUserToken());
-      list.add(present_userToken);
-      if (present_userToken)
-        list.add(userToken);
+      hashCode = hashCode * 8191 + ((isSetUserToken()) ? 131071 : 524287);
+      if (isSetUserToken())
+        hashCode = hashCode * 8191 + userToken.hashCode();
 
-      boolean present_imageVersionId = true && (isSetImageVersionId());
-      list.add(present_imageVersionId);
-      if (present_imageVersionId)
-        list.add(imageVersionId);
+      hashCode = hashCode * 8191 + ((isSetImageVersionId()) ? 131071 : 524287);
+      if (isSetImageVersionId())
+        hashCode = hashCode * 8191 + imageVersionId.hashCode();
 
-      boolean present_meta = true && (isSetMeta());
-      list.add(present_meta);
-      if (present_meta)
-        list.add(meta);
+      hashCode = hashCode * 8191 + ((isSetMeta()) ? 131071 : 524287);
+      if (isSetMeta())
+        hashCode = hashCode * 8191 + meta.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -39378,7 +40156,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetUserToken()).compareTo(other.isSetUserToken());
+      lastComparison = java.lang.Boolean.compare(isSetUserToken(), other.isSetUserToken());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -39388,7 +40166,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetImageVersionId()).compareTo(other.isSetImageVersionId());
+      lastComparison = java.lang.Boolean.compare(isSetImageVersionId(), other.isSetImageVersionId());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -39398,7 +40176,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetMeta()).compareTo(other.isSetMeta());
+      lastComparison = java.lang.Boolean.compare(isSetMeta(), other.isSetMeta());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -39411,21 +40189,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("setImageVersionVirtConfig_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("setImageVersionVirtConfig_args(");
       boolean first = true;
 
       sb.append("userToken:");
@@ -39468,7 +40247,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -39476,13 +40255,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class setImageVersionVirtConfig_argsStandardSchemeFactory implements SchemeFactory {
+    private static class setImageVersionVirtConfig_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public setImageVersionVirtConfig_argsStandardScheme getScheme() {
         return new setImageVersionVirtConfig_argsStandardScheme();
       }
     }
 
-    private static class setImageVersionVirtConfig_argsStandardScheme extends StandardScheme<setImageVersionVirtConfig_args> {
+    private static class setImageVersionVirtConfig_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<setImageVersionVirtConfig_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, setImageVersionVirtConfig_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -39554,18 +40333,18 @@ public class SatelliteServer {
 
     }
 
-    private static class setImageVersionVirtConfig_argsTupleSchemeFactory implements SchemeFactory {
+    private static class setImageVersionVirtConfig_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public setImageVersionVirtConfig_argsTupleScheme getScheme() {
         return new setImageVersionVirtConfig_argsTupleScheme();
       }
     }
 
-    private static class setImageVersionVirtConfig_argsTupleScheme extends TupleScheme<setImageVersionVirtConfig_args> {
+    private static class setImageVersionVirtConfig_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<setImageVersionVirtConfig_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, setImageVersionVirtConfig_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetUserToken()) {
           optionals.set(0);
         }
@@ -39589,8 +40368,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, setImageVersionVirtConfig_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(3);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           struct.userToken = iprot.readString();
           struct.setUserTokenIsSet(true);
@@ -39606,6 +40385,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class setImageVersionVirtConfig_result implements org.apache.thrift.TBase<setImageVersionVirtConfig_result, setImageVersionVirtConfig_result._Fields>, java.io.Serializable, Cloneable, Comparable<setImageVersionVirtConfig_result>   {
@@ -39615,15 +40397,12 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField NOT_FOUND_FIELD_DESC = new org.apache.thrift.protocol.TField("notFound", org.apache.thrift.protocol.TType.STRUCT, (short)2);
     private static final org.apache.thrift.protocol.TField SERVER_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("serverError", org.apache.thrift.protocol.TType.STRUCT, (short)3);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new setImageVersionVirtConfig_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new setImageVersionVirtConfig_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setImageVersionVirtConfig_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setImageVersionVirtConfig_resultTupleSchemeFactory();
 
-    public TAuthorizationException authError; // required
-    public TNotFoundException notFound; // required
-    public TInvocationException serverError; // required
+    public @org.apache.thrift.annotation.Nullable TAuthorizationException authError; // required
+    public @org.apache.thrift.annotation.Nullable TNotFoundException notFound; // required
+    public @org.apache.thrift.annotation.Nullable TInvocationException serverError; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -39631,10 +40410,10 @@ public class SatelliteServer {
       NOT_FOUND((short)2, "notFound"),
       SERVER_ERROR((short)3, "serverError");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -39642,6 +40421,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // AUTH_ERROR
@@ -39661,21 +40441,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -39684,22 +40465,22 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.AUTH_ERROR, new org.apache.thrift.meta_data.FieldMetaData("authError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class)));
       tmpMap.put(_Fields.NOT_FOUND, new org.apache.thrift.meta_data.FieldMetaData("notFound", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TNotFoundException.class)));
       tmpMap.put(_Fields.SERVER_ERROR, new org.apache.thrift.meta_data.FieldMetaData("serverError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setImageVersionVirtConfig_result.class, metaDataMap);
     }
 
@@ -39743,11 +40524,12 @@ public class SatelliteServer {
       this.serverError = null;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TAuthorizationException getAuthError() {
       return this.authError;
     }
 
-    public setImageVersionVirtConfig_result setAuthError(TAuthorizationException authError) {
+    public setImageVersionVirtConfig_result setAuthError(@org.apache.thrift.annotation.Nullable TAuthorizationException authError) {
       this.authError = authError;
       return this;
     }
@@ -39767,11 +40549,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TNotFoundException getNotFound() {
       return this.notFound;
     }
 
-    public setImageVersionVirtConfig_result setNotFound(TNotFoundException notFound) {
+    public setImageVersionVirtConfig_result setNotFound(@org.apache.thrift.annotation.Nullable TNotFoundException notFound) {
       this.notFound = notFound;
       return this;
     }
@@ -39791,11 +40574,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvocationException getServerError() {
       return this.serverError;
     }
 
-    public setImageVersionVirtConfig_result setServerError(TInvocationException serverError) {
+    public setImageVersionVirtConfig_result setServerError(@org.apache.thrift.annotation.Nullable TInvocationException serverError) {
       this.serverError = serverError;
       return this;
     }
@@ -39815,7 +40599,7 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case AUTH_ERROR:
         if (value == null) {
@@ -39844,7 +40628,8 @@ public class SatelliteServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case AUTH_ERROR:
         return getAuthError();
@@ -39856,13 +40641,13 @@ public class SatelliteServer {
         return getServerError();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -39873,13 +40658,11 @@ public class SatelliteServer {
       case SERVER_ERROR:
         return isSetServerError();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof setImageVersionVirtConfig_result)
         return this.equals((setImageVersionVirtConfig_result)that);
       return false;
@@ -39888,6 +40671,8 @@ public class SatelliteServer {
     public boolean equals(setImageVersionVirtConfig_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_authError = true && this.isSetAuthError();
       boolean that_present_authError = true && that.isSetAuthError();
@@ -39921,24 +40706,21 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_authError = true && (isSetAuthError());
-      list.add(present_authError);
-      if (present_authError)
-        list.add(authError);
+      hashCode = hashCode * 8191 + ((isSetAuthError()) ? 131071 : 524287);
+      if (isSetAuthError())
+        hashCode = hashCode * 8191 + authError.hashCode();
 
-      boolean present_notFound = true && (isSetNotFound());
-      list.add(present_notFound);
-      if (present_notFound)
-        list.add(notFound);
+      hashCode = hashCode * 8191 + ((isSetNotFound()) ? 131071 : 524287);
+      if (isSetNotFound())
+        hashCode = hashCode * 8191 + notFound.hashCode();
 
-      boolean present_serverError = true && (isSetServerError());
-      list.add(present_serverError);
-      if (present_serverError)
-        list.add(serverError);
+      hashCode = hashCode * 8191 + ((isSetServerError()) ? 131071 : 524287);
+      if (isSetServerError())
+        hashCode = hashCode * 8191 + serverError.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -39949,7 +40731,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetAuthError()).compareTo(other.isSetAuthError());
+      lastComparison = java.lang.Boolean.compare(isSetAuthError(), other.isSetAuthError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -39959,7 +40741,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetNotFound()).compareTo(other.isSetNotFound());
+      lastComparison = java.lang.Boolean.compare(isSetNotFound(), other.isSetNotFound());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -39969,7 +40751,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetServerError()).compareTo(other.isSetServerError());
+      lastComparison = java.lang.Boolean.compare(isSetServerError(), other.isSetServerError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -39982,21 +40764,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("setImageVersionVirtConfig_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("setImageVersionVirtConfig_result(");
       boolean first = true;
 
       sb.append("authError:");
@@ -40039,7 +40822,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -40047,13 +40830,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class setImageVersionVirtConfig_resultStandardSchemeFactory implements SchemeFactory {
+    private static class setImageVersionVirtConfig_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public setImageVersionVirtConfig_resultStandardScheme getScheme() {
         return new setImageVersionVirtConfig_resultStandardScheme();
       }
     }
 
-    private static class setImageVersionVirtConfig_resultStandardScheme extends StandardScheme<setImageVersionVirtConfig_result> {
+    private static class setImageVersionVirtConfig_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<setImageVersionVirtConfig_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, setImageVersionVirtConfig_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -40128,18 +40911,18 @@ public class SatelliteServer {
 
     }
 
-    private static class setImageVersionVirtConfig_resultTupleSchemeFactory implements SchemeFactory {
+    private static class setImageVersionVirtConfig_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public setImageVersionVirtConfig_resultTupleScheme getScheme() {
         return new setImageVersionVirtConfig_resultTupleScheme();
       }
     }
 
-    private static class setImageVersionVirtConfig_resultTupleScheme extends TupleScheme<setImageVersionVirtConfig_result> {
+    private static class setImageVersionVirtConfig_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<setImageVersionVirtConfig_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, setImageVersionVirtConfig_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetAuthError()) {
           optionals.set(0);
         }
@@ -40163,8 +40946,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, setImageVersionVirtConfig_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(3);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           struct.authError = new TAuthorizationException();
           struct.authError.read(iprot);
@@ -40183,6 +40966,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class requestImageReplication_args implements org.apache.thrift.TBase<requestImageReplication_args, requestImageReplication_args._Fields>, java.io.Serializable, Cloneable, Comparable<requestImageReplication_args>   {
@@ -40191,24 +40977,21 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField USER_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("userToken", org.apache.thrift.protocol.TType.STRING, (short)1);
     private static final org.apache.thrift.protocol.TField IMAGE_VERSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("imageVersionId", org.apache.thrift.protocol.TType.STRING, (short)2);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new requestImageReplication_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new requestImageReplication_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new requestImageReplication_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new requestImageReplication_argsTupleSchemeFactory();
 
-    public String userToken; // required
-    public String imageVersionId; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String userToken; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String imageVersionId; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       USER_TOKEN((short)1, "userToken"),
       IMAGE_VERSION_ID((short)2, "imageVersionId");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -40216,6 +40999,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // USER_TOKEN
@@ -40233,21 +41017,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -40256,20 +41041,20 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.USER_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("userToken", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
       tmpMap.put(_Fields.IMAGE_VERSION_ID, new org.apache.thrift.meta_data.FieldMetaData("imageVersionId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "UUID")));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(requestImageReplication_args.class, metaDataMap);
     }
 
@@ -40277,8 +41062,8 @@ public class SatelliteServer {
     }
 
     public requestImageReplication_args(
-      String userToken,
-      String imageVersionId)
+      java.lang.String userToken,
+      java.lang.String imageVersionId)
     {
       this();
       this.userToken = userToken;
@@ -40307,11 +41092,12 @@ public class SatelliteServer {
       this.imageVersionId = null;
     }
 
-    public String getUserToken() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getUserToken() {
       return this.userToken;
     }
 
-    public requestImageReplication_args setUserToken(String userToken) {
+    public requestImageReplication_args setUserToken(@org.apache.thrift.annotation.Nullable java.lang.String userToken) {
       this.userToken = userToken;
       return this;
     }
@@ -40331,11 +41117,12 @@ public class SatelliteServer {
       }
     }
 
-    public String getImageVersionId() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getImageVersionId() {
       return this.imageVersionId;
     }
 
-    public requestImageReplication_args setImageVersionId(String imageVersionId) {
+    public requestImageReplication_args setImageVersionId(@org.apache.thrift.annotation.Nullable java.lang.String imageVersionId) {
       this.imageVersionId = imageVersionId;
       return this;
     }
@@ -40355,13 +41142,13 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case USER_TOKEN:
         if (value == null) {
           unsetUserToken();
         } else {
-          setUserToken((String)value);
+          setUserToken((java.lang.String)value);
         }
         break;
 
@@ -40369,14 +41156,15 @@ public class SatelliteServer {
         if (value == null) {
           unsetImageVersionId();
         } else {
-          setImageVersionId((String)value);
+          setImageVersionId((java.lang.String)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case USER_TOKEN:
         return getUserToken();
@@ -40385,13 +41173,13 @@ public class SatelliteServer {
         return getImageVersionId();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -40400,13 +41188,11 @@ public class SatelliteServer {
       case IMAGE_VERSION_ID:
         return isSetImageVersionId();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof requestImageReplication_args)
         return this.equals((requestImageReplication_args)that);
       return false;
@@ -40415,6 +41201,8 @@ public class SatelliteServer {
     public boolean equals(requestImageReplication_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_userToken = true && this.isSetUserToken();
       boolean that_present_userToken = true && that.isSetUserToken();
@@ -40439,19 +41227,17 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_userToken = true && (isSetUserToken());
-      list.add(present_userToken);
-      if (present_userToken)
-        list.add(userToken);
+      hashCode = hashCode * 8191 + ((isSetUserToken()) ? 131071 : 524287);
+      if (isSetUserToken())
+        hashCode = hashCode * 8191 + userToken.hashCode();
 
-      boolean present_imageVersionId = true && (isSetImageVersionId());
-      list.add(present_imageVersionId);
-      if (present_imageVersionId)
-        list.add(imageVersionId);
+      hashCode = hashCode * 8191 + ((isSetImageVersionId()) ? 131071 : 524287);
+      if (isSetImageVersionId())
+        hashCode = hashCode * 8191 + imageVersionId.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -40462,7 +41248,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetUserToken()).compareTo(other.isSetUserToken());
+      lastComparison = java.lang.Boolean.compare(isSetUserToken(), other.isSetUserToken());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -40472,7 +41258,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetImageVersionId()).compareTo(other.isSetImageVersionId());
+      lastComparison = java.lang.Boolean.compare(isSetImageVersionId(), other.isSetImageVersionId());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -40485,21 +41271,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("requestImageReplication_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("requestImageReplication_args(");
       boolean first = true;
 
       sb.append("userToken:");
@@ -40534,7 +41321,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -40542,13 +41329,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class requestImageReplication_argsStandardSchemeFactory implements SchemeFactory {
+    private static class requestImageReplication_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public requestImageReplication_argsStandardScheme getScheme() {
         return new requestImageReplication_argsStandardScheme();
       }
     }
 
-    private static class requestImageReplication_argsStandardScheme extends StandardScheme<requestImageReplication_args> {
+    private static class requestImageReplication_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<requestImageReplication_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, requestImageReplication_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -40607,18 +41394,18 @@ public class SatelliteServer {
 
     }
 
-    private static class requestImageReplication_argsTupleSchemeFactory implements SchemeFactory {
+    private static class requestImageReplication_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public requestImageReplication_argsTupleScheme getScheme() {
         return new requestImageReplication_argsTupleScheme();
       }
     }
 
-    private static class requestImageReplication_argsTupleScheme extends TupleScheme<requestImageReplication_args> {
+    private static class requestImageReplication_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<requestImageReplication_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, requestImageReplication_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetUserToken()) {
           optionals.set(0);
         }
@@ -40636,8 +41423,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, requestImageReplication_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(2);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           struct.userToken = iprot.readString();
           struct.setUserTokenIsSet(true);
@@ -40649,6 +41436,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class requestImageReplication_result implements org.apache.thrift.TBase<requestImageReplication_result, requestImageReplication_result._Fields>, java.io.Serializable, Cloneable, Comparable<requestImageReplication_result>   {
@@ -40659,16 +41449,13 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField NOT_FOUND_FIELD_DESC = new org.apache.thrift.protocol.TField("notFound", org.apache.thrift.protocol.TType.STRUCT, (short)2);
     private static final org.apache.thrift.protocol.TField SERVER_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("serverError", org.apache.thrift.protocol.TType.STRUCT, (short)3);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new requestImageReplication_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new requestImageReplication_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new requestImageReplication_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new requestImageReplication_resultTupleSchemeFactory();
 
-    public String success; // required
-    public TAuthorizationException authError; // required
-    public TNotFoundException notFound; // required
-    public TInvocationException serverError; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String success; // required
+    public @org.apache.thrift.annotation.Nullable TAuthorizationException authError; // required
+    public @org.apache.thrift.annotation.Nullable TNotFoundException notFound; // required
+    public @org.apache.thrift.annotation.Nullable TInvocationException serverError; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -40677,10 +41464,10 @@ public class SatelliteServer {
       NOT_FOUND((short)2, "notFound"),
       SERVER_ERROR((short)3, "serverError");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -40688,6 +41475,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
@@ -40709,21 +41497,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -40732,24 +41521,24 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "UUID")));
       tmpMap.put(_Fields.AUTH_ERROR, new org.apache.thrift.meta_data.FieldMetaData("authError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class)));
       tmpMap.put(_Fields.NOT_FOUND, new org.apache.thrift.meta_data.FieldMetaData("notFound", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TNotFoundException.class)));
       tmpMap.put(_Fields.SERVER_ERROR, new org.apache.thrift.meta_data.FieldMetaData("serverError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(requestImageReplication_result.class, metaDataMap);
     }
 
@@ -40757,7 +41546,7 @@ public class SatelliteServer {
     }
 
     public requestImageReplication_result(
-      String success,
+      java.lang.String success,
       TAuthorizationException authError,
       TNotFoundException notFound,
       TInvocationException serverError)
@@ -40799,11 +41588,12 @@ public class SatelliteServer {
       this.serverError = null;
     }
 
-    public String getSuccess() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getSuccess() {
       return this.success;
     }
 
-    public requestImageReplication_result setSuccess(String success) {
+    public requestImageReplication_result setSuccess(@org.apache.thrift.annotation.Nullable java.lang.String success) {
       this.success = success;
       return this;
     }
@@ -40823,11 +41613,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TAuthorizationException getAuthError() {
       return this.authError;
     }
 
-    public requestImageReplication_result setAuthError(TAuthorizationException authError) {
+    public requestImageReplication_result setAuthError(@org.apache.thrift.annotation.Nullable TAuthorizationException authError) {
       this.authError = authError;
       return this;
     }
@@ -40847,11 +41638,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TNotFoundException getNotFound() {
       return this.notFound;
     }
 
-    public requestImageReplication_result setNotFound(TNotFoundException notFound) {
+    public requestImageReplication_result setNotFound(@org.apache.thrift.annotation.Nullable TNotFoundException notFound) {
       this.notFound = notFound;
       return this;
     }
@@ -40871,11 +41663,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvocationException getServerError() {
       return this.serverError;
     }
 
-    public requestImageReplication_result setServerError(TInvocationException serverError) {
+    public requestImageReplication_result setServerError(@org.apache.thrift.annotation.Nullable TInvocationException serverError) {
       this.serverError = serverError;
       return this;
     }
@@ -40895,13 +41688,13 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
           unsetSuccess();
         } else {
-          setSuccess((String)value);
+          setSuccess((java.lang.String)value);
         }
         break;
 
@@ -40932,7 +41725,8 @@ public class SatelliteServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
         return getSuccess();
@@ -40947,13 +41741,13 @@ public class SatelliteServer {
         return getServerError();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -40966,13 +41760,11 @@ public class SatelliteServer {
       case SERVER_ERROR:
         return isSetServerError();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof requestImageReplication_result)
         return this.equals((requestImageReplication_result)that);
       return false;
@@ -40981,6 +41773,8 @@ public class SatelliteServer {
     public boolean equals(requestImageReplication_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_success = true && this.isSetSuccess();
       boolean that_present_success = true && that.isSetSuccess();
@@ -41023,29 +41817,25 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
 
-      boolean present_authError = true && (isSetAuthError());
-      list.add(present_authError);
-      if (present_authError)
-        list.add(authError);
+      hashCode = hashCode * 8191 + ((isSetAuthError()) ? 131071 : 524287);
+      if (isSetAuthError())
+        hashCode = hashCode * 8191 + authError.hashCode();
 
-      boolean present_notFound = true && (isSetNotFound());
-      list.add(present_notFound);
-      if (present_notFound)
-        list.add(notFound);
+      hashCode = hashCode * 8191 + ((isSetNotFound()) ? 131071 : 524287);
+      if (isSetNotFound())
+        hashCode = hashCode * 8191 + notFound.hashCode();
 
-      boolean present_serverError = true && (isSetServerError());
-      list.add(present_serverError);
-      if (present_serverError)
-        list.add(serverError);
+      hashCode = hashCode * 8191 + ((isSetServerError()) ? 131071 : 524287);
+      if (isSetServerError())
+        hashCode = hashCode * 8191 + serverError.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -41056,7 +41846,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -41066,7 +41856,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetAuthError()).compareTo(other.isSetAuthError());
+      lastComparison = java.lang.Boolean.compare(isSetAuthError(), other.isSetAuthError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -41076,7 +41866,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetNotFound()).compareTo(other.isSetNotFound());
+      lastComparison = java.lang.Boolean.compare(isSetNotFound(), other.isSetNotFound());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -41086,7 +41876,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetServerError()).compareTo(other.isSetServerError());
+      lastComparison = java.lang.Boolean.compare(isSetServerError(), other.isSetServerError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -41099,21 +41889,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("requestImageReplication_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("requestImageReplication_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -41164,7 +41955,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -41172,13 +41963,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class requestImageReplication_resultStandardSchemeFactory implements SchemeFactory {
+    private static class requestImageReplication_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public requestImageReplication_resultStandardScheme getScheme() {
         return new requestImageReplication_resultStandardScheme();
       }
     }
 
-    private static class requestImageReplication_resultStandardScheme extends StandardScheme<requestImageReplication_result> {
+    private static class requestImageReplication_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<requestImageReplication_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, requestImageReplication_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -41266,18 +42057,18 @@ public class SatelliteServer {
 
     }
 
-    private static class requestImageReplication_resultTupleSchemeFactory implements SchemeFactory {
+    private static class requestImageReplication_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public requestImageReplication_resultTupleScheme getScheme() {
         return new requestImageReplication_resultTupleScheme();
       }
     }
 
-    private static class requestImageReplication_resultTupleScheme extends TupleScheme<requestImageReplication_result> {
+    private static class requestImageReplication_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<requestImageReplication_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, requestImageReplication_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
           optionals.set(0);
         }
@@ -41307,8 +42098,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, requestImageReplication_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(4);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(4);
         if (incoming.get(0)) {
           struct.success = iprot.readString();
           struct.setSuccessIsSet(true);
@@ -41331,6 +42122,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class publishImageVersion_args implements org.apache.thrift.TBase<publishImageVersion_args, publishImageVersion_args._Fields>, java.io.Serializable, Cloneable, Comparable<publishImageVersion_args>   {
@@ -41339,24 +42133,21 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField USER_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("userToken", org.apache.thrift.protocol.TType.STRING, (short)1);
     private static final org.apache.thrift.protocol.TField IMAGE_VERSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("imageVersionId", org.apache.thrift.protocol.TType.STRING, (short)2);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new publishImageVersion_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new publishImageVersion_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new publishImageVersion_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new publishImageVersion_argsTupleSchemeFactory();
 
-    public String userToken; // required
-    public String imageVersionId; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String userToken; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String imageVersionId; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       USER_TOKEN((short)1, "userToken"),
       IMAGE_VERSION_ID((short)2, "imageVersionId");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -41364,6 +42155,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // USER_TOKEN
@@ -41381,21 +42173,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -41404,20 +42197,20 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.USER_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("userToken", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
       tmpMap.put(_Fields.IMAGE_VERSION_ID, new org.apache.thrift.meta_data.FieldMetaData("imageVersionId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "UUID")));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(publishImageVersion_args.class, metaDataMap);
     }
 
@@ -41425,8 +42218,8 @@ public class SatelliteServer {
     }
 
     public publishImageVersion_args(
-      String userToken,
-      String imageVersionId)
+      java.lang.String userToken,
+      java.lang.String imageVersionId)
     {
       this();
       this.userToken = userToken;
@@ -41455,11 +42248,12 @@ public class SatelliteServer {
       this.imageVersionId = null;
     }
 
-    public String getUserToken() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getUserToken() {
       return this.userToken;
     }
 
-    public publishImageVersion_args setUserToken(String userToken) {
+    public publishImageVersion_args setUserToken(@org.apache.thrift.annotation.Nullable java.lang.String userToken) {
       this.userToken = userToken;
       return this;
     }
@@ -41479,11 +42273,12 @@ public class SatelliteServer {
       }
     }
 
-    public String getImageVersionId() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getImageVersionId() {
       return this.imageVersionId;
     }
 
-    public publishImageVersion_args setImageVersionId(String imageVersionId) {
+    public publishImageVersion_args setImageVersionId(@org.apache.thrift.annotation.Nullable java.lang.String imageVersionId) {
       this.imageVersionId = imageVersionId;
       return this;
     }
@@ -41503,13 +42298,13 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case USER_TOKEN:
         if (value == null) {
           unsetUserToken();
         } else {
-          setUserToken((String)value);
+          setUserToken((java.lang.String)value);
         }
         break;
 
@@ -41517,14 +42312,15 @@ public class SatelliteServer {
         if (value == null) {
           unsetImageVersionId();
         } else {
-          setImageVersionId((String)value);
+          setImageVersionId((java.lang.String)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case USER_TOKEN:
         return getUserToken();
@@ -41533,13 +42329,13 @@ public class SatelliteServer {
         return getImageVersionId();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -41548,13 +42344,11 @@ public class SatelliteServer {
       case IMAGE_VERSION_ID:
         return isSetImageVersionId();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof publishImageVersion_args)
         return this.equals((publishImageVersion_args)that);
       return false;
@@ -41563,6 +42357,8 @@ public class SatelliteServer {
     public boolean equals(publishImageVersion_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_userToken = true && this.isSetUserToken();
       boolean that_present_userToken = true && that.isSetUserToken();
@@ -41587,19 +42383,17 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_userToken = true && (isSetUserToken());
-      list.add(present_userToken);
-      if (present_userToken)
-        list.add(userToken);
+      hashCode = hashCode * 8191 + ((isSetUserToken()) ? 131071 : 524287);
+      if (isSetUserToken())
+        hashCode = hashCode * 8191 + userToken.hashCode();
 
-      boolean present_imageVersionId = true && (isSetImageVersionId());
-      list.add(present_imageVersionId);
-      if (present_imageVersionId)
-        list.add(imageVersionId);
+      hashCode = hashCode * 8191 + ((isSetImageVersionId()) ? 131071 : 524287);
+      if (isSetImageVersionId())
+        hashCode = hashCode * 8191 + imageVersionId.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -41610,7 +42404,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetUserToken()).compareTo(other.isSetUserToken());
+      lastComparison = java.lang.Boolean.compare(isSetUserToken(), other.isSetUserToken());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -41620,7 +42414,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetImageVersionId()).compareTo(other.isSetImageVersionId());
+      lastComparison = java.lang.Boolean.compare(isSetImageVersionId(), other.isSetImageVersionId());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -41633,21 +42427,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("publishImageVersion_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("publishImageVersion_args(");
       boolean first = true;
 
       sb.append("userToken:");
@@ -41682,7 +42477,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -41690,13 +42485,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class publishImageVersion_argsStandardSchemeFactory implements SchemeFactory {
+    private static class publishImageVersion_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public publishImageVersion_argsStandardScheme getScheme() {
         return new publishImageVersion_argsStandardScheme();
       }
     }
 
-    private static class publishImageVersion_argsStandardScheme extends StandardScheme<publishImageVersion_args> {
+    private static class publishImageVersion_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<publishImageVersion_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, publishImageVersion_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -41755,18 +42550,18 @@ public class SatelliteServer {
 
     }
 
-    private static class publishImageVersion_argsTupleSchemeFactory implements SchemeFactory {
+    private static class publishImageVersion_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public publishImageVersion_argsTupleScheme getScheme() {
         return new publishImageVersion_argsTupleScheme();
       }
     }
 
-    private static class publishImageVersion_argsTupleScheme extends TupleScheme<publishImageVersion_args> {
+    private static class publishImageVersion_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<publishImageVersion_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, publishImageVersion_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetUserToken()) {
           optionals.set(0);
         }
@@ -41784,8 +42579,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, publishImageVersion_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(2);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           struct.userToken = iprot.readString();
           struct.setUserTokenIsSet(true);
@@ -41797,6 +42592,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class publishImageVersion_result implements org.apache.thrift.TBase<publishImageVersion_result, publishImageVersion_result._Fields>, java.io.Serializable, Cloneable, Comparable<publishImageVersion_result>   {
@@ -41808,17 +42606,14 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField SERVER_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("serverError", org.apache.thrift.protocol.TType.STRUCT, (short)3);
     private static final org.apache.thrift.protocol.TField TRE_FIELD_DESC = new org.apache.thrift.protocol.TField("tre", org.apache.thrift.protocol.TType.STRUCT, (short)4);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new publishImageVersion_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new publishImageVersion_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new publishImageVersion_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new publishImageVersion_resultTupleSchemeFactory();
 
-    public String success; // required
-    public TAuthorizationException authError; // required
-    public TNotFoundException notFound; // required
-    public TInvocationException serverError; // required
-    public TTransferRejectedException tre; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String success; // required
+    public @org.apache.thrift.annotation.Nullable TAuthorizationException authError; // required
+    public @org.apache.thrift.annotation.Nullable TNotFoundException notFound; // required
+    public @org.apache.thrift.annotation.Nullable TInvocationException serverError; // required
+    public @org.apache.thrift.annotation.Nullable TTransferRejectedException tre; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -41828,10 +42623,10 @@ public class SatelliteServer {
       SERVER_ERROR((short)3, "serverError"),
       TRE((short)4, "tre");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -41839,6 +42634,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
@@ -41862,21 +42658,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -41885,26 +42682,26 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "UUID")));
       tmpMap.put(_Fields.AUTH_ERROR, new org.apache.thrift.meta_data.FieldMetaData("authError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class)));
       tmpMap.put(_Fields.NOT_FOUND, new org.apache.thrift.meta_data.FieldMetaData("notFound", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TNotFoundException.class)));
       tmpMap.put(_Fields.SERVER_ERROR, new org.apache.thrift.meta_data.FieldMetaData("serverError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class)));
       tmpMap.put(_Fields.TRE, new org.apache.thrift.meta_data.FieldMetaData("tre", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TTransferRejectedException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(publishImageVersion_result.class, metaDataMap);
     }
 
@@ -41912,7 +42709,7 @@ public class SatelliteServer {
     }
 
     public publishImageVersion_result(
-      String success,
+      java.lang.String success,
       TAuthorizationException authError,
       TNotFoundException notFound,
       TInvocationException serverError,
@@ -41960,11 +42757,12 @@ public class SatelliteServer {
       this.tre = null;
     }
 
-    public String getSuccess() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getSuccess() {
       return this.success;
     }
 
-    public publishImageVersion_result setSuccess(String success) {
+    public publishImageVersion_result setSuccess(@org.apache.thrift.annotation.Nullable java.lang.String success) {
       this.success = success;
       return this;
     }
@@ -41984,11 +42782,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TAuthorizationException getAuthError() {
       return this.authError;
     }
 
-    public publishImageVersion_result setAuthError(TAuthorizationException authError) {
+    public publishImageVersion_result setAuthError(@org.apache.thrift.annotation.Nullable TAuthorizationException authError) {
       this.authError = authError;
       return this;
     }
@@ -42008,11 +42807,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TNotFoundException getNotFound() {
       return this.notFound;
     }
 
-    public publishImageVersion_result setNotFound(TNotFoundException notFound) {
+    public publishImageVersion_result setNotFound(@org.apache.thrift.annotation.Nullable TNotFoundException notFound) {
       this.notFound = notFound;
       return this;
     }
@@ -42032,11 +42832,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvocationException getServerError() {
       return this.serverError;
     }
 
-    public publishImageVersion_result setServerError(TInvocationException serverError) {
+    public publishImageVersion_result setServerError(@org.apache.thrift.annotation.Nullable TInvocationException serverError) {
       this.serverError = serverError;
       return this;
     }
@@ -42056,11 +42857,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TTransferRejectedException getTre() {
       return this.tre;
     }
 
-    public publishImageVersion_result setTre(TTransferRejectedException tre) {
+    public publishImageVersion_result setTre(@org.apache.thrift.annotation.Nullable TTransferRejectedException tre) {
       this.tre = tre;
       return this;
     }
@@ -42080,13 +42882,13 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
           unsetSuccess();
         } else {
-          setSuccess((String)value);
+          setSuccess((java.lang.String)value);
         }
         break;
 
@@ -42125,7 +42927,8 @@ public class SatelliteServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
         return getSuccess();
@@ -42143,13 +42946,13 @@ public class SatelliteServer {
         return getTre();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -42164,13 +42967,11 @@ public class SatelliteServer {
       case TRE:
         return isSetTre();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof publishImageVersion_result)
         return this.equals((publishImageVersion_result)that);
       return false;
@@ -42179,6 +42980,8 @@ public class SatelliteServer {
     public boolean equals(publishImageVersion_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_success = true && this.isSetSuccess();
       boolean that_present_success = true && that.isSetSuccess();
@@ -42230,34 +43033,29 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
 
-      boolean present_authError = true && (isSetAuthError());
-      list.add(present_authError);
-      if (present_authError)
-        list.add(authError);
+      hashCode = hashCode * 8191 + ((isSetAuthError()) ? 131071 : 524287);
+      if (isSetAuthError())
+        hashCode = hashCode * 8191 + authError.hashCode();
 
-      boolean present_notFound = true && (isSetNotFound());
-      list.add(present_notFound);
-      if (present_notFound)
-        list.add(notFound);
+      hashCode = hashCode * 8191 + ((isSetNotFound()) ? 131071 : 524287);
+      if (isSetNotFound())
+        hashCode = hashCode * 8191 + notFound.hashCode();
 
-      boolean present_serverError = true && (isSetServerError());
-      list.add(present_serverError);
-      if (present_serverError)
-        list.add(serverError);
+      hashCode = hashCode * 8191 + ((isSetServerError()) ? 131071 : 524287);
+      if (isSetServerError())
+        hashCode = hashCode * 8191 + serverError.hashCode();
 
-      boolean present_tre = true && (isSetTre());
-      list.add(present_tre);
-      if (present_tre)
-        list.add(tre);
+      hashCode = hashCode * 8191 + ((isSetTre()) ? 131071 : 524287);
+      if (isSetTre())
+        hashCode = hashCode * 8191 + tre.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -42268,7 +43066,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -42278,7 +43076,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetAuthError()).compareTo(other.isSetAuthError());
+      lastComparison = java.lang.Boolean.compare(isSetAuthError(), other.isSetAuthError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -42288,7 +43086,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetNotFound()).compareTo(other.isSetNotFound());
+      lastComparison = java.lang.Boolean.compare(isSetNotFound(), other.isSetNotFound());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -42298,7 +43096,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetServerError()).compareTo(other.isSetServerError());
+      lastComparison = java.lang.Boolean.compare(isSetServerError(), other.isSetServerError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -42308,7 +43106,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetTre()).compareTo(other.isSetTre());
+      lastComparison = java.lang.Boolean.compare(isSetTre(), other.isSetTre());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -42321,21 +43119,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("publishImageVersion_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("publishImageVersion_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -42394,7 +43193,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -42402,13 +43201,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class publishImageVersion_resultStandardSchemeFactory implements SchemeFactory {
+    private static class publishImageVersion_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public publishImageVersion_resultStandardScheme getScheme() {
         return new publishImageVersion_resultStandardScheme();
       }
     }
 
-    private static class publishImageVersion_resultStandardScheme extends StandardScheme<publishImageVersion_result> {
+    private static class publishImageVersion_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<publishImageVersion_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, publishImageVersion_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -42510,18 +43309,18 @@ public class SatelliteServer {
 
     }
 
-    private static class publishImageVersion_resultTupleSchemeFactory implements SchemeFactory {
+    private static class publishImageVersion_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public publishImageVersion_resultTupleScheme getScheme() {
         return new publishImageVersion_resultTupleScheme();
       }
     }
 
-    private static class publishImageVersion_resultTupleScheme extends TupleScheme<publishImageVersion_result> {
+    private static class publishImageVersion_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<publishImageVersion_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, publishImageVersion_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
           optionals.set(0);
         }
@@ -42557,8 +43356,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, publishImageVersion_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(5);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(5);
         if (incoming.get(0)) {
           struct.success = iprot.readString();
           struct.setSuccessIsSet(true);
@@ -42586,6 +43385,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class createLecture_args implements org.apache.thrift.TBase<createLecture_args, createLecture_args._Fields>, java.io.Serializable, Cloneable, Comparable<createLecture_args>   {
@@ -42594,24 +43396,21 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField USER_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("userToken", org.apache.thrift.protocol.TType.STRING, (short)1);
     private static final org.apache.thrift.protocol.TField LECTURE_FIELD_DESC = new org.apache.thrift.protocol.TField("lecture", org.apache.thrift.protocol.TType.STRUCT, (short)2);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new createLecture_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new createLecture_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new createLecture_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new createLecture_argsTupleSchemeFactory();
 
-    public String userToken; // required
-    public LectureWrite lecture; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String userToken; // required
+    public @org.apache.thrift.annotation.Nullable LectureWrite lecture; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       USER_TOKEN((short)1, "userToken"),
       LECTURE((short)2, "lecture");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -42619,6 +43418,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // USER_TOKEN
@@ -42636,21 +43436,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -42659,20 +43460,20 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.USER_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("userToken", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
       tmpMap.put(_Fields.LECTURE, new org.apache.thrift.meta_data.FieldMetaData("lecture", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, LectureWrite.class)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(createLecture_args.class, metaDataMap);
     }
 
@@ -42680,7 +43481,7 @@ public class SatelliteServer {
     }
 
     public createLecture_args(
-      String userToken,
+      java.lang.String userToken,
       LectureWrite lecture)
     {
       this();
@@ -42710,11 +43511,12 @@ public class SatelliteServer {
       this.lecture = null;
     }
 
-    public String getUserToken() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getUserToken() {
       return this.userToken;
     }
 
-    public createLecture_args setUserToken(String userToken) {
+    public createLecture_args setUserToken(@org.apache.thrift.annotation.Nullable java.lang.String userToken) {
       this.userToken = userToken;
       return this;
     }
@@ -42734,11 +43536,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public LectureWrite getLecture() {
       return this.lecture;
     }
 
-    public createLecture_args setLecture(LectureWrite lecture) {
+    public createLecture_args setLecture(@org.apache.thrift.annotation.Nullable LectureWrite lecture) {
       this.lecture = lecture;
       return this;
     }
@@ -42758,13 +43561,13 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case USER_TOKEN:
         if (value == null) {
           unsetUserToken();
         } else {
-          setUserToken((String)value);
+          setUserToken((java.lang.String)value);
         }
         break;
 
@@ -42779,7 +43582,8 @@ public class SatelliteServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case USER_TOKEN:
         return getUserToken();
@@ -42788,13 +43592,13 @@ public class SatelliteServer {
         return getLecture();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -42803,13 +43607,11 @@ public class SatelliteServer {
       case LECTURE:
         return isSetLecture();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof createLecture_args)
         return this.equals((createLecture_args)that);
       return false;
@@ -42818,6 +43620,8 @@ public class SatelliteServer {
     public boolean equals(createLecture_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_userToken = true && this.isSetUserToken();
       boolean that_present_userToken = true && that.isSetUserToken();
@@ -42842,19 +43646,17 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_userToken = true && (isSetUserToken());
-      list.add(present_userToken);
-      if (present_userToken)
-        list.add(userToken);
+      hashCode = hashCode * 8191 + ((isSetUserToken()) ? 131071 : 524287);
+      if (isSetUserToken())
+        hashCode = hashCode * 8191 + userToken.hashCode();
 
-      boolean present_lecture = true && (isSetLecture());
-      list.add(present_lecture);
-      if (present_lecture)
-        list.add(lecture);
+      hashCode = hashCode * 8191 + ((isSetLecture()) ? 131071 : 524287);
+      if (isSetLecture())
+        hashCode = hashCode * 8191 + lecture.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -42865,7 +43667,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetUserToken()).compareTo(other.isSetUserToken());
+      lastComparison = java.lang.Boolean.compare(isSetUserToken(), other.isSetUserToken());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -42875,7 +43677,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetLecture()).compareTo(other.isSetLecture());
+      lastComparison = java.lang.Boolean.compare(isSetLecture(), other.isSetLecture());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -42888,21 +43690,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("createLecture_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("createLecture_args(");
       boolean first = true;
 
       sb.append("userToken:");
@@ -42940,7 +43743,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -42948,13 +43751,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class createLecture_argsStandardSchemeFactory implements SchemeFactory {
+    private static class createLecture_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public createLecture_argsStandardScheme getScheme() {
         return new createLecture_argsStandardScheme();
       }
     }
 
-    private static class createLecture_argsStandardScheme extends StandardScheme<createLecture_args> {
+    private static class createLecture_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<createLecture_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, createLecture_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -43014,18 +43817,18 @@ public class SatelliteServer {
 
     }
 
-    private static class createLecture_argsTupleSchemeFactory implements SchemeFactory {
+    private static class createLecture_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public createLecture_argsTupleScheme getScheme() {
         return new createLecture_argsTupleScheme();
       }
     }
 
-    private static class createLecture_argsTupleScheme extends TupleScheme<createLecture_args> {
+    private static class createLecture_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<createLecture_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, createLecture_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetUserToken()) {
           optionals.set(0);
         }
@@ -43043,8 +43846,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, createLecture_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(2);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           struct.userToken = iprot.readString();
           struct.setUserTokenIsSet(true);
@@ -43057,6 +43860,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class createLecture_result implements org.apache.thrift.TBase<createLecture_result, createLecture_result._Fields>, java.io.Serializable, Cloneable, Comparable<createLecture_result>   {
@@ -43068,17 +43874,14 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField DATE_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("dateError", org.apache.thrift.protocol.TType.STRUCT, (short)3);
     private static final org.apache.thrift.protocol.TField NOT_FOUND_FIELD_DESC = new org.apache.thrift.protocol.TField("notFound", org.apache.thrift.protocol.TType.STRUCT, (short)4);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new createLecture_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new createLecture_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new createLecture_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new createLecture_resultTupleSchemeFactory();
 
-    public String success; // required
-    public TAuthorizationException authError; // required
-    public TInvocationException serverError; // required
-    public TInvalidDateParam dateError; // required
-    public TNotFoundException notFound; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String success; // required
+    public @org.apache.thrift.annotation.Nullable TAuthorizationException authError; // required
+    public @org.apache.thrift.annotation.Nullable TInvocationException serverError; // required
+    public @org.apache.thrift.annotation.Nullable TInvalidDateParam dateError; // required
+    public @org.apache.thrift.annotation.Nullable TNotFoundException notFound; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -43088,10 +43891,10 @@ public class SatelliteServer {
       DATE_ERROR((short)3, "dateError"),
       NOT_FOUND((short)4, "notFound");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -43099,6 +43902,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
@@ -43122,21 +43926,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -43145,26 +43950,26 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "UUID")));
       tmpMap.put(_Fields.AUTH_ERROR, new org.apache.thrift.meta_data.FieldMetaData("authError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class)));
       tmpMap.put(_Fields.SERVER_ERROR, new org.apache.thrift.meta_data.FieldMetaData("serverError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class)));
       tmpMap.put(_Fields.DATE_ERROR, new org.apache.thrift.meta_data.FieldMetaData("dateError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvalidDateParam.class)));
       tmpMap.put(_Fields.NOT_FOUND, new org.apache.thrift.meta_data.FieldMetaData("notFound", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TNotFoundException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(createLecture_result.class, metaDataMap);
     }
 
@@ -43172,7 +43977,7 @@ public class SatelliteServer {
     }
 
     public createLecture_result(
-      String success,
+      java.lang.String success,
       TAuthorizationException authError,
       TInvocationException serverError,
       TInvalidDateParam dateError,
@@ -43220,11 +44025,12 @@ public class SatelliteServer {
       this.notFound = null;
     }
 
-    public String getSuccess() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getSuccess() {
       return this.success;
     }
 
-    public createLecture_result setSuccess(String success) {
+    public createLecture_result setSuccess(@org.apache.thrift.annotation.Nullable java.lang.String success) {
       this.success = success;
       return this;
     }
@@ -43244,11 +44050,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TAuthorizationException getAuthError() {
       return this.authError;
     }
 
-    public createLecture_result setAuthError(TAuthorizationException authError) {
+    public createLecture_result setAuthError(@org.apache.thrift.annotation.Nullable TAuthorizationException authError) {
       this.authError = authError;
       return this;
     }
@@ -43268,11 +44075,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvocationException getServerError() {
       return this.serverError;
     }
 
-    public createLecture_result setServerError(TInvocationException serverError) {
+    public createLecture_result setServerError(@org.apache.thrift.annotation.Nullable TInvocationException serverError) {
       this.serverError = serverError;
       return this;
     }
@@ -43292,11 +44100,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvalidDateParam getDateError() {
       return this.dateError;
     }
 
-    public createLecture_result setDateError(TInvalidDateParam dateError) {
+    public createLecture_result setDateError(@org.apache.thrift.annotation.Nullable TInvalidDateParam dateError) {
       this.dateError = dateError;
       return this;
     }
@@ -43316,11 +44125,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TNotFoundException getNotFound() {
       return this.notFound;
     }
 
-    public createLecture_result setNotFound(TNotFoundException notFound) {
+    public createLecture_result setNotFound(@org.apache.thrift.annotation.Nullable TNotFoundException notFound) {
       this.notFound = notFound;
       return this;
     }
@@ -43340,13 +44150,13 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
           unsetSuccess();
         } else {
-          setSuccess((String)value);
+          setSuccess((java.lang.String)value);
         }
         break;
 
@@ -43385,7 +44195,8 @@ public class SatelliteServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
         return getSuccess();
@@ -43403,13 +44214,13 @@ public class SatelliteServer {
         return getNotFound();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -43424,13 +44235,11 @@ public class SatelliteServer {
       case NOT_FOUND:
         return isSetNotFound();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof createLecture_result)
         return this.equals((createLecture_result)that);
       return false;
@@ -43439,6 +44248,8 @@ public class SatelliteServer {
     public boolean equals(createLecture_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_success = true && this.isSetSuccess();
       boolean that_present_success = true && that.isSetSuccess();
@@ -43490,34 +44301,29 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
 
-      boolean present_authError = true && (isSetAuthError());
-      list.add(present_authError);
-      if (present_authError)
-        list.add(authError);
+      hashCode = hashCode * 8191 + ((isSetAuthError()) ? 131071 : 524287);
+      if (isSetAuthError())
+        hashCode = hashCode * 8191 + authError.hashCode();
 
-      boolean present_serverError = true && (isSetServerError());
-      list.add(present_serverError);
-      if (present_serverError)
-        list.add(serverError);
+      hashCode = hashCode * 8191 + ((isSetServerError()) ? 131071 : 524287);
+      if (isSetServerError())
+        hashCode = hashCode * 8191 + serverError.hashCode();
 
-      boolean present_dateError = true && (isSetDateError());
-      list.add(present_dateError);
-      if (present_dateError)
-        list.add(dateError);
+      hashCode = hashCode * 8191 + ((isSetDateError()) ? 131071 : 524287);
+      if (isSetDateError())
+        hashCode = hashCode * 8191 + dateError.hashCode();
 
-      boolean present_notFound = true && (isSetNotFound());
-      list.add(present_notFound);
-      if (present_notFound)
-        list.add(notFound);
+      hashCode = hashCode * 8191 + ((isSetNotFound()) ? 131071 : 524287);
+      if (isSetNotFound())
+        hashCode = hashCode * 8191 + notFound.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -43528,7 +44334,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -43538,7 +44344,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetAuthError()).compareTo(other.isSetAuthError());
+      lastComparison = java.lang.Boolean.compare(isSetAuthError(), other.isSetAuthError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -43548,7 +44354,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetServerError()).compareTo(other.isSetServerError());
+      lastComparison = java.lang.Boolean.compare(isSetServerError(), other.isSetServerError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -43558,7 +44364,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetDateError()).compareTo(other.isSetDateError());
+      lastComparison = java.lang.Boolean.compare(isSetDateError(), other.isSetDateError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -43568,7 +44374,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetNotFound()).compareTo(other.isSetNotFound());
+      lastComparison = java.lang.Boolean.compare(isSetNotFound(), other.isSetNotFound());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -43581,21 +44387,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("createLecture_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("createLecture_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -43654,7 +44461,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -43662,13 +44469,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class createLecture_resultStandardSchemeFactory implements SchemeFactory {
+    private static class createLecture_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public createLecture_resultStandardScheme getScheme() {
         return new createLecture_resultStandardScheme();
       }
     }
 
-    private static class createLecture_resultStandardScheme extends StandardScheme<createLecture_result> {
+    private static class createLecture_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<createLecture_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, createLecture_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -43770,18 +44577,18 @@ public class SatelliteServer {
 
     }
 
-    private static class createLecture_resultTupleSchemeFactory implements SchemeFactory {
+    private static class createLecture_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public createLecture_resultTupleScheme getScheme() {
         return new createLecture_resultTupleScheme();
       }
     }
 
-    private static class createLecture_resultTupleScheme extends TupleScheme<createLecture_result> {
+    private static class createLecture_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<createLecture_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, createLecture_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
           optionals.set(0);
         }
@@ -43817,8 +44624,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, createLecture_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(5);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(5);
         if (incoming.get(0)) {
           struct.success = iprot.readString();
           struct.setSuccessIsSet(true);
@@ -43846,6 +44653,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class updateLecture_args implements org.apache.thrift.TBase<updateLecture_args, updateLecture_args._Fields>, java.io.Serializable, Cloneable, Comparable<updateLecture_args>   {
@@ -43855,15 +44665,12 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField LECTURE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("lectureId", org.apache.thrift.protocol.TType.STRING, (short)2);
     private static final org.apache.thrift.protocol.TField LECTURE_FIELD_DESC = new org.apache.thrift.protocol.TField("lecture", org.apache.thrift.protocol.TType.STRUCT, (short)3);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new updateLecture_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new updateLecture_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new updateLecture_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new updateLecture_argsTupleSchemeFactory();
 
-    public String userToken; // required
-    public String lectureId; // required
-    public LectureWrite lecture; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String userToken; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String lectureId; // required
+    public @org.apache.thrift.annotation.Nullable LectureWrite lecture; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -43871,10 +44678,10 @@ public class SatelliteServer {
       LECTURE_ID((short)2, "lectureId"),
       LECTURE((short)3, "lecture");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -43882,6 +44689,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // USER_TOKEN
@@ -43901,21 +44709,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -43924,22 +44733,22 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.USER_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("userToken", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
       tmpMap.put(_Fields.LECTURE_ID, new org.apache.thrift.meta_data.FieldMetaData("lectureId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "UUID")));
       tmpMap.put(_Fields.LECTURE, new org.apache.thrift.meta_data.FieldMetaData("lecture", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, LectureWrite.class)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(updateLecture_args.class, metaDataMap);
     }
 
@@ -43947,8 +44756,8 @@ public class SatelliteServer {
     }
 
     public updateLecture_args(
-      String userToken,
-      String lectureId,
+      java.lang.String userToken,
+      java.lang.String lectureId,
       LectureWrite lecture)
     {
       this();
@@ -43983,11 +44792,12 @@ public class SatelliteServer {
       this.lecture = null;
     }
 
-    public String getUserToken() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getUserToken() {
       return this.userToken;
     }
 
-    public updateLecture_args setUserToken(String userToken) {
+    public updateLecture_args setUserToken(@org.apache.thrift.annotation.Nullable java.lang.String userToken) {
       this.userToken = userToken;
       return this;
     }
@@ -44007,11 +44817,12 @@ public class SatelliteServer {
       }
     }
 
-    public String getLectureId() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getLectureId() {
       return this.lectureId;
     }
 
-    public updateLecture_args setLectureId(String lectureId) {
+    public updateLecture_args setLectureId(@org.apache.thrift.annotation.Nullable java.lang.String lectureId) {
       this.lectureId = lectureId;
       return this;
     }
@@ -44031,11 +44842,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public LectureWrite getLecture() {
       return this.lecture;
     }
 
-    public updateLecture_args setLecture(LectureWrite lecture) {
+    public updateLecture_args setLecture(@org.apache.thrift.annotation.Nullable LectureWrite lecture) {
       this.lecture = lecture;
       return this;
     }
@@ -44055,13 +44867,13 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case USER_TOKEN:
         if (value == null) {
           unsetUserToken();
         } else {
-          setUserToken((String)value);
+          setUserToken((java.lang.String)value);
         }
         break;
 
@@ -44069,7 +44881,7 @@ public class SatelliteServer {
         if (value == null) {
           unsetLectureId();
         } else {
-          setLectureId((String)value);
+          setLectureId((java.lang.String)value);
         }
         break;
 
@@ -44084,7 +44896,8 @@ public class SatelliteServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case USER_TOKEN:
         return getUserToken();
@@ -44096,13 +44909,13 @@ public class SatelliteServer {
         return getLecture();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -44113,13 +44926,11 @@ public class SatelliteServer {
       case LECTURE:
         return isSetLecture();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof updateLecture_args)
         return this.equals((updateLecture_args)that);
       return false;
@@ -44128,6 +44939,8 @@ public class SatelliteServer {
     public boolean equals(updateLecture_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_userToken = true && this.isSetUserToken();
       boolean that_present_userToken = true && that.isSetUserToken();
@@ -44161,24 +44974,21 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_userToken = true && (isSetUserToken());
-      list.add(present_userToken);
-      if (present_userToken)
-        list.add(userToken);
+      hashCode = hashCode * 8191 + ((isSetUserToken()) ? 131071 : 524287);
+      if (isSetUserToken())
+        hashCode = hashCode * 8191 + userToken.hashCode();
 
-      boolean present_lectureId = true && (isSetLectureId());
-      list.add(present_lectureId);
-      if (present_lectureId)
-        list.add(lectureId);
+      hashCode = hashCode * 8191 + ((isSetLectureId()) ? 131071 : 524287);
+      if (isSetLectureId())
+        hashCode = hashCode * 8191 + lectureId.hashCode();
 
-      boolean present_lecture = true && (isSetLecture());
-      list.add(present_lecture);
-      if (present_lecture)
-        list.add(lecture);
+      hashCode = hashCode * 8191 + ((isSetLecture()) ? 131071 : 524287);
+      if (isSetLecture())
+        hashCode = hashCode * 8191 + lecture.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -44189,7 +44999,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetUserToken()).compareTo(other.isSetUserToken());
+      lastComparison = java.lang.Boolean.compare(isSetUserToken(), other.isSetUserToken());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -44199,7 +45009,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetLectureId()).compareTo(other.isSetLectureId());
+      lastComparison = java.lang.Boolean.compare(isSetLectureId(), other.isSetLectureId());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -44209,7 +45019,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetLecture()).compareTo(other.isSetLecture());
+      lastComparison = java.lang.Boolean.compare(isSetLecture(), other.isSetLecture());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -44222,21 +45032,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("updateLecture_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("updateLecture_args(");
       boolean first = true;
 
       sb.append("userToken:");
@@ -44282,7 +45093,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -44290,13 +45101,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class updateLecture_argsStandardSchemeFactory implements SchemeFactory {
+    private static class updateLecture_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public updateLecture_argsStandardScheme getScheme() {
         return new updateLecture_argsStandardScheme();
       }
     }
 
-    private static class updateLecture_argsStandardScheme extends StandardScheme<updateLecture_args> {
+    private static class updateLecture_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<updateLecture_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, updateLecture_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -44369,18 +45180,18 @@ public class SatelliteServer {
 
     }
 
-    private static class updateLecture_argsTupleSchemeFactory implements SchemeFactory {
+    private static class updateLecture_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public updateLecture_argsTupleScheme getScheme() {
         return new updateLecture_argsTupleScheme();
       }
     }
 
-    private static class updateLecture_argsTupleScheme extends TupleScheme<updateLecture_args> {
+    private static class updateLecture_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<updateLecture_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, updateLecture_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetUserToken()) {
           optionals.set(0);
         }
@@ -44404,8 +45215,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, updateLecture_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(3);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           struct.userToken = iprot.readString();
           struct.setUserTokenIsSet(true);
@@ -44422,6 +45233,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class updateLecture_result implements org.apache.thrift.TBase<updateLecture_result, updateLecture_result._Fields>, java.io.Serializable, Cloneable, Comparable<updateLecture_result>   {
@@ -44432,16 +45246,13 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField SERVER_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("serverError", org.apache.thrift.protocol.TType.STRUCT, (short)3);
     private static final org.apache.thrift.protocol.TField DATE_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("dateError", org.apache.thrift.protocol.TType.STRUCT, (short)4);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new updateLecture_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new updateLecture_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new updateLecture_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new updateLecture_resultTupleSchemeFactory();
 
-    public TAuthorizationException authError; // required
-    public TNotFoundException notFound; // required
-    public TInvocationException serverError; // required
-    public TInvalidDateParam dateError; // required
+    public @org.apache.thrift.annotation.Nullable TAuthorizationException authError; // required
+    public @org.apache.thrift.annotation.Nullable TNotFoundException notFound; // required
+    public @org.apache.thrift.annotation.Nullable TInvocationException serverError; // required
+    public @org.apache.thrift.annotation.Nullable TInvalidDateParam dateError; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -44450,10 +45261,10 @@ public class SatelliteServer {
       SERVER_ERROR((short)3, "serverError"),
       DATE_ERROR((short)4, "dateError");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -44461,6 +45272,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // AUTH_ERROR
@@ -44482,21 +45294,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -44505,24 +45318,24 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.AUTH_ERROR, new org.apache.thrift.meta_data.FieldMetaData("authError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class)));
       tmpMap.put(_Fields.NOT_FOUND, new org.apache.thrift.meta_data.FieldMetaData("notFound", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TNotFoundException.class)));
       tmpMap.put(_Fields.SERVER_ERROR, new org.apache.thrift.meta_data.FieldMetaData("serverError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class)));
       tmpMap.put(_Fields.DATE_ERROR, new org.apache.thrift.meta_data.FieldMetaData("dateError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvalidDateParam.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(updateLecture_result.class, metaDataMap);
     }
 
@@ -44572,11 +45385,12 @@ public class SatelliteServer {
       this.dateError = null;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TAuthorizationException getAuthError() {
       return this.authError;
     }
 
-    public updateLecture_result setAuthError(TAuthorizationException authError) {
+    public updateLecture_result setAuthError(@org.apache.thrift.annotation.Nullable TAuthorizationException authError) {
       this.authError = authError;
       return this;
     }
@@ -44596,11 +45410,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TNotFoundException getNotFound() {
       return this.notFound;
     }
 
-    public updateLecture_result setNotFound(TNotFoundException notFound) {
+    public updateLecture_result setNotFound(@org.apache.thrift.annotation.Nullable TNotFoundException notFound) {
       this.notFound = notFound;
       return this;
     }
@@ -44620,11 +45435,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvocationException getServerError() {
       return this.serverError;
     }
 
-    public updateLecture_result setServerError(TInvocationException serverError) {
+    public updateLecture_result setServerError(@org.apache.thrift.annotation.Nullable TInvocationException serverError) {
       this.serverError = serverError;
       return this;
     }
@@ -44644,11 +45460,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvalidDateParam getDateError() {
       return this.dateError;
     }
 
-    public updateLecture_result setDateError(TInvalidDateParam dateError) {
+    public updateLecture_result setDateError(@org.apache.thrift.annotation.Nullable TInvalidDateParam dateError) {
       this.dateError = dateError;
       return this;
     }
@@ -44668,7 +45485,7 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case AUTH_ERROR:
         if (value == null) {
@@ -44705,7 +45522,8 @@ public class SatelliteServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case AUTH_ERROR:
         return getAuthError();
@@ -44720,13 +45538,13 @@ public class SatelliteServer {
         return getDateError();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -44739,13 +45557,11 @@ public class SatelliteServer {
       case DATE_ERROR:
         return isSetDateError();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof updateLecture_result)
         return this.equals((updateLecture_result)that);
       return false;
@@ -44754,6 +45570,8 @@ public class SatelliteServer {
     public boolean equals(updateLecture_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_authError = true && this.isSetAuthError();
       boolean that_present_authError = true && that.isSetAuthError();
@@ -44796,29 +45614,25 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_authError = true && (isSetAuthError());
-      list.add(present_authError);
-      if (present_authError)
-        list.add(authError);
+      hashCode = hashCode * 8191 + ((isSetAuthError()) ? 131071 : 524287);
+      if (isSetAuthError())
+        hashCode = hashCode * 8191 + authError.hashCode();
 
-      boolean present_notFound = true && (isSetNotFound());
-      list.add(present_notFound);
-      if (present_notFound)
-        list.add(notFound);
+      hashCode = hashCode * 8191 + ((isSetNotFound()) ? 131071 : 524287);
+      if (isSetNotFound())
+        hashCode = hashCode * 8191 + notFound.hashCode();
 
-      boolean present_serverError = true && (isSetServerError());
-      list.add(present_serverError);
-      if (present_serverError)
-        list.add(serverError);
+      hashCode = hashCode * 8191 + ((isSetServerError()) ? 131071 : 524287);
+      if (isSetServerError())
+        hashCode = hashCode * 8191 + serverError.hashCode();
 
-      boolean present_dateError = true && (isSetDateError());
-      list.add(present_dateError);
-      if (present_dateError)
-        list.add(dateError);
+      hashCode = hashCode * 8191 + ((isSetDateError()) ? 131071 : 524287);
+      if (isSetDateError())
+        hashCode = hashCode * 8191 + dateError.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -44829,7 +45643,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetAuthError()).compareTo(other.isSetAuthError());
+      lastComparison = java.lang.Boolean.compare(isSetAuthError(), other.isSetAuthError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -44839,7 +45653,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetNotFound()).compareTo(other.isSetNotFound());
+      lastComparison = java.lang.Boolean.compare(isSetNotFound(), other.isSetNotFound());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -44849,7 +45663,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetServerError()).compareTo(other.isSetServerError());
+      lastComparison = java.lang.Boolean.compare(isSetServerError(), other.isSetServerError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -44859,7 +45673,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetDateError()).compareTo(other.isSetDateError());
+      lastComparison = java.lang.Boolean.compare(isSetDateError(), other.isSetDateError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -44872,21 +45686,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("updateLecture_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("updateLecture_result(");
       boolean first = true;
 
       sb.append("authError:");
@@ -44937,7 +45752,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -44945,13 +45760,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class updateLecture_resultStandardSchemeFactory implements SchemeFactory {
+    private static class updateLecture_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public updateLecture_resultStandardScheme getScheme() {
         return new updateLecture_resultStandardScheme();
       }
     }
 
-    private static class updateLecture_resultStandardScheme extends StandardScheme<updateLecture_result> {
+    private static class updateLecture_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<updateLecture_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, updateLecture_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -45040,18 +45855,18 @@ public class SatelliteServer {
 
     }
 
-    private static class updateLecture_resultTupleSchemeFactory implements SchemeFactory {
+    private static class updateLecture_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public updateLecture_resultTupleScheme getScheme() {
         return new updateLecture_resultTupleScheme();
       }
     }
 
-    private static class updateLecture_resultTupleScheme extends TupleScheme<updateLecture_result> {
+    private static class updateLecture_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<updateLecture_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, updateLecture_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetAuthError()) {
           optionals.set(0);
         }
@@ -45081,8 +45896,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, updateLecture_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(4);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(4);
         if (incoming.get(0)) {
           struct.authError = new TAuthorizationException();
           struct.authError.read(iprot);
@@ -45106,6 +45921,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getLectureList_args implements org.apache.thrift.TBase<getLectureList_args, getLectureList_args._Fields>, java.io.Serializable, Cloneable, Comparable<getLectureList_args>   {
@@ -45114,13 +45932,10 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField USER_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("userToken", org.apache.thrift.protocol.TType.STRING, (short)1);
     private static final org.apache.thrift.protocol.TField PAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("page", org.apache.thrift.protocol.TType.I32, (short)2);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getLectureList_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getLectureList_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getLectureList_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getLectureList_argsTupleSchemeFactory();
 
-    public String userToken; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String userToken; // required
     public int page; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
@@ -45128,10 +45943,10 @@ public class SatelliteServer {
       USER_TOKEN((short)1, "userToken"),
       PAGE((short)2, "page");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -45139,6 +45954,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // USER_TOKEN
@@ -45156,21 +45972,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -45179,7 +45996,7 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
@@ -45187,14 +46004,14 @@ public class SatelliteServer {
     // isset id assignments
     private static final int __PAGE_ISSET_ID = 0;
     private byte __isset_bitfield = 0;
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.USER_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("userToken", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
       tmpMap.put(_Fields.PAGE, new org.apache.thrift.meta_data.FieldMetaData("page", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getLectureList_args.class, metaDataMap);
     }
 
@@ -45202,7 +46019,7 @@ public class SatelliteServer {
     }
 
     public getLectureList_args(
-      String userToken,
+      java.lang.String userToken,
       int page)
     {
       this();
@@ -45233,11 +46050,12 @@ public class SatelliteServer {
       this.page = 0;
     }
 
-    public String getUserToken() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getUserToken() {
       return this.userToken;
     }
 
-    public getLectureList_args setUserToken(String userToken) {
+    public getLectureList_args setUserToken(@org.apache.thrift.annotation.Nullable java.lang.String userToken) {
       this.userToken = userToken;
       return this;
     }
@@ -45268,25 +46086,25 @@ public class SatelliteServer {
     }
 
     public void unsetPage() {
-      __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __PAGE_ISSET_ID);
+      __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __PAGE_ISSET_ID);
     }
 
     /** Returns true if field page is set (has been assigned a value) and false otherwise */
     public boolean isSetPage() {
-      return EncodingUtils.testBit(__isset_bitfield, __PAGE_ISSET_ID);
+      return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __PAGE_ISSET_ID);
     }
 
     public void setPageIsSet(boolean value) {
-      __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __PAGE_ISSET_ID, value);
+      __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __PAGE_ISSET_ID, value);
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case USER_TOKEN:
         if (value == null) {
           unsetUserToken();
         } else {
-          setUserToken((String)value);
+          setUserToken((java.lang.String)value);
         }
         break;
 
@@ -45294,14 +46112,15 @@ public class SatelliteServer {
         if (value == null) {
           unsetPage();
         } else {
-          setPage((Integer)value);
+          setPage((java.lang.Integer)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case USER_TOKEN:
         return getUserToken();
@@ -45310,13 +46129,13 @@ public class SatelliteServer {
         return getPage();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -45325,13 +46144,11 @@ public class SatelliteServer {
       case PAGE:
         return isSetPage();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getLectureList_args)
         return this.equals((getLectureList_args)that);
       return false;
@@ -45340,6 +46157,8 @@ public class SatelliteServer {
     public boolean equals(getLectureList_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_userToken = true && this.isSetUserToken();
       boolean that_present_userToken = true && that.isSetUserToken();
@@ -45364,19 +46183,15 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_userToken = true && (isSetUserToken());
-      list.add(present_userToken);
-      if (present_userToken)
-        list.add(userToken);
+      hashCode = hashCode * 8191 + ((isSetUserToken()) ? 131071 : 524287);
+      if (isSetUserToken())
+        hashCode = hashCode * 8191 + userToken.hashCode();
 
-      boolean present_page = true;
-      list.add(present_page);
-      if (present_page)
-        list.add(page);
+      hashCode = hashCode * 8191 + page;
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -45387,7 +46202,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetUserToken()).compareTo(other.isSetUserToken());
+      lastComparison = java.lang.Boolean.compare(isSetUserToken(), other.isSetUserToken());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -45397,7 +46212,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetPage()).compareTo(other.isSetPage());
+      lastComparison = java.lang.Boolean.compare(isSetPage(), other.isSetPage());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -45410,21 +46225,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getLectureList_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getLectureList_args(");
       boolean first = true;
 
       sb.append("userToken:");
@@ -45455,7 +46271,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
         __isset_bitfield = 0;
@@ -45465,13 +46281,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class getLectureList_argsStandardSchemeFactory implements SchemeFactory {
+    private static class getLectureList_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getLectureList_argsStandardScheme getScheme() {
         return new getLectureList_argsStandardScheme();
       }
     }
 
-    private static class getLectureList_argsStandardScheme extends StandardScheme<getLectureList_args> {
+    private static class getLectureList_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<getLectureList_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getLectureList_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -45528,18 +46344,18 @@ public class SatelliteServer {
 
     }
 
-    private static class getLectureList_argsTupleSchemeFactory implements SchemeFactory {
+    private static class getLectureList_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getLectureList_argsTupleScheme getScheme() {
         return new getLectureList_argsTupleScheme();
       }
     }
 
-    private static class getLectureList_argsTupleScheme extends TupleScheme<getLectureList_args> {
+    private static class getLectureList_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<getLectureList_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getLectureList_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetUserToken()) {
           optionals.set(0);
         }
@@ -45557,8 +46373,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getLectureList_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(2);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           struct.userToken = iprot.readString();
           struct.setUserTokenIsSet(true);
@@ -45570,6 +46386,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getLectureList_result implements org.apache.thrift.TBase<getLectureList_result, getLectureList_result._Fields>, java.io.Serializable, Cloneable, Comparable<getLectureList_result>   {
@@ -45579,15 +46398,12 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField AUTH_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("authError", org.apache.thrift.protocol.TType.STRUCT, (short)1);
     private static final org.apache.thrift.protocol.TField SERVER_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("serverError", org.apache.thrift.protocol.TType.STRUCT, (short)2);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getLectureList_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getLectureList_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getLectureList_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getLectureList_resultTupleSchemeFactory();
 
-    public List<LectureSummary> success; // required
-    public TAuthorizationException authError; // required
-    public TInvocationException serverError; // required
+    public @org.apache.thrift.annotation.Nullable java.util.List<LectureSummary> success; // required
+    public @org.apache.thrift.annotation.Nullable TAuthorizationException authError; // required
+    public @org.apache.thrift.annotation.Nullable TInvocationException serverError; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -45595,10 +46411,10 @@ public class SatelliteServer {
       AUTH_ERROR((short)1, "authError"),
       SERVER_ERROR((short)2, "serverError");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -45606,6 +46422,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
@@ -45625,21 +46442,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -45648,23 +46466,23 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
               new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, LectureSummary.class))));
       tmpMap.put(_Fields.AUTH_ERROR, new org.apache.thrift.meta_data.FieldMetaData("authError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class)));
       tmpMap.put(_Fields.SERVER_ERROR, new org.apache.thrift.meta_data.FieldMetaData("serverError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getLectureList_result.class, metaDataMap);
     }
 
@@ -45672,7 +46490,7 @@ public class SatelliteServer {
     }
 
     public getLectureList_result(
-      List<LectureSummary> success,
+      java.util.List<LectureSummary> success,
       TAuthorizationException authError,
       TInvocationException serverError)
     {
@@ -45687,7 +46505,7 @@ public class SatelliteServer {
      */
     public getLectureList_result(getLectureList_result other) {
       if (other.isSetSuccess()) {
-        List<LectureSummary> __this__success = new ArrayList<LectureSummary>(other.success.size());
+        java.util.List<LectureSummary> __this__success = new java.util.ArrayList<LectureSummary>(other.success.size());
         for (LectureSummary other_element : other.success) {
           __this__success.add(new LectureSummary(other_element));
         }
@@ -45716,22 +46534,24 @@ public class SatelliteServer {
       return (this.success == null) ? 0 : this.success.size();
     }
 
+    @org.apache.thrift.annotation.Nullable
     public java.util.Iterator<LectureSummary> getSuccessIterator() {
       return (this.success == null) ? null : this.success.iterator();
     }
 
     public void addToSuccess(LectureSummary elem) {
       if (this.success == null) {
-        this.success = new ArrayList<LectureSummary>();
+        this.success = new java.util.ArrayList<LectureSummary>();
       }
       this.success.add(elem);
     }
 
-    public List<LectureSummary> getSuccess() {
+    @org.apache.thrift.annotation.Nullable
+    public java.util.List<LectureSummary> getSuccess() {
       return this.success;
     }
 
-    public getLectureList_result setSuccess(List<LectureSummary> success) {
+    public getLectureList_result setSuccess(@org.apache.thrift.annotation.Nullable java.util.List<LectureSummary> success) {
       this.success = success;
       return this;
     }
@@ -45751,11 +46571,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TAuthorizationException getAuthError() {
       return this.authError;
     }
 
-    public getLectureList_result setAuthError(TAuthorizationException authError) {
+    public getLectureList_result setAuthError(@org.apache.thrift.annotation.Nullable TAuthorizationException authError) {
       this.authError = authError;
       return this;
     }
@@ -45775,11 +46596,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvocationException getServerError() {
       return this.serverError;
     }
 
-    public getLectureList_result setServerError(TInvocationException serverError) {
+    public getLectureList_result setServerError(@org.apache.thrift.annotation.Nullable TInvocationException serverError) {
       this.serverError = serverError;
       return this;
     }
@@ -45799,13 +46621,13 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
           unsetSuccess();
         } else {
-          setSuccess((List<LectureSummary>)value);
+          setSuccess((java.util.List<LectureSummary>)value);
         }
         break;
 
@@ -45828,7 +46650,8 @@ public class SatelliteServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
         return getSuccess();
@@ -45840,13 +46663,13 @@ public class SatelliteServer {
         return getServerError();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -45857,13 +46680,11 @@ public class SatelliteServer {
       case SERVER_ERROR:
         return isSetServerError();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getLectureList_result)
         return this.equals((getLectureList_result)that);
       return false;
@@ -45872,6 +46693,8 @@ public class SatelliteServer {
     public boolean equals(getLectureList_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_success = true && this.isSetSuccess();
       boolean that_present_success = true && that.isSetSuccess();
@@ -45905,24 +46728,21 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
 
-      boolean present_authError = true && (isSetAuthError());
-      list.add(present_authError);
-      if (present_authError)
-        list.add(authError);
+      hashCode = hashCode * 8191 + ((isSetAuthError()) ? 131071 : 524287);
+      if (isSetAuthError())
+        hashCode = hashCode * 8191 + authError.hashCode();
 
-      boolean present_serverError = true && (isSetServerError());
-      list.add(present_serverError);
-      if (present_serverError)
-        list.add(serverError);
+      hashCode = hashCode * 8191 + ((isSetServerError()) ? 131071 : 524287);
+      if (isSetServerError())
+        hashCode = hashCode * 8191 + serverError.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -45933,7 +46753,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -45943,7 +46763,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetAuthError()).compareTo(other.isSetAuthError());
+      lastComparison = java.lang.Boolean.compare(isSetAuthError(), other.isSetAuthError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -45953,7 +46773,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetServerError()).compareTo(other.isSetServerError());
+      lastComparison = java.lang.Boolean.compare(isSetServerError(), other.isSetServerError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -45966,21 +46786,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getLectureList_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getLectureList_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -46023,7 +46844,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -46031,13 +46852,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class getLectureList_resultStandardSchemeFactory implements SchemeFactory {
+    private static class getLectureList_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getLectureList_resultStandardScheme getScheme() {
         return new getLectureList_resultStandardScheme();
       }
     }
 
-    private static class getLectureList_resultStandardScheme extends StandardScheme<getLectureList_result> {
+    private static class getLectureList_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<getLectureList_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getLectureList_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -46052,14 +46873,14 @@ public class SatelliteServer {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
                 {
-                  org.apache.thrift.protocol.TList _list310 = iprot.readListBegin();
-                  struct.success = new ArrayList<LectureSummary>(_list310.size);
-                  LectureSummary _elem311;
-                  for (int _i312 = 0; _i312 < _list310.size; ++_i312)
+                  org.apache.thrift.protocol.TList _list390 = iprot.readListBegin();
+                  struct.success = new java.util.ArrayList<LectureSummary>(_list390.size);
+                  @org.apache.thrift.annotation.Nullable LectureSummary _elem391;
+                  for (int _i392 = 0; _i392 < _list390.size; ++_i392)
                   {
-                    _elem311 = new LectureSummary();
-                    _elem311.read(iprot);
-                    struct.success.add(_elem311);
+                    _elem391 = new LectureSummary();
+                    _elem391.read(iprot);
+                    struct.success.add(_elem391);
                   }
                   iprot.readListEnd();
                 }
@@ -46105,9 +46926,9 @@ public class SatelliteServer {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
-            for (LectureSummary _iter313 : struct.success)
+            for (LectureSummary _iter393 : struct.success)
             {
-              _iter313.write(oprot);
+              _iter393.write(oprot);
             }
             oprot.writeListEnd();
           }
@@ -46129,18 +46950,18 @@ public class SatelliteServer {
 
     }
 
-    private static class getLectureList_resultTupleSchemeFactory implements SchemeFactory {
+    private static class getLectureList_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getLectureList_resultTupleScheme getScheme() {
         return new getLectureList_resultTupleScheme();
       }
     }
 
-    private static class getLectureList_resultTupleScheme extends TupleScheme<getLectureList_result> {
+    private static class getLectureList_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<getLectureList_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getLectureList_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
           optionals.set(0);
         }
@@ -46154,9 +46975,9 @@ public class SatelliteServer {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (LectureSummary _iter314 : struct.success)
+            for (LectureSummary _iter394 : struct.success)
             {
-              _iter314.write(oprot);
+              _iter394.write(oprot);
             }
           }
         }
@@ -46170,18 +46991,18 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getLectureList_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(3);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TList _list315 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new ArrayList<LectureSummary>(_list315.size);
-            LectureSummary _elem316;
-            for (int _i317 = 0; _i317 < _list315.size; ++_i317)
+            org.apache.thrift.protocol.TList _list395 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRUCT);
+            struct.success = new java.util.ArrayList<LectureSummary>(_list395.size);
+            @org.apache.thrift.annotation.Nullable LectureSummary _elem396;
+            for (int _i397 = 0; _i397 < _list395.size; ++_i397)
             {
-              _elem316 = new LectureSummary();
-              _elem316.read(iprot);
-              struct.success.add(_elem316);
+              _elem396 = new LectureSummary();
+              _elem396.read(iprot);
+              struct.success.add(_elem396);
             }
           }
           struct.setSuccessIsSet(true);
@@ -46199,6 +47020,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getLectureDetails_args implements org.apache.thrift.TBase<getLectureDetails_args, getLectureDetails_args._Fields>, java.io.Serializable, Cloneable, Comparable<getLectureDetails_args>   {
@@ -46207,24 +47031,21 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField USER_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("userToken", org.apache.thrift.protocol.TType.STRING, (short)1);
     private static final org.apache.thrift.protocol.TField LECTURE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("lectureId", org.apache.thrift.protocol.TType.STRING, (short)2);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getLectureDetails_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getLectureDetails_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getLectureDetails_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getLectureDetails_argsTupleSchemeFactory();
 
-    public String userToken; // required
-    public String lectureId; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String userToken; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String lectureId; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       USER_TOKEN((short)1, "userToken"),
       LECTURE_ID((short)2, "lectureId");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -46232,6 +47053,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // USER_TOKEN
@@ -46249,21 +47071,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -46272,20 +47095,20 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.USER_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("userToken", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
       tmpMap.put(_Fields.LECTURE_ID, new org.apache.thrift.meta_data.FieldMetaData("lectureId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "UUID")));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getLectureDetails_args.class, metaDataMap);
     }
 
@@ -46293,8 +47116,8 @@ public class SatelliteServer {
     }
 
     public getLectureDetails_args(
-      String userToken,
-      String lectureId)
+      java.lang.String userToken,
+      java.lang.String lectureId)
     {
       this();
       this.userToken = userToken;
@@ -46323,11 +47146,12 @@ public class SatelliteServer {
       this.lectureId = null;
     }
 
-    public String getUserToken() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getUserToken() {
       return this.userToken;
     }
 
-    public getLectureDetails_args setUserToken(String userToken) {
+    public getLectureDetails_args setUserToken(@org.apache.thrift.annotation.Nullable java.lang.String userToken) {
       this.userToken = userToken;
       return this;
     }
@@ -46347,11 +47171,12 @@ public class SatelliteServer {
       }
     }
 
-    public String getLectureId() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getLectureId() {
       return this.lectureId;
     }
 
-    public getLectureDetails_args setLectureId(String lectureId) {
+    public getLectureDetails_args setLectureId(@org.apache.thrift.annotation.Nullable java.lang.String lectureId) {
       this.lectureId = lectureId;
       return this;
     }
@@ -46371,13 +47196,13 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case USER_TOKEN:
         if (value == null) {
           unsetUserToken();
         } else {
-          setUserToken((String)value);
+          setUserToken((java.lang.String)value);
         }
         break;
 
@@ -46385,14 +47210,15 @@ public class SatelliteServer {
         if (value == null) {
           unsetLectureId();
         } else {
-          setLectureId((String)value);
+          setLectureId((java.lang.String)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case USER_TOKEN:
         return getUserToken();
@@ -46401,13 +47227,13 @@ public class SatelliteServer {
         return getLectureId();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -46416,13 +47242,11 @@ public class SatelliteServer {
       case LECTURE_ID:
         return isSetLectureId();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getLectureDetails_args)
         return this.equals((getLectureDetails_args)that);
       return false;
@@ -46431,6 +47255,8 @@ public class SatelliteServer {
     public boolean equals(getLectureDetails_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_userToken = true && this.isSetUserToken();
       boolean that_present_userToken = true && that.isSetUserToken();
@@ -46455,19 +47281,17 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_userToken = true && (isSetUserToken());
-      list.add(present_userToken);
-      if (present_userToken)
-        list.add(userToken);
+      hashCode = hashCode * 8191 + ((isSetUserToken()) ? 131071 : 524287);
+      if (isSetUserToken())
+        hashCode = hashCode * 8191 + userToken.hashCode();
 
-      boolean present_lectureId = true && (isSetLectureId());
-      list.add(present_lectureId);
-      if (present_lectureId)
-        list.add(lectureId);
+      hashCode = hashCode * 8191 + ((isSetLectureId()) ? 131071 : 524287);
+      if (isSetLectureId())
+        hashCode = hashCode * 8191 + lectureId.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -46478,7 +47302,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetUserToken()).compareTo(other.isSetUserToken());
+      lastComparison = java.lang.Boolean.compare(isSetUserToken(), other.isSetUserToken());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -46488,7 +47312,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetLectureId()).compareTo(other.isSetLectureId());
+      lastComparison = java.lang.Boolean.compare(isSetLectureId(), other.isSetLectureId());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -46501,21 +47325,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getLectureDetails_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getLectureDetails_args(");
       boolean first = true;
 
       sb.append("userToken:");
@@ -46550,7 +47375,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -46558,13 +47383,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class getLectureDetails_argsStandardSchemeFactory implements SchemeFactory {
+    private static class getLectureDetails_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getLectureDetails_argsStandardScheme getScheme() {
         return new getLectureDetails_argsStandardScheme();
       }
     }
 
-    private static class getLectureDetails_argsStandardScheme extends StandardScheme<getLectureDetails_args> {
+    private static class getLectureDetails_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<getLectureDetails_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getLectureDetails_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -46623,18 +47448,18 @@ public class SatelliteServer {
 
     }
 
-    private static class getLectureDetails_argsTupleSchemeFactory implements SchemeFactory {
+    private static class getLectureDetails_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getLectureDetails_argsTupleScheme getScheme() {
         return new getLectureDetails_argsTupleScheme();
       }
     }
 
-    private static class getLectureDetails_argsTupleScheme extends TupleScheme<getLectureDetails_args> {
+    private static class getLectureDetails_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<getLectureDetails_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getLectureDetails_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetUserToken()) {
           optionals.set(0);
         }
@@ -46652,8 +47477,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getLectureDetails_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(2);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           struct.userToken = iprot.readString();
           struct.setUserTokenIsSet(true);
@@ -46665,6 +47490,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getLectureDetails_result implements org.apache.thrift.TBase<getLectureDetails_result, getLectureDetails_result._Fields>, java.io.Serializable, Cloneable, Comparable<getLectureDetails_result>   {
@@ -46675,16 +47503,13 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField NOT_FOUND_FIELD_DESC = new org.apache.thrift.protocol.TField("notFound", org.apache.thrift.protocol.TType.STRUCT, (short)2);
     private static final org.apache.thrift.protocol.TField SERVER_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("serverError", org.apache.thrift.protocol.TType.STRUCT, (short)3);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getLectureDetails_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getLectureDetails_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getLectureDetails_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getLectureDetails_resultTupleSchemeFactory();
 
-    public LectureRead success; // required
-    public TAuthorizationException authError; // required
-    public TNotFoundException notFound; // required
-    public TInvocationException serverError; // required
+    public @org.apache.thrift.annotation.Nullable LectureRead success; // required
+    public @org.apache.thrift.annotation.Nullable TAuthorizationException authError; // required
+    public @org.apache.thrift.annotation.Nullable TNotFoundException notFound; // required
+    public @org.apache.thrift.annotation.Nullable TInvocationException serverError; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -46693,10 +47518,10 @@ public class SatelliteServer {
       NOT_FOUND((short)2, "notFound"),
       SERVER_ERROR((short)3, "serverError");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -46704,6 +47529,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
@@ -46725,21 +47551,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -46748,24 +47575,24 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, LectureRead.class)));
       tmpMap.put(_Fields.AUTH_ERROR, new org.apache.thrift.meta_data.FieldMetaData("authError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class)));
       tmpMap.put(_Fields.NOT_FOUND, new org.apache.thrift.meta_data.FieldMetaData("notFound", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TNotFoundException.class)));
       tmpMap.put(_Fields.SERVER_ERROR, new org.apache.thrift.meta_data.FieldMetaData("serverError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getLectureDetails_result.class, metaDataMap);
     }
 
@@ -46815,11 +47642,12 @@ public class SatelliteServer {
       this.serverError = null;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public LectureRead getSuccess() {
       return this.success;
     }
 
-    public getLectureDetails_result setSuccess(LectureRead success) {
+    public getLectureDetails_result setSuccess(@org.apache.thrift.annotation.Nullable LectureRead success) {
       this.success = success;
       return this;
     }
@@ -46839,11 +47667,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TAuthorizationException getAuthError() {
       return this.authError;
     }
 
-    public getLectureDetails_result setAuthError(TAuthorizationException authError) {
+    public getLectureDetails_result setAuthError(@org.apache.thrift.annotation.Nullable TAuthorizationException authError) {
       this.authError = authError;
       return this;
     }
@@ -46863,11 +47692,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TNotFoundException getNotFound() {
       return this.notFound;
     }
 
-    public getLectureDetails_result setNotFound(TNotFoundException notFound) {
+    public getLectureDetails_result setNotFound(@org.apache.thrift.annotation.Nullable TNotFoundException notFound) {
       this.notFound = notFound;
       return this;
     }
@@ -46887,11 +47717,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvocationException getServerError() {
       return this.serverError;
     }
 
-    public getLectureDetails_result setServerError(TInvocationException serverError) {
+    public getLectureDetails_result setServerError(@org.apache.thrift.annotation.Nullable TInvocationException serverError) {
       this.serverError = serverError;
       return this;
     }
@@ -46911,7 +47742,7 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
@@ -46948,7 +47779,8 @@ public class SatelliteServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
         return getSuccess();
@@ -46963,13 +47795,13 @@ public class SatelliteServer {
         return getServerError();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -46982,13 +47814,11 @@ public class SatelliteServer {
       case SERVER_ERROR:
         return isSetServerError();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getLectureDetails_result)
         return this.equals((getLectureDetails_result)that);
       return false;
@@ -46997,6 +47827,8 @@ public class SatelliteServer {
     public boolean equals(getLectureDetails_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_success = true && this.isSetSuccess();
       boolean that_present_success = true && that.isSetSuccess();
@@ -47039,29 +47871,25 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
 
-      boolean present_authError = true && (isSetAuthError());
-      list.add(present_authError);
-      if (present_authError)
-        list.add(authError);
+      hashCode = hashCode * 8191 + ((isSetAuthError()) ? 131071 : 524287);
+      if (isSetAuthError())
+        hashCode = hashCode * 8191 + authError.hashCode();
 
-      boolean present_notFound = true && (isSetNotFound());
-      list.add(present_notFound);
-      if (present_notFound)
-        list.add(notFound);
+      hashCode = hashCode * 8191 + ((isSetNotFound()) ? 131071 : 524287);
+      if (isSetNotFound())
+        hashCode = hashCode * 8191 + notFound.hashCode();
 
-      boolean present_serverError = true && (isSetServerError());
-      list.add(present_serverError);
-      if (present_serverError)
-        list.add(serverError);
+      hashCode = hashCode * 8191 + ((isSetServerError()) ? 131071 : 524287);
+      if (isSetServerError())
+        hashCode = hashCode * 8191 + serverError.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -47072,7 +47900,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -47082,7 +47910,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetAuthError()).compareTo(other.isSetAuthError());
+      lastComparison = java.lang.Boolean.compare(isSetAuthError(), other.isSetAuthError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -47092,7 +47920,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetNotFound()).compareTo(other.isSetNotFound());
+      lastComparison = java.lang.Boolean.compare(isSetNotFound(), other.isSetNotFound());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -47102,7 +47930,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetServerError()).compareTo(other.isSetServerError());
+      lastComparison = java.lang.Boolean.compare(isSetServerError(), other.isSetServerError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -47115,21 +47943,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getLectureDetails_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getLectureDetails_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -47183,7 +48012,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -47191,13 +48020,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class getLectureDetails_resultStandardSchemeFactory implements SchemeFactory {
+    private static class getLectureDetails_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getLectureDetails_resultStandardScheme getScheme() {
         return new getLectureDetails_resultStandardScheme();
       }
     }
 
-    private static class getLectureDetails_resultStandardScheme extends StandardScheme<getLectureDetails_result> {
+    private static class getLectureDetails_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<getLectureDetails_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getLectureDetails_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -47286,18 +48115,18 @@ public class SatelliteServer {
 
     }
 
-    private static class getLectureDetails_resultTupleSchemeFactory implements SchemeFactory {
+    private static class getLectureDetails_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getLectureDetails_resultTupleScheme getScheme() {
         return new getLectureDetails_resultTupleScheme();
       }
     }
 
-    private static class getLectureDetails_resultTupleScheme extends TupleScheme<getLectureDetails_result> {
+    private static class getLectureDetails_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<getLectureDetails_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getLectureDetails_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
           optionals.set(0);
         }
@@ -47327,8 +48156,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getLectureDetails_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(4);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(4);
         if (incoming.get(0)) {
           struct.success = new LectureRead();
           struct.success.read(iprot);
@@ -47352,6 +48181,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class deleteLecture_args implements org.apache.thrift.TBase<deleteLecture_args, deleteLecture_args._Fields>, java.io.Serializable, Cloneable, Comparable<deleteLecture_args>   {
@@ -47360,24 +48192,21 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField USER_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("userToken", org.apache.thrift.protocol.TType.STRING, (short)1);
     private static final org.apache.thrift.protocol.TField LECTURE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("lectureId", org.apache.thrift.protocol.TType.STRING, (short)2);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new deleteLecture_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new deleteLecture_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new deleteLecture_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new deleteLecture_argsTupleSchemeFactory();
 
-    public String userToken; // required
-    public String lectureId; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String userToken; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String lectureId; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       USER_TOKEN((short)1, "userToken"),
       LECTURE_ID((short)2, "lectureId");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -47385,6 +48214,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // USER_TOKEN
@@ -47402,21 +48232,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -47425,20 +48256,20 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.USER_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("userToken", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
       tmpMap.put(_Fields.LECTURE_ID, new org.apache.thrift.meta_data.FieldMetaData("lectureId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "UUID")));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(deleteLecture_args.class, metaDataMap);
     }
 
@@ -47446,8 +48277,8 @@ public class SatelliteServer {
     }
 
     public deleteLecture_args(
-      String userToken,
-      String lectureId)
+      java.lang.String userToken,
+      java.lang.String lectureId)
     {
       this();
       this.userToken = userToken;
@@ -47476,11 +48307,12 @@ public class SatelliteServer {
       this.lectureId = null;
     }
 
-    public String getUserToken() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getUserToken() {
       return this.userToken;
     }
 
-    public deleteLecture_args setUserToken(String userToken) {
+    public deleteLecture_args setUserToken(@org.apache.thrift.annotation.Nullable java.lang.String userToken) {
       this.userToken = userToken;
       return this;
     }
@@ -47500,11 +48332,12 @@ public class SatelliteServer {
       }
     }
 
-    public String getLectureId() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getLectureId() {
       return this.lectureId;
     }
 
-    public deleteLecture_args setLectureId(String lectureId) {
+    public deleteLecture_args setLectureId(@org.apache.thrift.annotation.Nullable java.lang.String lectureId) {
       this.lectureId = lectureId;
       return this;
     }
@@ -47524,13 +48357,13 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case USER_TOKEN:
         if (value == null) {
           unsetUserToken();
         } else {
-          setUserToken((String)value);
+          setUserToken((java.lang.String)value);
         }
         break;
 
@@ -47538,14 +48371,15 @@ public class SatelliteServer {
         if (value == null) {
           unsetLectureId();
         } else {
-          setLectureId((String)value);
+          setLectureId((java.lang.String)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case USER_TOKEN:
         return getUserToken();
@@ -47554,13 +48388,13 @@ public class SatelliteServer {
         return getLectureId();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -47569,13 +48403,11 @@ public class SatelliteServer {
       case LECTURE_ID:
         return isSetLectureId();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof deleteLecture_args)
         return this.equals((deleteLecture_args)that);
       return false;
@@ -47584,6 +48416,8 @@ public class SatelliteServer {
     public boolean equals(deleteLecture_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_userToken = true && this.isSetUserToken();
       boolean that_present_userToken = true && that.isSetUserToken();
@@ -47608,19 +48442,17 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_userToken = true && (isSetUserToken());
-      list.add(present_userToken);
-      if (present_userToken)
-        list.add(userToken);
+      hashCode = hashCode * 8191 + ((isSetUserToken()) ? 131071 : 524287);
+      if (isSetUserToken())
+        hashCode = hashCode * 8191 + userToken.hashCode();
 
-      boolean present_lectureId = true && (isSetLectureId());
-      list.add(present_lectureId);
-      if (present_lectureId)
-        list.add(lectureId);
+      hashCode = hashCode * 8191 + ((isSetLectureId()) ? 131071 : 524287);
+      if (isSetLectureId())
+        hashCode = hashCode * 8191 + lectureId.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -47631,7 +48463,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetUserToken()).compareTo(other.isSetUserToken());
+      lastComparison = java.lang.Boolean.compare(isSetUserToken(), other.isSetUserToken());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -47641,7 +48473,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetLectureId()).compareTo(other.isSetLectureId());
+      lastComparison = java.lang.Boolean.compare(isSetLectureId(), other.isSetLectureId());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -47654,21 +48486,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("deleteLecture_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("deleteLecture_args(");
       boolean first = true;
 
       sb.append("userToken:");
@@ -47703,7 +48536,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -47711,13 +48544,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class deleteLecture_argsStandardSchemeFactory implements SchemeFactory {
+    private static class deleteLecture_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public deleteLecture_argsStandardScheme getScheme() {
         return new deleteLecture_argsStandardScheme();
       }
     }
 
-    private static class deleteLecture_argsStandardScheme extends StandardScheme<deleteLecture_args> {
+    private static class deleteLecture_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<deleteLecture_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, deleteLecture_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -47776,18 +48609,18 @@ public class SatelliteServer {
 
     }
 
-    private static class deleteLecture_argsTupleSchemeFactory implements SchemeFactory {
+    private static class deleteLecture_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public deleteLecture_argsTupleScheme getScheme() {
         return new deleteLecture_argsTupleScheme();
       }
     }
 
-    private static class deleteLecture_argsTupleScheme extends TupleScheme<deleteLecture_args> {
+    private static class deleteLecture_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<deleteLecture_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, deleteLecture_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetUserToken()) {
           optionals.set(0);
         }
@@ -47805,8 +48638,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, deleteLecture_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(2);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           struct.userToken = iprot.readString();
           struct.setUserTokenIsSet(true);
@@ -47818,6 +48651,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class deleteLecture_result implements org.apache.thrift.TBase<deleteLecture_result, deleteLecture_result._Fields>, java.io.Serializable, Cloneable, Comparable<deleteLecture_result>   {
@@ -47827,15 +48663,12 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField NOT_FOUND_FIELD_DESC = new org.apache.thrift.protocol.TField("notFound", org.apache.thrift.protocol.TType.STRUCT, (short)2);
     private static final org.apache.thrift.protocol.TField SERVER_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("serverError", org.apache.thrift.protocol.TType.STRUCT, (short)3);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new deleteLecture_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new deleteLecture_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new deleteLecture_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new deleteLecture_resultTupleSchemeFactory();
 
-    public TAuthorizationException authError; // required
-    public TNotFoundException notFound; // required
-    public TInvocationException serverError; // required
+    public @org.apache.thrift.annotation.Nullable TAuthorizationException authError; // required
+    public @org.apache.thrift.annotation.Nullable TNotFoundException notFound; // required
+    public @org.apache.thrift.annotation.Nullable TInvocationException serverError; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -47843,10 +48676,10 @@ public class SatelliteServer {
       NOT_FOUND((short)2, "notFound"),
       SERVER_ERROR((short)3, "serverError");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -47854,6 +48687,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // AUTH_ERROR
@@ -47873,21 +48707,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -47896,22 +48731,22 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.AUTH_ERROR, new org.apache.thrift.meta_data.FieldMetaData("authError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class)));
       tmpMap.put(_Fields.NOT_FOUND, new org.apache.thrift.meta_data.FieldMetaData("notFound", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TNotFoundException.class)));
       tmpMap.put(_Fields.SERVER_ERROR, new org.apache.thrift.meta_data.FieldMetaData("serverError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(deleteLecture_result.class, metaDataMap);
     }
 
@@ -47955,11 +48790,12 @@ public class SatelliteServer {
       this.serverError = null;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TAuthorizationException getAuthError() {
       return this.authError;
     }
 
-    public deleteLecture_result setAuthError(TAuthorizationException authError) {
+    public deleteLecture_result setAuthError(@org.apache.thrift.annotation.Nullable TAuthorizationException authError) {
       this.authError = authError;
       return this;
     }
@@ -47979,11 +48815,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TNotFoundException getNotFound() {
       return this.notFound;
     }
 
-    public deleteLecture_result setNotFound(TNotFoundException notFound) {
+    public deleteLecture_result setNotFound(@org.apache.thrift.annotation.Nullable TNotFoundException notFound) {
       this.notFound = notFound;
       return this;
     }
@@ -48003,11 +48840,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvocationException getServerError() {
       return this.serverError;
     }
 
-    public deleteLecture_result setServerError(TInvocationException serverError) {
+    public deleteLecture_result setServerError(@org.apache.thrift.annotation.Nullable TInvocationException serverError) {
       this.serverError = serverError;
       return this;
     }
@@ -48027,7 +48865,7 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case AUTH_ERROR:
         if (value == null) {
@@ -48056,7 +48894,8 @@ public class SatelliteServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case AUTH_ERROR:
         return getAuthError();
@@ -48068,13 +48907,13 @@ public class SatelliteServer {
         return getServerError();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -48085,13 +48924,11 @@ public class SatelliteServer {
       case SERVER_ERROR:
         return isSetServerError();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof deleteLecture_result)
         return this.equals((deleteLecture_result)that);
       return false;
@@ -48100,6 +48937,8 @@ public class SatelliteServer {
     public boolean equals(deleteLecture_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_authError = true && this.isSetAuthError();
       boolean that_present_authError = true && that.isSetAuthError();
@@ -48133,24 +48972,21 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_authError = true && (isSetAuthError());
-      list.add(present_authError);
-      if (present_authError)
-        list.add(authError);
+      hashCode = hashCode * 8191 + ((isSetAuthError()) ? 131071 : 524287);
+      if (isSetAuthError())
+        hashCode = hashCode * 8191 + authError.hashCode();
 
-      boolean present_notFound = true && (isSetNotFound());
-      list.add(present_notFound);
-      if (present_notFound)
-        list.add(notFound);
+      hashCode = hashCode * 8191 + ((isSetNotFound()) ? 131071 : 524287);
+      if (isSetNotFound())
+        hashCode = hashCode * 8191 + notFound.hashCode();
 
-      boolean present_serverError = true && (isSetServerError());
-      list.add(present_serverError);
-      if (present_serverError)
-        list.add(serverError);
+      hashCode = hashCode * 8191 + ((isSetServerError()) ? 131071 : 524287);
+      if (isSetServerError())
+        hashCode = hashCode * 8191 + serverError.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -48161,7 +48997,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetAuthError()).compareTo(other.isSetAuthError());
+      lastComparison = java.lang.Boolean.compare(isSetAuthError(), other.isSetAuthError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -48171,7 +49007,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetNotFound()).compareTo(other.isSetNotFound());
+      lastComparison = java.lang.Boolean.compare(isSetNotFound(), other.isSetNotFound());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -48181,7 +49017,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetServerError()).compareTo(other.isSetServerError());
+      lastComparison = java.lang.Boolean.compare(isSetServerError(), other.isSetServerError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -48194,21 +49030,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("deleteLecture_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("deleteLecture_result(");
       boolean first = true;
 
       sb.append("authError:");
@@ -48251,7 +49088,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -48259,13 +49096,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class deleteLecture_resultStandardSchemeFactory implements SchemeFactory {
+    private static class deleteLecture_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public deleteLecture_resultStandardScheme getScheme() {
         return new deleteLecture_resultStandardScheme();
       }
     }
 
-    private static class deleteLecture_resultStandardScheme extends StandardScheme<deleteLecture_result> {
+    private static class deleteLecture_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<deleteLecture_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, deleteLecture_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -48340,18 +49177,18 @@ public class SatelliteServer {
 
     }
 
-    private static class deleteLecture_resultTupleSchemeFactory implements SchemeFactory {
+    private static class deleteLecture_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public deleteLecture_resultTupleScheme getScheme() {
         return new deleteLecture_resultTupleScheme();
       }
     }
 
-    private static class deleteLecture_resultTupleScheme extends TupleScheme<deleteLecture_result> {
+    private static class deleteLecture_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<deleteLecture_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, deleteLecture_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetAuthError()) {
           optionals.set(0);
         }
@@ -48375,8 +49212,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, deleteLecture_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(3);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           struct.authError = new TAuthorizationException();
           struct.authError.read(iprot);
@@ -48395,6 +49232,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class writeLecturePermissions_args implements org.apache.thrift.TBase<writeLecturePermissions_args, writeLecturePermissions_args._Fields>, java.io.Serializable, Cloneable, Comparable<writeLecturePermissions_args>   {
@@ -48404,15 +49244,12 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField LECTURE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("lectureId", org.apache.thrift.protocol.TType.STRING, (short)2);
     private static final org.apache.thrift.protocol.TField PERMISSIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("permissions", org.apache.thrift.protocol.TType.MAP, (short)3);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new writeLecturePermissions_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new writeLecturePermissions_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new writeLecturePermissions_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new writeLecturePermissions_argsTupleSchemeFactory();
 
-    public String userToken; // required
-    public String lectureId; // required
-    public Map<String,LecturePermissions> permissions; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String userToken; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String lectureId; // required
+    public @org.apache.thrift.annotation.Nullable java.util.Map<java.lang.String,LecturePermissions> permissions; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -48420,10 +49257,10 @@ public class SatelliteServer {
       LECTURE_ID((short)2, "lectureId"),
       PERMISSIONS((short)3, "permissions");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -48431,6 +49268,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // USER_TOKEN
@@ -48450,21 +49288,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -48473,15 +49312,15 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.USER_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("userToken", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
       tmpMap.put(_Fields.LECTURE_ID, new org.apache.thrift.meta_data.FieldMetaData("lectureId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -48490,7 +49329,7 @@ public class SatelliteServer {
           new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
               new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING              , "UUID"), 
               new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, LecturePermissions.class))));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(writeLecturePermissions_args.class, metaDataMap);
     }
 
@@ -48498,9 +49337,9 @@ public class SatelliteServer {
     }
 
     public writeLecturePermissions_args(
-      String userToken,
-      String lectureId,
-      Map<String,LecturePermissions> permissions)
+      java.lang.String userToken,
+      java.lang.String lectureId,
+      java.util.Map<java.lang.String,LecturePermissions> permissions)
     {
       this();
       this.userToken = userToken;
@@ -48519,13 +49358,13 @@ public class SatelliteServer {
         this.lectureId = other.lectureId;
       }
       if (other.isSetPermissions()) {
-        Map<String,LecturePermissions> __this__permissions = new HashMap<String,LecturePermissions>(other.permissions.size());
-        for (Map.Entry<String, LecturePermissions> other_element : other.permissions.entrySet()) {
+        java.util.Map<java.lang.String,LecturePermissions> __this__permissions = new java.util.HashMap<java.lang.String,LecturePermissions>(other.permissions.size());
+        for (java.util.Map.Entry<java.lang.String, LecturePermissions> other_element : other.permissions.entrySet()) {
 
-          String other_element_key = other_element.getKey();
+          java.lang.String other_element_key = other_element.getKey();
           LecturePermissions other_element_value = other_element.getValue();
 
-          String __this__permissions_copy_key = other_element_key;
+          java.lang.String __this__permissions_copy_key = other_element_key;
 
           LecturePermissions __this__permissions_copy_value = new LecturePermissions(other_element_value);
 
@@ -48546,11 +49385,12 @@ public class SatelliteServer {
       this.permissions = null;
     }
 
-    public String getUserToken() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getUserToken() {
       return this.userToken;
     }
 
-    public writeLecturePermissions_args setUserToken(String userToken) {
+    public writeLecturePermissions_args setUserToken(@org.apache.thrift.annotation.Nullable java.lang.String userToken) {
       this.userToken = userToken;
       return this;
     }
@@ -48570,11 +49410,12 @@ public class SatelliteServer {
       }
     }
 
-    public String getLectureId() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getLectureId() {
       return this.lectureId;
     }
 
-    public writeLecturePermissions_args setLectureId(String lectureId) {
+    public writeLecturePermissions_args setLectureId(@org.apache.thrift.annotation.Nullable java.lang.String lectureId) {
       this.lectureId = lectureId;
       return this;
     }
@@ -48598,18 +49439,19 @@ public class SatelliteServer {
       return (this.permissions == null) ? 0 : this.permissions.size();
     }
 
-    public void putToPermissions(String key, LecturePermissions val) {
+    public void putToPermissions(java.lang.String key, LecturePermissions val) {
       if (this.permissions == null) {
-        this.permissions = new HashMap<String,LecturePermissions>();
+        this.permissions = new java.util.HashMap<java.lang.String,LecturePermissions>();
       }
       this.permissions.put(key, val);
     }
 
-    public Map<String,LecturePermissions> getPermissions() {
+    @org.apache.thrift.annotation.Nullable
+    public java.util.Map<java.lang.String,LecturePermissions> getPermissions() {
       return this.permissions;
     }
 
-    public writeLecturePermissions_args setPermissions(Map<String,LecturePermissions> permissions) {
+    public writeLecturePermissions_args setPermissions(@org.apache.thrift.annotation.Nullable java.util.Map<java.lang.String,LecturePermissions> permissions) {
       this.permissions = permissions;
       return this;
     }
@@ -48629,13 +49471,13 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case USER_TOKEN:
         if (value == null) {
           unsetUserToken();
         } else {
-          setUserToken((String)value);
+          setUserToken((java.lang.String)value);
         }
         break;
 
@@ -48643,7 +49485,7 @@ public class SatelliteServer {
         if (value == null) {
           unsetLectureId();
         } else {
-          setLectureId((String)value);
+          setLectureId((java.lang.String)value);
         }
         break;
 
@@ -48651,14 +49493,15 @@ public class SatelliteServer {
         if (value == null) {
           unsetPermissions();
         } else {
-          setPermissions((Map<String,LecturePermissions>)value);
+          setPermissions((java.util.Map<java.lang.String,LecturePermissions>)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case USER_TOKEN:
         return getUserToken();
@@ -48670,13 +49513,13 @@ public class SatelliteServer {
         return getPermissions();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -48687,13 +49530,11 @@ public class SatelliteServer {
       case PERMISSIONS:
         return isSetPermissions();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof writeLecturePermissions_args)
         return this.equals((writeLecturePermissions_args)that);
       return false;
@@ -48702,6 +49543,8 @@ public class SatelliteServer {
     public boolean equals(writeLecturePermissions_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_userToken = true && this.isSetUserToken();
       boolean that_present_userToken = true && that.isSetUserToken();
@@ -48735,24 +49578,21 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_userToken = true && (isSetUserToken());
-      list.add(present_userToken);
-      if (present_userToken)
-        list.add(userToken);
+      hashCode = hashCode * 8191 + ((isSetUserToken()) ? 131071 : 524287);
+      if (isSetUserToken())
+        hashCode = hashCode * 8191 + userToken.hashCode();
 
-      boolean present_lectureId = true && (isSetLectureId());
-      list.add(present_lectureId);
-      if (present_lectureId)
-        list.add(lectureId);
+      hashCode = hashCode * 8191 + ((isSetLectureId()) ? 131071 : 524287);
+      if (isSetLectureId())
+        hashCode = hashCode * 8191 + lectureId.hashCode();
 
-      boolean present_permissions = true && (isSetPermissions());
-      list.add(present_permissions);
-      if (present_permissions)
-        list.add(permissions);
+      hashCode = hashCode * 8191 + ((isSetPermissions()) ? 131071 : 524287);
+      if (isSetPermissions())
+        hashCode = hashCode * 8191 + permissions.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -48763,7 +49603,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetUserToken()).compareTo(other.isSetUserToken());
+      lastComparison = java.lang.Boolean.compare(isSetUserToken(), other.isSetUserToken());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -48773,7 +49613,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetLectureId()).compareTo(other.isSetLectureId());
+      lastComparison = java.lang.Boolean.compare(isSetLectureId(), other.isSetLectureId());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -48783,7 +49623,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetPermissions()).compareTo(other.isSetPermissions());
+      lastComparison = java.lang.Boolean.compare(isSetPermissions(), other.isSetPermissions());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -48796,21 +49636,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("writeLecturePermissions_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("writeLecturePermissions_args(");
       boolean first = true;
 
       sb.append("userToken:");
@@ -48853,7 +49694,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -48861,13 +49702,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class writeLecturePermissions_argsStandardSchemeFactory implements SchemeFactory {
+    private static class writeLecturePermissions_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public writeLecturePermissions_argsStandardScheme getScheme() {
         return new writeLecturePermissions_argsStandardScheme();
       }
     }
 
-    private static class writeLecturePermissions_argsStandardScheme extends StandardScheme<writeLecturePermissions_args> {
+    private static class writeLecturePermissions_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<writeLecturePermissions_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, writeLecturePermissions_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -48898,16 +49739,16 @@ public class SatelliteServer {
             case 3: // PERMISSIONS
               if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  org.apache.thrift.protocol.TMap _map318 = iprot.readMapBegin();
-                  struct.permissions = new HashMap<String,LecturePermissions>(2*_map318.size);
-                  String _key319;
-                  LecturePermissions _val320;
-                  for (int _i321 = 0; _i321 < _map318.size; ++_i321)
+                  org.apache.thrift.protocol.TMap _map398 = iprot.readMapBegin();
+                  struct.permissions = new java.util.HashMap<java.lang.String,LecturePermissions>(2*_map398.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _key399;
+                  @org.apache.thrift.annotation.Nullable LecturePermissions _val400;
+                  for (int _i401 = 0; _i401 < _map398.size; ++_i401)
                   {
-                    _key319 = iprot.readString();
-                    _val320 = new LecturePermissions();
-                    _val320.read(iprot);
-                    struct.permissions.put(_key319, _val320);
+                    _key399 = iprot.readString();
+                    _val400 = new LecturePermissions();
+                    _val400.read(iprot);
+                    struct.permissions.put(_key399, _val400);
                   }
                   iprot.readMapEnd();
                 }
@@ -48945,10 +49786,10 @@ public class SatelliteServer {
           oprot.writeFieldBegin(PERMISSIONS_FIELD_DESC);
           {
             oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.permissions.size()));
-            for (Map.Entry<String, LecturePermissions> _iter322 : struct.permissions.entrySet())
+            for (java.util.Map.Entry<java.lang.String, LecturePermissions> _iter402 : struct.permissions.entrySet())
             {
-              oprot.writeString(_iter322.getKey());
-              _iter322.getValue().write(oprot);
+              oprot.writeString(_iter402.getKey());
+              _iter402.getValue().write(oprot);
             }
             oprot.writeMapEnd();
           }
@@ -48960,18 +49801,18 @@ public class SatelliteServer {
 
     }
 
-    private static class writeLecturePermissions_argsTupleSchemeFactory implements SchemeFactory {
+    private static class writeLecturePermissions_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public writeLecturePermissions_argsTupleScheme getScheme() {
         return new writeLecturePermissions_argsTupleScheme();
       }
     }
 
-    private static class writeLecturePermissions_argsTupleScheme extends TupleScheme<writeLecturePermissions_args> {
+    private static class writeLecturePermissions_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<writeLecturePermissions_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, writeLecturePermissions_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetUserToken()) {
           optionals.set(0);
         }
@@ -48991,10 +49832,10 @@ public class SatelliteServer {
         if (struct.isSetPermissions()) {
           {
             oprot.writeI32(struct.permissions.size());
-            for (Map.Entry<String, LecturePermissions> _iter323 : struct.permissions.entrySet())
+            for (java.util.Map.Entry<java.lang.String, LecturePermissions> _iter403 : struct.permissions.entrySet())
             {
-              oprot.writeString(_iter323.getKey());
-              _iter323.getValue().write(oprot);
+              oprot.writeString(_iter403.getKey());
+              _iter403.getValue().write(oprot);
             }
           }
         }
@@ -49002,8 +49843,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, writeLecturePermissions_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(3);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           struct.userToken = iprot.readString();
           struct.setUserTokenIsSet(true);
@@ -49014,16 +49855,16 @@ public class SatelliteServer {
         }
         if (incoming.get(2)) {
           {
-            org.apache.thrift.protocol.TMap _map324 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.permissions = new HashMap<String,LecturePermissions>(2*_map324.size);
-            String _key325;
-            LecturePermissions _val326;
-            for (int _i327 = 0; _i327 < _map324.size; ++_i327)
+            org.apache.thrift.protocol.TMap _map404 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT); 
+            struct.permissions = new java.util.HashMap<java.lang.String,LecturePermissions>(2*_map404.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _key405;
+            @org.apache.thrift.annotation.Nullable LecturePermissions _val406;
+            for (int _i407 = 0; _i407 < _map404.size; ++_i407)
             {
-              _key325 = iprot.readString();
-              _val326 = new LecturePermissions();
-              _val326.read(iprot);
-              struct.permissions.put(_key325, _val326);
+              _key405 = iprot.readString();
+              _val406 = new LecturePermissions();
+              _val406.read(iprot);
+              struct.permissions.put(_key405, _val406);
             }
           }
           struct.setPermissionsIsSet(true);
@@ -49031,6 +49872,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class writeLecturePermissions_result implements org.apache.thrift.TBase<writeLecturePermissions_result, writeLecturePermissions_result._Fields>, java.io.Serializable, Cloneable, Comparable<writeLecturePermissions_result>   {
@@ -49040,15 +49884,12 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField NOT_FOUND_FIELD_DESC = new org.apache.thrift.protocol.TField("notFound", org.apache.thrift.protocol.TType.STRUCT, (short)2);
     private static final org.apache.thrift.protocol.TField SERVER_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("serverError", org.apache.thrift.protocol.TType.STRUCT, (short)3);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new writeLecturePermissions_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new writeLecturePermissions_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new writeLecturePermissions_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new writeLecturePermissions_resultTupleSchemeFactory();
 
-    public TAuthorizationException authError; // required
-    public TNotFoundException notFound; // required
-    public TInvocationException serverError; // required
+    public @org.apache.thrift.annotation.Nullable TAuthorizationException authError; // required
+    public @org.apache.thrift.annotation.Nullable TNotFoundException notFound; // required
+    public @org.apache.thrift.annotation.Nullable TInvocationException serverError; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -49056,10 +49897,10 @@ public class SatelliteServer {
       NOT_FOUND((short)2, "notFound"),
       SERVER_ERROR((short)3, "serverError");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -49067,6 +49908,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // AUTH_ERROR
@@ -49086,21 +49928,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -49109,22 +49952,22 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.AUTH_ERROR, new org.apache.thrift.meta_data.FieldMetaData("authError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class)));
       tmpMap.put(_Fields.NOT_FOUND, new org.apache.thrift.meta_data.FieldMetaData("notFound", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TNotFoundException.class)));
       tmpMap.put(_Fields.SERVER_ERROR, new org.apache.thrift.meta_data.FieldMetaData("serverError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(writeLecturePermissions_result.class, metaDataMap);
     }
 
@@ -49168,11 +50011,12 @@ public class SatelliteServer {
       this.serverError = null;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TAuthorizationException getAuthError() {
       return this.authError;
     }
 
-    public writeLecturePermissions_result setAuthError(TAuthorizationException authError) {
+    public writeLecturePermissions_result setAuthError(@org.apache.thrift.annotation.Nullable TAuthorizationException authError) {
       this.authError = authError;
       return this;
     }
@@ -49192,11 +50036,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TNotFoundException getNotFound() {
       return this.notFound;
     }
 
-    public writeLecturePermissions_result setNotFound(TNotFoundException notFound) {
+    public writeLecturePermissions_result setNotFound(@org.apache.thrift.annotation.Nullable TNotFoundException notFound) {
       this.notFound = notFound;
       return this;
     }
@@ -49216,11 +50061,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvocationException getServerError() {
       return this.serverError;
     }
 
-    public writeLecturePermissions_result setServerError(TInvocationException serverError) {
+    public writeLecturePermissions_result setServerError(@org.apache.thrift.annotation.Nullable TInvocationException serverError) {
       this.serverError = serverError;
       return this;
     }
@@ -49240,7 +50086,7 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case AUTH_ERROR:
         if (value == null) {
@@ -49269,7 +50115,8 @@ public class SatelliteServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case AUTH_ERROR:
         return getAuthError();
@@ -49281,13 +50128,13 @@ public class SatelliteServer {
         return getServerError();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -49298,13 +50145,11 @@ public class SatelliteServer {
       case SERVER_ERROR:
         return isSetServerError();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof writeLecturePermissions_result)
         return this.equals((writeLecturePermissions_result)that);
       return false;
@@ -49313,6 +50158,8 @@ public class SatelliteServer {
     public boolean equals(writeLecturePermissions_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_authError = true && this.isSetAuthError();
       boolean that_present_authError = true && that.isSetAuthError();
@@ -49346,24 +50193,21 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_authError = true && (isSetAuthError());
-      list.add(present_authError);
-      if (present_authError)
-        list.add(authError);
+      hashCode = hashCode * 8191 + ((isSetAuthError()) ? 131071 : 524287);
+      if (isSetAuthError())
+        hashCode = hashCode * 8191 + authError.hashCode();
 
-      boolean present_notFound = true && (isSetNotFound());
-      list.add(present_notFound);
-      if (present_notFound)
-        list.add(notFound);
+      hashCode = hashCode * 8191 + ((isSetNotFound()) ? 131071 : 524287);
+      if (isSetNotFound())
+        hashCode = hashCode * 8191 + notFound.hashCode();
 
-      boolean present_serverError = true && (isSetServerError());
-      list.add(present_serverError);
-      if (present_serverError)
-        list.add(serverError);
+      hashCode = hashCode * 8191 + ((isSetServerError()) ? 131071 : 524287);
+      if (isSetServerError())
+        hashCode = hashCode * 8191 + serverError.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -49374,7 +50218,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetAuthError()).compareTo(other.isSetAuthError());
+      lastComparison = java.lang.Boolean.compare(isSetAuthError(), other.isSetAuthError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -49384,7 +50228,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetNotFound()).compareTo(other.isSetNotFound());
+      lastComparison = java.lang.Boolean.compare(isSetNotFound(), other.isSetNotFound());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -49394,7 +50238,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetServerError()).compareTo(other.isSetServerError());
+      lastComparison = java.lang.Boolean.compare(isSetServerError(), other.isSetServerError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -49407,21 +50251,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("writeLecturePermissions_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("writeLecturePermissions_result(");
       boolean first = true;
 
       sb.append("authError:");
@@ -49464,7 +50309,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -49472,13 +50317,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class writeLecturePermissions_resultStandardSchemeFactory implements SchemeFactory {
+    private static class writeLecturePermissions_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public writeLecturePermissions_resultStandardScheme getScheme() {
         return new writeLecturePermissions_resultStandardScheme();
       }
     }
 
-    private static class writeLecturePermissions_resultStandardScheme extends StandardScheme<writeLecturePermissions_result> {
+    private static class writeLecturePermissions_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<writeLecturePermissions_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, writeLecturePermissions_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -49553,18 +50398,18 @@ public class SatelliteServer {
 
     }
 
-    private static class writeLecturePermissions_resultTupleSchemeFactory implements SchemeFactory {
+    private static class writeLecturePermissions_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public writeLecturePermissions_resultTupleScheme getScheme() {
         return new writeLecturePermissions_resultTupleScheme();
       }
     }
 
-    private static class writeLecturePermissions_resultTupleScheme extends TupleScheme<writeLecturePermissions_result> {
+    private static class writeLecturePermissions_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<writeLecturePermissions_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, writeLecturePermissions_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetAuthError()) {
           optionals.set(0);
         }
@@ -49588,8 +50433,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, writeLecturePermissions_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(3);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           struct.authError = new TAuthorizationException();
           struct.authError.read(iprot);
@@ -49608,6 +50453,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getLecturePermissions_args implements org.apache.thrift.TBase<getLecturePermissions_args, getLecturePermissions_args._Fields>, java.io.Serializable, Cloneable, Comparable<getLecturePermissions_args>   {
@@ -49616,24 +50464,21 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField USER_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("userToken", org.apache.thrift.protocol.TType.STRING, (short)1);
     private static final org.apache.thrift.protocol.TField LECTURE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("lectureId", org.apache.thrift.protocol.TType.STRING, (short)2);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getLecturePermissions_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getLecturePermissions_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getLecturePermissions_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getLecturePermissions_argsTupleSchemeFactory();
 
-    public String userToken; // required
-    public String lectureId; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String userToken; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String lectureId; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       USER_TOKEN((short)1, "userToken"),
       LECTURE_ID((short)2, "lectureId");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -49641,6 +50486,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // USER_TOKEN
@@ -49658,21 +50504,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -49681,20 +50528,20 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.USER_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("userToken", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
       tmpMap.put(_Fields.LECTURE_ID, new org.apache.thrift.meta_data.FieldMetaData("lectureId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "UUID")));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getLecturePermissions_args.class, metaDataMap);
     }
 
@@ -49702,8 +50549,8 @@ public class SatelliteServer {
     }
 
     public getLecturePermissions_args(
-      String userToken,
-      String lectureId)
+      java.lang.String userToken,
+      java.lang.String lectureId)
     {
       this();
       this.userToken = userToken;
@@ -49732,11 +50579,12 @@ public class SatelliteServer {
       this.lectureId = null;
     }
 
-    public String getUserToken() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getUserToken() {
       return this.userToken;
     }
 
-    public getLecturePermissions_args setUserToken(String userToken) {
+    public getLecturePermissions_args setUserToken(@org.apache.thrift.annotation.Nullable java.lang.String userToken) {
       this.userToken = userToken;
       return this;
     }
@@ -49756,11 +50604,12 @@ public class SatelliteServer {
       }
     }
 
-    public String getLectureId() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getLectureId() {
       return this.lectureId;
     }
 
-    public getLecturePermissions_args setLectureId(String lectureId) {
+    public getLecturePermissions_args setLectureId(@org.apache.thrift.annotation.Nullable java.lang.String lectureId) {
       this.lectureId = lectureId;
       return this;
     }
@@ -49780,13 +50629,13 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case USER_TOKEN:
         if (value == null) {
           unsetUserToken();
         } else {
-          setUserToken((String)value);
+          setUserToken((java.lang.String)value);
         }
         break;
 
@@ -49794,14 +50643,15 @@ public class SatelliteServer {
         if (value == null) {
           unsetLectureId();
         } else {
-          setLectureId((String)value);
+          setLectureId((java.lang.String)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case USER_TOKEN:
         return getUserToken();
@@ -49810,13 +50660,13 @@ public class SatelliteServer {
         return getLectureId();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -49825,13 +50675,11 @@ public class SatelliteServer {
       case LECTURE_ID:
         return isSetLectureId();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getLecturePermissions_args)
         return this.equals((getLecturePermissions_args)that);
       return false;
@@ -49840,6 +50688,8 @@ public class SatelliteServer {
     public boolean equals(getLecturePermissions_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_userToken = true && this.isSetUserToken();
       boolean that_present_userToken = true && that.isSetUserToken();
@@ -49864,19 +50714,17 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_userToken = true && (isSetUserToken());
-      list.add(present_userToken);
-      if (present_userToken)
-        list.add(userToken);
+      hashCode = hashCode * 8191 + ((isSetUserToken()) ? 131071 : 524287);
+      if (isSetUserToken())
+        hashCode = hashCode * 8191 + userToken.hashCode();
 
-      boolean present_lectureId = true && (isSetLectureId());
-      list.add(present_lectureId);
-      if (present_lectureId)
-        list.add(lectureId);
+      hashCode = hashCode * 8191 + ((isSetLectureId()) ? 131071 : 524287);
+      if (isSetLectureId())
+        hashCode = hashCode * 8191 + lectureId.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -49887,7 +50735,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetUserToken()).compareTo(other.isSetUserToken());
+      lastComparison = java.lang.Boolean.compare(isSetUserToken(), other.isSetUserToken());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -49897,7 +50745,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetLectureId()).compareTo(other.isSetLectureId());
+      lastComparison = java.lang.Boolean.compare(isSetLectureId(), other.isSetLectureId());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -49910,21 +50758,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getLecturePermissions_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getLecturePermissions_args(");
       boolean first = true;
 
       sb.append("userToken:");
@@ -49959,7 +50808,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -49967,13 +50816,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class getLecturePermissions_argsStandardSchemeFactory implements SchemeFactory {
+    private static class getLecturePermissions_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getLecturePermissions_argsStandardScheme getScheme() {
         return new getLecturePermissions_argsStandardScheme();
       }
     }
 
-    private static class getLecturePermissions_argsStandardScheme extends StandardScheme<getLecturePermissions_args> {
+    private static class getLecturePermissions_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<getLecturePermissions_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getLecturePermissions_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -50032,18 +50881,18 @@ public class SatelliteServer {
 
     }
 
-    private static class getLecturePermissions_argsTupleSchemeFactory implements SchemeFactory {
+    private static class getLecturePermissions_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getLecturePermissions_argsTupleScheme getScheme() {
         return new getLecturePermissions_argsTupleScheme();
       }
     }
 
-    private static class getLecturePermissions_argsTupleScheme extends TupleScheme<getLecturePermissions_args> {
+    private static class getLecturePermissions_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<getLecturePermissions_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getLecturePermissions_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetUserToken()) {
           optionals.set(0);
         }
@@ -50061,8 +50910,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getLecturePermissions_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(2);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           struct.userToken = iprot.readString();
           struct.setUserTokenIsSet(true);
@@ -50074,6 +50923,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getLecturePermissions_result implements org.apache.thrift.TBase<getLecturePermissions_result, getLecturePermissions_result._Fields>, java.io.Serializable, Cloneable, Comparable<getLecturePermissions_result>   {
@@ -50084,16 +50936,13 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField NOT_FOUND_FIELD_DESC = new org.apache.thrift.protocol.TField("notFound", org.apache.thrift.protocol.TType.STRUCT, (short)2);
     private static final org.apache.thrift.protocol.TField SERVER_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("serverError", org.apache.thrift.protocol.TType.STRUCT, (short)3);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getLecturePermissions_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getLecturePermissions_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getLecturePermissions_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getLecturePermissions_resultTupleSchemeFactory();
 
-    public Map<String,LecturePermissions> success; // required
-    public TAuthorizationException authError; // required
-    public TNotFoundException notFound; // required
-    public TInvocationException serverError; // required
+    public @org.apache.thrift.annotation.Nullable java.util.Map<java.lang.String,LecturePermissions> success; // required
+    public @org.apache.thrift.annotation.Nullable TAuthorizationException authError; // required
+    public @org.apache.thrift.annotation.Nullable TNotFoundException notFound; // required
+    public @org.apache.thrift.annotation.Nullable TInvocationException serverError; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -50102,10 +50951,10 @@ public class SatelliteServer {
       NOT_FOUND((short)2, "notFound"),
       SERVER_ERROR((short)3, "serverError");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -50113,6 +50962,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
@@ -50134,21 +50984,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -50157,26 +51008,26 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
               new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING              , "UUID"), 
               new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, LecturePermissions.class))));
       tmpMap.put(_Fields.AUTH_ERROR, new org.apache.thrift.meta_data.FieldMetaData("authError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class)));
       tmpMap.put(_Fields.NOT_FOUND, new org.apache.thrift.meta_data.FieldMetaData("notFound", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TNotFoundException.class)));
       tmpMap.put(_Fields.SERVER_ERROR, new org.apache.thrift.meta_data.FieldMetaData("serverError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getLecturePermissions_result.class, metaDataMap);
     }
 
@@ -50184,7 +51035,7 @@ public class SatelliteServer {
     }
 
     public getLecturePermissions_result(
-      Map<String,LecturePermissions> success,
+      java.util.Map<java.lang.String,LecturePermissions> success,
       TAuthorizationException authError,
       TNotFoundException notFound,
       TInvocationException serverError)
@@ -50201,13 +51052,13 @@ public class SatelliteServer {
      */
     public getLecturePermissions_result(getLecturePermissions_result other) {
       if (other.isSetSuccess()) {
-        Map<String,LecturePermissions> __this__success = new HashMap<String,LecturePermissions>(other.success.size());
-        for (Map.Entry<String, LecturePermissions> other_element : other.success.entrySet()) {
+        java.util.Map<java.lang.String,LecturePermissions> __this__success = new java.util.HashMap<java.lang.String,LecturePermissions>(other.success.size());
+        for (java.util.Map.Entry<java.lang.String, LecturePermissions> other_element : other.success.entrySet()) {
 
-          String other_element_key = other_element.getKey();
+          java.lang.String other_element_key = other_element.getKey();
           LecturePermissions other_element_value = other_element.getValue();
 
-          String __this__success_copy_key = other_element_key;
+          java.lang.String __this__success_copy_key = other_element_key;
 
           LecturePermissions __this__success_copy_value = new LecturePermissions(other_element_value);
 
@@ -50242,18 +51093,19 @@ public class SatelliteServer {
       return (this.success == null) ? 0 : this.success.size();
     }
 
-    public void putToSuccess(String key, LecturePermissions val) {
+    public void putToSuccess(java.lang.String key, LecturePermissions val) {
       if (this.success == null) {
-        this.success = new HashMap<String,LecturePermissions>();
+        this.success = new java.util.HashMap<java.lang.String,LecturePermissions>();
       }
       this.success.put(key, val);
     }
 
-    public Map<String,LecturePermissions> getSuccess() {
+    @org.apache.thrift.annotation.Nullable
+    public java.util.Map<java.lang.String,LecturePermissions> getSuccess() {
       return this.success;
     }
 
-    public getLecturePermissions_result setSuccess(Map<String,LecturePermissions> success) {
+    public getLecturePermissions_result setSuccess(@org.apache.thrift.annotation.Nullable java.util.Map<java.lang.String,LecturePermissions> success) {
       this.success = success;
       return this;
     }
@@ -50273,11 +51125,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TAuthorizationException getAuthError() {
       return this.authError;
     }
 
-    public getLecturePermissions_result setAuthError(TAuthorizationException authError) {
+    public getLecturePermissions_result setAuthError(@org.apache.thrift.annotation.Nullable TAuthorizationException authError) {
       this.authError = authError;
       return this;
     }
@@ -50297,11 +51150,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TNotFoundException getNotFound() {
       return this.notFound;
     }
 
-    public getLecturePermissions_result setNotFound(TNotFoundException notFound) {
+    public getLecturePermissions_result setNotFound(@org.apache.thrift.annotation.Nullable TNotFoundException notFound) {
       this.notFound = notFound;
       return this;
     }
@@ -50321,11 +51175,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvocationException getServerError() {
       return this.serverError;
     }
 
-    public getLecturePermissions_result setServerError(TInvocationException serverError) {
+    public getLecturePermissions_result setServerError(@org.apache.thrift.annotation.Nullable TInvocationException serverError) {
       this.serverError = serverError;
       return this;
     }
@@ -50345,13 +51200,13 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
           unsetSuccess();
         } else {
-          setSuccess((Map<String,LecturePermissions>)value);
+          setSuccess((java.util.Map<java.lang.String,LecturePermissions>)value);
         }
         break;
 
@@ -50382,7 +51237,8 @@ public class SatelliteServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
         return getSuccess();
@@ -50397,13 +51253,13 @@ public class SatelliteServer {
         return getServerError();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -50416,13 +51272,11 @@ public class SatelliteServer {
       case SERVER_ERROR:
         return isSetServerError();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getLecturePermissions_result)
         return this.equals((getLecturePermissions_result)that);
       return false;
@@ -50431,6 +51285,8 @@ public class SatelliteServer {
     public boolean equals(getLecturePermissions_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_success = true && this.isSetSuccess();
       boolean that_present_success = true && that.isSetSuccess();
@@ -50473,29 +51329,25 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
 
-      boolean present_authError = true && (isSetAuthError());
-      list.add(present_authError);
-      if (present_authError)
-        list.add(authError);
+      hashCode = hashCode * 8191 + ((isSetAuthError()) ? 131071 : 524287);
+      if (isSetAuthError())
+        hashCode = hashCode * 8191 + authError.hashCode();
 
-      boolean present_notFound = true && (isSetNotFound());
-      list.add(present_notFound);
-      if (present_notFound)
-        list.add(notFound);
+      hashCode = hashCode * 8191 + ((isSetNotFound()) ? 131071 : 524287);
+      if (isSetNotFound())
+        hashCode = hashCode * 8191 + notFound.hashCode();
 
-      boolean present_serverError = true && (isSetServerError());
-      list.add(present_serverError);
-      if (present_serverError)
-        list.add(serverError);
+      hashCode = hashCode * 8191 + ((isSetServerError()) ? 131071 : 524287);
+      if (isSetServerError())
+        hashCode = hashCode * 8191 + serverError.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -50506,7 +51358,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -50516,7 +51368,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetAuthError()).compareTo(other.isSetAuthError());
+      lastComparison = java.lang.Boolean.compare(isSetAuthError(), other.isSetAuthError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -50526,7 +51378,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetNotFound()).compareTo(other.isSetNotFound());
+      lastComparison = java.lang.Boolean.compare(isSetNotFound(), other.isSetNotFound());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -50536,7 +51388,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetServerError()).compareTo(other.isSetServerError());
+      lastComparison = java.lang.Boolean.compare(isSetServerError(), other.isSetServerError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -50549,21 +51401,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getLecturePermissions_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getLecturePermissions_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -50614,7 +51467,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -50622,13 +51475,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class getLecturePermissions_resultStandardSchemeFactory implements SchemeFactory {
+    private static class getLecturePermissions_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getLecturePermissions_resultStandardScheme getScheme() {
         return new getLecturePermissions_resultStandardScheme();
       }
     }
 
-    private static class getLecturePermissions_resultStandardScheme extends StandardScheme<getLecturePermissions_result> {
+    private static class getLecturePermissions_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<getLecturePermissions_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getLecturePermissions_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -50643,16 +51496,16 @@ public class SatelliteServer {
             case 0: // SUCCESS
               if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
                 {
-                  org.apache.thrift.protocol.TMap _map328 = iprot.readMapBegin();
-                  struct.success = new HashMap<String,LecturePermissions>(2*_map328.size);
-                  String _key329;
-                  LecturePermissions _val330;
-                  for (int _i331 = 0; _i331 < _map328.size; ++_i331)
+                  org.apache.thrift.protocol.TMap _map408 = iprot.readMapBegin();
+                  struct.success = new java.util.HashMap<java.lang.String,LecturePermissions>(2*_map408.size);
+                  @org.apache.thrift.annotation.Nullable java.lang.String _key409;
+                  @org.apache.thrift.annotation.Nullable LecturePermissions _val410;
+                  for (int _i411 = 0; _i411 < _map408.size; ++_i411)
                   {
-                    _key329 = iprot.readString();
-                    _val330 = new LecturePermissions();
-                    _val330.read(iprot);
-                    struct.success.put(_key329, _val330);
+                    _key409 = iprot.readString();
+                    _val410 = new LecturePermissions();
+                    _val410.read(iprot);
+                    struct.success.put(_key409, _val410);
                   }
                   iprot.readMapEnd();
                 }
@@ -50707,10 +51560,10 @@ public class SatelliteServer {
           oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
           {
             oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.success.size()));
-            for (Map.Entry<String, LecturePermissions> _iter332 : struct.success.entrySet())
+            for (java.util.Map.Entry<java.lang.String, LecturePermissions> _iter412 : struct.success.entrySet())
             {
-              oprot.writeString(_iter332.getKey());
-              _iter332.getValue().write(oprot);
+              oprot.writeString(_iter412.getKey());
+              _iter412.getValue().write(oprot);
             }
             oprot.writeMapEnd();
           }
@@ -50737,18 +51590,18 @@ public class SatelliteServer {
 
     }
 
-    private static class getLecturePermissions_resultTupleSchemeFactory implements SchemeFactory {
+    private static class getLecturePermissions_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getLecturePermissions_resultTupleScheme getScheme() {
         return new getLecturePermissions_resultTupleScheme();
       }
     }
 
-    private static class getLecturePermissions_resultTupleScheme extends TupleScheme<getLecturePermissions_result> {
+    private static class getLecturePermissions_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<getLecturePermissions_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getLecturePermissions_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
           optionals.set(0);
         }
@@ -50765,10 +51618,10 @@ public class SatelliteServer {
         if (struct.isSetSuccess()) {
           {
             oprot.writeI32(struct.success.size());
-            for (Map.Entry<String, LecturePermissions> _iter333 : struct.success.entrySet())
+            for (java.util.Map.Entry<java.lang.String, LecturePermissions> _iter413 : struct.success.entrySet())
             {
-              oprot.writeString(_iter333.getKey());
-              _iter333.getValue().write(oprot);
+              oprot.writeString(_iter413.getKey());
+              _iter413.getValue().write(oprot);
             }
           }
         }
@@ -50785,20 +51638,20 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getLecturePermissions_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(4);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(4);
         if (incoming.get(0)) {
           {
-            org.apache.thrift.protocol.TMap _map334 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-            struct.success = new HashMap<String,LecturePermissions>(2*_map334.size);
-            String _key335;
-            LecturePermissions _val336;
-            for (int _i337 = 0; _i337 < _map334.size; ++_i337)
+            org.apache.thrift.protocol.TMap _map414 = iprot.readMapBegin(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT); 
+            struct.success = new java.util.HashMap<java.lang.String,LecturePermissions>(2*_map414.size);
+            @org.apache.thrift.annotation.Nullable java.lang.String _key415;
+            @org.apache.thrift.annotation.Nullable LecturePermissions _val416;
+            for (int _i417 = 0; _i417 < _map414.size; ++_i417)
             {
-              _key335 = iprot.readString();
-              _val336 = new LecturePermissions();
-              _val336.read(iprot);
-              struct.success.put(_key335, _val336);
+              _key415 = iprot.readString();
+              _val416 = new LecturePermissions();
+              _val416.read(iprot);
+              struct.success.put(_key415, _val416);
             }
           }
           struct.setSuccessIsSet(true);
@@ -50821,6 +51674,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class setLectureOwner_args implements org.apache.thrift.TBase<setLectureOwner_args, setLectureOwner_args._Fields>, java.io.Serializable, Cloneable, Comparable<setLectureOwner_args>   {
@@ -50830,15 +51686,12 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField LECTURE_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("lectureId", org.apache.thrift.protocol.TType.STRING, (short)2);
     private static final org.apache.thrift.protocol.TField NEW_OWNER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("newOwnerId", org.apache.thrift.protocol.TType.STRING, (short)3);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new setLectureOwner_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new setLectureOwner_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setLectureOwner_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setLectureOwner_argsTupleSchemeFactory();
 
-    public String userToken; // required
-    public String lectureId; // required
-    public String newOwnerId; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String userToken; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String lectureId; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String newOwnerId; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -50846,10 +51699,10 @@ public class SatelliteServer {
       LECTURE_ID((short)2, "lectureId"),
       NEW_OWNER_ID((short)3, "newOwnerId");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -50857,6 +51710,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // USER_TOKEN
@@ -50876,21 +51730,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -50899,22 +51754,22 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.USER_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("userToken", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
       tmpMap.put(_Fields.LECTURE_ID, new org.apache.thrift.meta_data.FieldMetaData("lectureId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "UUID")));
       tmpMap.put(_Fields.NEW_OWNER_ID, new org.apache.thrift.meta_data.FieldMetaData("newOwnerId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "UUID")));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setLectureOwner_args.class, metaDataMap);
     }
 
@@ -50922,9 +51777,9 @@ public class SatelliteServer {
     }
 
     public setLectureOwner_args(
-      String userToken,
-      String lectureId,
-      String newOwnerId)
+      java.lang.String userToken,
+      java.lang.String lectureId,
+      java.lang.String newOwnerId)
     {
       this();
       this.userToken = userToken;
@@ -50958,11 +51813,12 @@ public class SatelliteServer {
       this.newOwnerId = null;
     }
 
-    public String getUserToken() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getUserToken() {
       return this.userToken;
     }
 
-    public setLectureOwner_args setUserToken(String userToken) {
+    public setLectureOwner_args setUserToken(@org.apache.thrift.annotation.Nullable java.lang.String userToken) {
       this.userToken = userToken;
       return this;
     }
@@ -50982,11 +51838,12 @@ public class SatelliteServer {
       }
     }
 
-    public String getLectureId() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getLectureId() {
       return this.lectureId;
     }
 
-    public setLectureOwner_args setLectureId(String lectureId) {
+    public setLectureOwner_args setLectureId(@org.apache.thrift.annotation.Nullable java.lang.String lectureId) {
       this.lectureId = lectureId;
       return this;
     }
@@ -51006,11 +51863,12 @@ public class SatelliteServer {
       }
     }
 
-    public String getNewOwnerId() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getNewOwnerId() {
       return this.newOwnerId;
     }
 
-    public setLectureOwner_args setNewOwnerId(String newOwnerId) {
+    public setLectureOwner_args setNewOwnerId(@org.apache.thrift.annotation.Nullable java.lang.String newOwnerId) {
       this.newOwnerId = newOwnerId;
       return this;
     }
@@ -51030,13 +51888,13 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case USER_TOKEN:
         if (value == null) {
           unsetUserToken();
         } else {
-          setUserToken((String)value);
+          setUserToken((java.lang.String)value);
         }
         break;
 
@@ -51044,7 +51902,7 @@ public class SatelliteServer {
         if (value == null) {
           unsetLectureId();
         } else {
-          setLectureId((String)value);
+          setLectureId((java.lang.String)value);
         }
         break;
 
@@ -51052,14 +51910,15 @@ public class SatelliteServer {
         if (value == null) {
           unsetNewOwnerId();
         } else {
-          setNewOwnerId((String)value);
+          setNewOwnerId((java.lang.String)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case USER_TOKEN:
         return getUserToken();
@@ -51071,13 +51930,13 @@ public class SatelliteServer {
         return getNewOwnerId();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -51088,13 +51947,11 @@ public class SatelliteServer {
       case NEW_OWNER_ID:
         return isSetNewOwnerId();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof setLectureOwner_args)
         return this.equals((setLectureOwner_args)that);
       return false;
@@ -51103,6 +51960,8 @@ public class SatelliteServer {
     public boolean equals(setLectureOwner_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_userToken = true && this.isSetUserToken();
       boolean that_present_userToken = true && that.isSetUserToken();
@@ -51136,24 +51995,21 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_userToken = true && (isSetUserToken());
-      list.add(present_userToken);
-      if (present_userToken)
-        list.add(userToken);
+      hashCode = hashCode * 8191 + ((isSetUserToken()) ? 131071 : 524287);
+      if (isSetUserToken())
+        hashCode = hashCode * 8191 + userToken.hashCode();
 
-      boolean present_lectureId = true && (isSetLectureId());
-      list.add(present_lectureId);
-      if (present_lectureId)
-        list.add(lectureId);
+      hashCode = hashCode * 8191 + ((isSetLectureId()) ? 131071 : 524287);
+      if (isSetLectureId())
+        hashCode = hashCode * 8191 + lectureId.hashCode();
 
-      boolean present_newOwnerId = true && (isSetNewOwnerId());
-      list.add(present_newOwnerId);
-      if (present_newOwnerId)
-        list.add(newOwnerId);
+      hashCode = hashCode * 8191 + ((isSetNewOwnerId()) ? 131071 : 524287);
+      if (isSetNewOwnerId())
+        hashCode = hashCode * 8191 + newOwnerId.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -51164,7 +52020,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetUserToken()).compareTo(other.isSetUserToken());
+      lastComparison = java.lang.Boolean.compare(isSetUserToken(), other.isSetUserToken());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -51174,7 +52030,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetLectureId()).compareTo(other.isSetLectureId());
+      lastComparison = java.lang.Boolean.compare(isSetLectureId(), other.isSetLectureId());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -51184,7 +52040,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetNewOwnerId()).compareTo(other.isSetNewOwnerId());
+      lastComparison = java.lang.Boolean.compare(isSetNewOwnerId(), other.isSetNewOwnerId());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -51197,21 +52053,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("setLectureOwner_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("setLectureOwner_args(");
       boolean first = true;
 
       sb.append("userToken:");
@@ -51254,7 +52111,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -51262,13 +52119,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class setLectureOwner_argsStandardSchemeFactory implements SchemeFactory {
+    private static class setLectureOwner_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public setLectureOwner_argsStandardScheme getScheme() {
         return new setLectureOwner_argsStandardScheme();
       }
     }
 
-    private static class setLectureOwner_argsStandardScheme extends StandardScheme<setLectureOwner_args> {
+    private static class setLectureOwner_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<setLectureOwner_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, setLectureOwner_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -51340,18 +52197,18 @@ public class SatelliteServer {
 
     }
 
-    private static class setLectureOwner_argsTupleSchemeFactory implements SchemeFactory {
+    private static class setLectureOwner_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public setLectureOwner_argsTupleScheme getScheme() {
         return new setLectureOwner_argsTupleScheme();
       }
     }
 
-    private static class setLectureOwner_argsTupleScheme extends TupleScheme<setLectureOwner_args> {
+    private static class setLectureOwner_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<setLectureOwner_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, setLectureOwner_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetUserToken()) {
           optionals.set(0);
         }
@@ -51375,8 +52232,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, setLectureOwner_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(3);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           struct.userToken = iprot.readString();
           struct.setUserTokenIsSet(true);
@@ -51392,6 +52249,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class setLectureOwner_result implements org.apache.thrift.TBase<setLectureOwner_result, setLectureOwner_result._Fields>, java.io.Serializable, Cloneable, Comparable<setLectureOwner_result>   {
@@ -51401,15 +52261,12 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField NOT_FOUND_FIELD_DESC = new org.apache.thrift.protocol.TField("notFound", org.apache.thrift.protocol.TType.STRUCT, (short)2);
     private static final org.apache.thrift.protocol.TField SERVER_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("serverError", org.apache.thrift.protocol.TType.STRUCT, (short)3);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new setLectureOwner_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new setLectureOwner_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new setLectureOwner_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new setLectureOwner_resultTupleSchemeFactory();
 
-    public TAuthorizationException authError; // required
-    public TNotFoundException notFound; // required
-    public TInvocationException serverError; // required
+    public @org.apache.thrift.annotation.Nullable TAuthorizationException authError; // required
+    public @org.apache.thrift.annotation.Nullable TNotFoundException notFound; // required
+    public @org.apache.thrift.annotation.Nullable TInvocationException serverError; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -51417,10 +52274,10 @@ public class SatelliteServer {
       NOT_FOUND((short)2, "notFound"),
       SERVER_ERROR((short)3, "serverError");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -51428,6 +52285,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // AUTH_ERROR
@@ -51447,21 +52305,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -51470,22 +52329,22 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.AUTH_ERROR, new org.apache.thrift.meta_data.FieldMetaData("authError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class)));
       tmpMap.put(_Fields.NOT_FOUND, new org.apache.thrift.meta_data.FieldMetaData("notFound", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TNotFoundException.class)));
       tmpMap.put(_Fields.SERVER_ERROR, new org.apache.thrift.meta_data.FieldMetaData("serverError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setLectureOwner_result.class, metaDataMap);
     }
 
@@ -51529,11 +52388,12 @@ public class SatelliteServer {
       this.serverError = null;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TAuthorizationException getAuthError() {
       return this.authError;
     }
 
-    public setLectureOwner_result setAuthError(TAuthorizationException authError) {
+    public setLectureOwner_result setAuthError(@org.apache.thrift.annotation.Nullable TAuthorizationException authError) {
       this.authError = authError;
       return this;
     }
@@ -51553,11 +52413,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TNotFoundException getNotFound() {
       return this.notFound;
     }
 
-    public setLectureOwner_result setNotFound(TNotFoundException notFound) {
+    public setLectureOwner_result setNotFound(@org.apache.thrift.annotation.Nullable TNotFoundException notFound) {
       this.notFound = notFound;
       return this;
     }
@@ -51577,11 +52438,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvocationException getServerError() {
       return this.serverError;
     }
 
-    public setLectureOwner_result setServerError(TInvocationException serverError) {
+    public setLectureOwner_result setServerError(@org.apache.thrift.annotation.Nullable TInvocationException serverError) {
       this.serverError = serverError;
       return this;
     }
@@ -51601,7 +52463,7 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case AUTH_ERROR:
         if (value == null) {
@@ -51630,7 +52492,8 @@ public class SatelliteServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case AUTH_ERROR:
         return getAuthError();
@@ -51642,13 +52505,13 @@ public class SatelliteServer {
         return getServerError();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -51659,13 +52522,11 @@ public class SatelliteServer {
       case SERVER_ERROR:
         return isSetServerError();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof setLectureOwner_result)
         return this.equals((setLectureOwner_result)that);
       return false;
@@ -51674,6 +52535,8 @@ public class SatelliteServer {
     public boolean equals(setLectureOwner_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_authError = true && this.isSetAuthError();
       boolean that_present_authError = true && that.isSetAuthError();
@@ -51707,24 +52570,21 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_authError = true && (isSetAuthError());
-      list.add(present_authError);
-      if (present_authError)
-        list.add(authError);
+      hashCode = hashCode * 8191 + ((isSetAuthError()) ? 131071 : 524287);
+      if (isSetAuthError())
+        hashCode = hashCode * 8191 + authError.hashCode();
 
-      boolean present_notFound = true && (isSetNotFound());
-      list.add(present_notFound);
-      if (present_notFound)
-        list.add(notFound);
+      hashCode = hashCode * 8191 + ((isSetNotFound()) ? 131071 : 524287);
+      if (isSetNotFound())
+        hashCode = hashCode * 8191 + notFound.hashCode();
 
-      boolean present_serverError = true && (isSetServerError());
-      list.add(present_serverError);
-      if (present_serverError)
-        list.add(serverError);
+      hashCode = hashCode * 8191 + ((isSetServerError()) ? 131071 : 524287);
+      if (isSetServerError())
+        hashCode = hashCode * 8191 + serverError.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -51735,7 +52595,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetAuthError()).compareTo(other.isSetAuthError());
+      lastComparison = java.lang.Boolean.compare(isSetAuthError(), other.isSetAuthError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -51745,7 +52605,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetNotFound()).compareTo(other.isSetNotFound());
+      lastComparison = java.lang.Boolean.compare(isSetNotFound(), other.isSetNotFound());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -51755,7 +52615,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetServerError()).compareTo(other.isSetServerError());
+      lastComparison = java.lang.Boolean.compare(isSetServerError(), other.isSetServerError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -51768,21 +52628,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("setLectureOwner_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("setLectureOwner_result(");
       boolean first = true;
 
       sb.append("authError:");
@@ -51825,7 +52686,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -51833,13 +52694,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class setLectureOwner_resultStandardSchemeFactory implements SchemeFactory {
+    private static class setLectureOwner_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public setLectureOwner_resultStandardScheme getScheme() {
         return new setLectureOwner_resultStandardScheme();
       }
     }
 
-    private static class setLectureOwner_resultStandardScheme extends StandardScheme<setLectureOwner_result> {
+    private static class setLectureOwner_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<setLectureOwner_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, setLectureOwner_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -51914,18 +52775,18 @@ public class SatelliteServer {
 
     }
 
-    private static class setLectureOwner_resultTupleSchemeFactory implements SchemeFactory {
+    private static class setLectureOwner_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public setLectureOwner_resultTupleScheme getScheme() {
         return new setLectureOwner_resultTupleScheme();
       }
     }
 
-    private static class setLectureOwner_resultTupleScheme extends TupleScheme<setLectureOwner_result> {
+    private static class setLectureOwner_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<setLectureOwner_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, setLectureOwner_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetAuthError()) {
           optionals.set(0);
         }
@@ -51949,8 +52810,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, setLectureOwner_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(3);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           struct.authError = new TAuthorizationException();
           struct.authError.read(iprot);
@@ -51969,6 +52830,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getPredefinedData_args implements org.apache.thrift.TBase<getPredefinedData_args, getPredefinedData_args._Fields>, java.io.Serializable, Cloneable, Comparable<getPredefinedData_args>   {
@@ -51976,22 +52840,19 @@ public class SatelliteServer {
 
     private static final org.apache.thrift.protocol.TField USER_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("userToken", org.apache.thrift.protocol.TType.STRING, (short)1);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getPredefinedData_argsStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getPredefinedData_argsTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getPredefinedData_argsStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getPredefinedData_argsTupleSchemeFactory();
 
-    public String userToken; // required
+    public @org.apache.thrift.annotation.Nullable java.lang.String userToken; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       USER_TOKEN((short)1, "userToken");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -51999,6 +52860,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 1: // USER_TOKEN
@@ -52014,21 +52876,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -52037,18 +52900,18 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.USER_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("userToken", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "Token")));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getPredefinedData_args.class, metaDataMap);
     }
 
@@ -52056,7 +52919,7 @@ public class SatelliteServer {
     }
 
     public getPredefinedData_args(
-      String userToken)
+      java.lang.String userToken)
     {
       this();
       this.userToken = userToken;
@@ -52080,11 +52943,12 @@ public class SatelliteServer {
       this.userToken = null;
     }
 
-    public String getUserToken() {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.String getUserToken() {
       return this.userToken;
     }
 
-    public getPredefinedData_args setUserToken(String userToken) {
+    public getPredefinedData_args setUserToken(@org.apache.thrift.annotation.Nullable java.lang.String userToken) {
       this.userToken = userToken;
       return this;
     }
@@ -52104,45 +52968,44 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case USER_TOKEN:
         if (value == null) {
           unsetUserToken();
         } else {
-          setUserToken((String)value);
+          setUserToken((java.lang.String)value);
         }
         break;
 
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case USER_TOKEN:
         return getUserToken();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
       case USER_TOKEN:
         return isSetUserToken();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getPredefinedData_args)
         return this.equals((getPredefinedData_args)that);
       return false;
@@ -52151,6 +53014,8 @@ public class SatelliteServer {
     public boolean equals(getPredefinedData_args that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_userToken = true && this.isSetUserToken();
       boolean that_present_userToken = true && that.isSetUserToken();
@@ -52166,14 +53031,13 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_userToken = true && (isSetUserToken());
-      list.add(present_userToken);
-      if (present_userToken)
-        list.add(userToken);
+      hashCode = hashCode * 8191 + ((isSetUserToken()) ? 131071 : 524287);
+      if (isSetUserToken())
+        hashCode = hashCode * 8191 + userToken.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -52184,7 +53048,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetUserToken()).compareTo(other.isSetUserToken());
+      lastComparison = java.lang.Boolean.compare(isSetUserToken(), other.isSetUserToken());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -52197,21 +53061,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
     }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getPredefinedData_args(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getPredefinedData_args(");
       boolean first = true;
 
       sb.append("userToken:");
@@ -52238,7 +53103,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -52246,13 +53111,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class getPredefinedData_argsStandardSchemeFactory implements SchemeFactory {
+    private static class getPredefinedData_argsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getPredefinedData_argsStandardScheme getScheme() {
         return new getPredefinedData_argsStandardScheme();
       }
     }
 
-    private static class getPredefinedData_argsStandardScheme extends StandardScheme<getPredefinedData_args> {
+    private static class getPredefinedData_argsStandardScheme extends org.apache.thrift.scheme.StandardScheme<getPredefinedData_args> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getPredefinedData_args struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -52298,18 +53163,18 @@ public class SatelliteServer {
 
     }
 
-    private static class getPredefinedData_argsTupleSchemeFactory implements SchemeFactory {
+    private static class getPredefinedData_argsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getPredefinedData_argsTupleScheme getScheme() {
         return new getPredefinedData_argsTupleScheme();
       }
     }
 
-    private static class getPredefinedData_argsTupleScheme extends TupleScheme<getPredefinedData_args> {
+    private static class getPredefinedData_argsTupleScheme extends org.apache.thrift.scheme.TupleScheme<getPredefinedData_args> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getPredefinedData_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetUserToken()) {
           optionals.set(0);
         }
@@ -52321,8 +53186,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getPredefinedData_args struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(1);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(1);
         if (incoming.get(0)) {
           struct.userToken = iprot.readString();
           struct.setUserTokenIsSet(true);
@@ -52330,6 +53195,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
   public static class getPredefinedData_result implements org.apache.thrift.TBase<getPredefinedData_result, getPredefinedData_result._Fields>, java.io.Serializable, Cloneable, Comparable<getPredefinedData_result>   {
@@ -52339,15 +53207,12 @@ public class SatelliteServer {
     private static final org.apache.thrift.protocol.TField AUTH_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("authError", org.apache.thrift.protocol.TType.STRUCT, (short)1);
     private static final org.apache.thrift.protocol.TField SERVER_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("serverError", org.apache.thrift.protocol.TType.STRUCT, (short)2);
 
-    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-    static {
-      schemes.put(StandardScheme.class, new getPredefinedData_resultStandardSchemeFactory());
-      schemes.put(TupleScheme.class, new getPredefinedData_resultTupleSchemeFactory());
-    }
+    private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new getPredefinedData_resultStandardSchemeFactory();
+    private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new getPredefinedData_resultTupleSchemeFactory();
 
-    public PredefinedData success; // required
-    public TAuthorizationException authError; // required
-    public TInvocationException serverError; // required
+    public @org.apache.thrift.annotation.Nullable PredefinedData success; // required
+    public @org.apache.thrift.annotation.Nullable TAuthorizationException authError; // required
+    public @org.apache.thrift.annotation.Nullable TInvocationException serverError; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -52355,10 +53220,10 @@ public class SatelliteServer {
       AUTH_ERROR((short)1, "authError"),
       SERVER_ERROR((short)2, "serverError");
 
-      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+      private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
       static {
-        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
           byName.put(field.getFieldName(), field);
         }
       }
@@ -52366,6 +53231,7 @@ public class SatelliteServer {
       /**
        * Find the _Fields constant that matches fieldId, or null if its not found.
        */
+      @org.apache.thrift.annotation.Nullable
       public static _Fields findByThriftId(int fieldId) {
         switch(fieldId) {
           case 0: // SUCCESS
@@ -52385,21 +53251,22 @@ public class SatelliteServer {
        */
       public static _Fields findByThriftIdOrThrow(int fieldId) {
         _Fields fields = findByThriftId(fieldId);
-        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
         return fields;
       }
 
       /**
        * Find the _Fields constant that matches name, or null if its not found.
        */
-      public static _Fields findByName(String name) {
+      @org.apache.thrift.annotation.Nullable
+      public static _Fields findByName(java.lang.String name) {
         return byName.get(name);
       }
 
       private final short _thriftId;
-      private final String _fieldName;
+      private final java.lang.String _fieldName;
 
-      _Fields(short thriftId, String fieldName) {
+      _Fields(short thriftId, java.lang.String fieldName) {
         _thriftId = thriftId;
         _fieldName = fieldName;
       }
@@ -52408,22 +53275,22 @@ public class SatelliteServer {
         return _thriftId;
       }
 
-      public String getFieldName() {
+      public java.lang.String getFieldName() {
         return _fieldName;
       }
     }
 
     // isset id assignments
-    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
     static {
-      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
       tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, PredefinedData.class)));
       tmpMap.put(_Fields.AUTH_ERROR, new org.apache.thrift.meta_data.FieldMetaData("authError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TAuthorizationException.class)));
       tmpMap.put(_Fields.SERVER_ERROR, new org.apache.thrift.meta_data.FieldMetaData("serverError", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRUCT)));
-      metaDataMap = Collections.unmodifiableMap(tmpMap);
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TInvocationException.class)));
+      metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getPredefinedData_result.class, metaDataMap);
     }
 
@@ -52467,11 +53334,12 @@ public class SatelliteServer {
       this.serverError = null;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public PredefinedData getSuccess() {
       return this.success;
     }
 
-    public getPredefinedData_result setSuccess(PredefinedData success) {
+    public getPredefinedData_result setSuccess(@org.apache.thrift.annotation.Nullable PredefinedData success) {
       this.success = success;
       return this;
     }
@@ -52491,11 +53359,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TAuthorizationException getAuthError() {
       return this.authError;
     }
 
-    public getPredefinedData_result setAuthError(TAuthorizationException authError) {
+    public getPredefinedData_result setAuthError(@org.apache.thrift.annotation.Nullable TAuthorizationException authError) {
       this.authError = authError;
       return this;
     }
@@ -52515,11 +53384,12 @@ public class SatelliteServer {
       }
     }
 
+    @org.apache.thrift.annotation.Nullable
     public TInvocationException getServerError() {
       return this.serverError;
     }
 
-    public getPredefinedData_result setServerError(TInvocationException serverError) {
+    public getPredefinedData_result setServerError(@org.apache.thrift.annotation.Nullable TInvocationException serverError) {
       this.serverError = serverError;
       return this;
     }
@@ -52539,7 +53409,7 @@ public class SatelliteServer {
       }
     }
 
-    public void setFieldValue(_Fields field, Object value) {
+    public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
       switch (field) {
       case SUCCESS:
         if (value == null) {
@@ -52568,7 +53438,8 @@ public class SatelliteServer {
       }
     }
 
-    public Object getFieldValue(_Fields field) {
+    @org.apache.thrift.annotation.Nullable
+    public java.lang.Object getFieldValue(_Fields field) {
       switch (field) {
       case SUCCESS:
         return getSuccess();
@@ -52580,13 +53451,13 @@ public class SatelliteServer {
         return getServerError();
 
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
     public boolean isSet(_Fields field) {
       if (field == null) {
-        throw new IllegalArgumentException();
+        throw new java.lang.IllegalArgumentException();
       }
 
       switch (field) {
@@ -52597,13 +53468,11 @@ public class SatelliteServer {
       case SERVER_ERROR:
         return isSetServerError();
       }
-      throw new IllegalStateException();
+      throw new java.lang.IllegalStateException();
     }
 
     @Override
-    public boolean equals(Object that) {
-      if (that == null)
-        return false;
+    public boolean equals(java.lang.Object that) {
       if (that instanceof getPredefinedData_result)
         return this.equals((getPredefinedData_result)that);
       return false;
@@ -52612,6 +53481,8 @@ public class SatelliteServer {
     public boolean equals(getPredefinedData_result that) {
       if (that == null)
         return false;
+      if (this == that)
+        return true;
 
       boolean this_present_success = true && this.isSetSuccess();
       boolean that_present_success = true && that.isSetSuccess();
@@ -52645,24 +53516,21 @@ public class SatelliteServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
+      int hashCode = 1;
 
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
+      hashCode = hashCode * 8191 + ((isSetSuccess()) ? 131071 : 524287);
+      if (isSetSuccess())
+        hashCode = hashCode * 8191 + success.hashCode();
 
-      boolean present_authError = true && (isSetAuthError());
-      list.add(present_authError);
-      if (present_authError)
-        list.add(authError);
+      hashCode = hashCode * 8191 + ((isSetAuthError()) ? 131071 : 524287);
+      if (isSetAuthError())
+        hashCode = hashCode * 8191 + authError.hashCode();
 
-      boolean present_serverError = true && (isSetServerError());
-      list.add(present_serverError);
-      if (present_serverError)
-        list.add(serverError);
+      hashCode = hashCode * 8191 + ((isSetServerError()) ? 131071 : 524287);
+      if (isSetServerError())
+        hashCode = hashCode * 8191 + serverError.hashCode();
 
-      return list.hashCode();
+      return hashCode;
     }
 
     @Override
@@ -52673,7 +53541,7 @@ public class SatelliteServer {
 
       int lastComparison = 0;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -52683,7 +53551,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetAuthError()).compareTo(other.isSetAuthError());
+      lastComparison = java.lang.Boolean.compare(isSetAuthError(), other.isSetAuthError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -52693,7 +53561,7 @@ public class SatelliteServer {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetServerError()).compareTo(other.isSetServerError());
+      lastComparison = java.lang.Boolean.compare(isSetServerError(), other.isSetServerError());
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -52706,21 +53574,22 @@ public class SatelliteServer {
       return 0;
     }
 
+    @org.apache.thrift.annotation.Nullable
     public _Fields fieldForId(int fieldId) {
       return _Fields.findByThriftId(fieldId);
     }
 
     public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+      scheme(iprot).read(iprot, this);
     }
 
     public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      scheme(oprot).write(oprot, this);
       }
 
     @Override
-    public String toString() {
-      StringBuilder sb = new StringBuilder("getPredefinedData_result(");
+    public java.lang.String toString() {
+      java.lang.StringBuilder sb = new java.lang.StringBuilder("getPredefinedData_result(");
       boolean first = true;
 
       sb.append("success:");
@@ -52766,7 +53635,7 @@ public class SatelliteServer {
       }
     }
 
-    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
       try {
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
@@ -52774,13 +53643,13 @@ public class SatelliteServer {
       }
     }
 
-    private static class getPredefinedData_resultStandardSchemeFactory implements SchemeFactory {
+    private static class getPredefinedData_resultStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getPredefinedData_resultStandardScheme getScheme() {
         return new getPredefinedData_resultStandardScheme();
       }
     }
 
-    private static class getPredefinedData_resultStandardScheme extends StandardScheme<getPredefinedData_result> {
+    private static class getPredefinedData_resultStandardScheme extends org.apache.thrift.scheme.StandardScheme<getPredefinedData_result> {
 
       public void read(org.apache.thrift.protocol.TProtocol iprot, getPredefinedData_result struct) throws org.apache.thrift.TException {
         org.apache.thrift.protocol.TField schemeField;
@@ -52855,18 +53724,18 @@ public class SatelliteServer {
 
     }
 
-    private static class getPredefinedData_resultTupleSchemeFactory implements SchemeFactory {
+    private static class getPredefinedData_resultTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
       public getPredefinedData_resultTupleScheme getScheme() {
         return new getPredefinedData_resultTupleScheme();
       }
     }
 
-    private static class getPredefinedData_resultTupleScheme extends TupleScheme<getPredefinedData_result> {
+    private static class getPredefinedData_resultTupleScheme extends org.apache.thrift.scheme.TupleScheme<getPredefinedData_result> {
 
       @Override
       public void write(org.apache.thrift.protocol.TProtocol prot, getPredefinedData_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol oprot = (TTupleProtocol) prot;
-        BitSet optionals = new BitSet();
+        org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet optionals = new java.util.BitSet();
         if (struct.isSetSuccess()) {
           optionals.set(0);
         }
@@ -52890,8 +53759,8 @@ public class SatelliteServer {
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getPredefinedData_result struct) throws org.apache.thrift.TException {
-        TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(3);
+        org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+        java.util.BitSet incoming = iprot.readBitSet(3);
         if (incoming.get(0)) {
           struct.success = new PredefinedData();
           struct.success.read(iprot);
@@ -52910,6 +53779,9 @@ public class SatelliteServer {
       }
     }
 
+    private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+      return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+    }
   }
 
 }
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/SatelliteStatus.java b/src/main/java/org/openslx/bwlp/thrift/iface/SatelliteStatus.java
index dc94988..59f675e 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/SatelliteStatus.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/SatelliteStatus.java
@@ -1,51 +1,21 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.openslx.bwlp.thrift.iface;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
 public class SatelliteStatus implements org.apache.thrift.TBase<SatelliteStatus, SatelliteStatus._Fields>, java.io.Serializable, Cloneable, Comparable<SatelliteStatus> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SatelliteStatus");
 
   private static final org.apache.thrift.protocol.TField AVAILABLE_STORAGE_BYTES_FIELD_DESC = new org.apache.thrift.protocol.TField("availableStorageBytes", org.apache.thrift.protocol.TType.I64, (short)1);
   private static final org.apache.thrift.protocol.TField SERVER_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("serverTime", org.apache.thrift.protocol.TType.I64, (short)2);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new SatelliteStatusStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new SatelliteStatusTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new SatelliteStatusStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new SatelliteStatusTupleSchemeFactory();
 
   public long availableStorageBytes; // required
   public long serverTime; // required
@@ -55,10 +25,10 @@ public class SatelliteStatus implements org.apache.thrift.TBase<SatelliteStatus,
     AVAILABLE_STORAGE_BYTES((short)1, "availableStorageBytes"),
     SERVER_TIME((short)2, "serverTime");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -66,6 +36,7 @@ public class SatelliteStatus implements org.apache.thrift.TBase<SatelliteStatus,
     /**
      * Find the _Fields constant that matches fieldId, or null if its not found.
      */
+    @org.apache.thrift.annotation.Nullable
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
         case 1: // AVAILABLE_STORAGE_BYTES
@@ -83,21 +54,22 @@ public class SatelliteStatus implements org.apache.thrift.TBase<SatelliteStatus,
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    @org.apache.thrift.annotation.Nullable
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -106,7 +78,7 @@ public class SatelliteStatus implements org.apache.thrift.TBase<SatelliteStatus,
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -115,14 +87,14 @@ public class SatelliteStatus implements org.apache.thrift.TBase<SatelliteStatus,
   private static final int __AVAILABLESTORAGEBYTES_ISSET_ID = 0;
   private static final int __SERVERTIME_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.AVAILABLE_STORAGE_BYTES, new org.apache.thrift.meta_data.FieldMetaData("availableStorageBytes", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
     tmpMap.put(_Fields.SERVER_TIME, new org.apache.thrift.meta_data.FieldMetaData("serverTime", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64        , "UnixTimestamp")));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SatelliteStatus.class, metaDataMap);
   }
 
@@ -172,16 +144,16 @@ public class SatelliteStatus implements org.apache.thrift.TBase<SatelliteStatus,
   }
 
   public void unsetAvailableStorageBytes() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __AVAILABLESTORAGEBYTES_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __AVAILABLESTORAGEBYTES_ISSET_ID);
   }
 
   /** Returns true if field availableStorageBytes is set (has been assigned a value) and false otherwise */
   public boolean isSetAvailableStorageBytes() {
-    return EncodingUtils.testBit(__isset_bitfield, __AVAILABLESTORAGEBYTES_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __AVAILABLESTORAGEBYTES_ISSET_ID);
   }
 
   public void setAvailableStorageBytesIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __AVAILABLESTORAGEBYTES_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __AVAILABLESTORAGEBYTES_ISSET_ID, value);
   }
 
   public long getServerTime() {
@@ -195,25 +167,25 @@ public class SatelliteStatus implements org.apache.thrift.TBase<SatelliteStatus,
   }
 
   public void unsetServerTime() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SERVERTIME_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SERVERTIME_ISSET_ID);
   }
 
   /** Returns true if field serverTime is set (has been assigned a value) and false otherwise */
   public boolean isSetServerTime() {
-    return EncodingUtils.testBit(__isset_bitfield, __SERVERTIME_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SERVERTIME_ISSET_ID);
   }
 
   public void setServerTimeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SERVERTIME_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SERVERTIME_ISSET_ID, value);
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case AVAILABLE_STORAGE_BYTES:
       if (value == null) {
         unsetAvailableStorageBytes();
       } else {
-        setAvailableStorageBytes((Long)value);
+        setAvailableStorageBytes((java.lang.Long)value);
       }
       break;
 
@@ -221,14 +193,15 @@ public class SatelliteStatus implements org.apache.thrift.TBase<SatelliteStatus,
       if (value == null) {
         unsetServerTime();
       } else {
-        setServerTime((Long)value);
+        setServerTime((java.lang.Long)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case AVAILABLE_STORAGE_BYTES:
       return getAvailableStorageBytes();
@@ -237,13 +210,13 @@ public class SatelliteStatus implements org.apache.thrift.TBase<SatelliteStatus,
       return getServerTime();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -252,13 +225,11 @@ public class SatelliteStatus implements org.apache.thrift.TBase<SatelliteStatus,
     case SERVER_TIME:
       return isSetServerTime();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
+  public boolean equals(java.lang.Object that) {
     if (that instanceof SatelliteStatus)
       return this.equals((SatelliteStatus)that);
     return false;
@@ -267,6 +238,8 @@ public class SatelliteStatus implements org.apache.thrift.TBase<SatelliteStatus,
   public boolean equals(SatelliteStatus that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_availableStorageBytes = true;
     boolean that_present_availableStorageBytes = true;
@@ -291,19 +264,13 @@ public class SatelliteStatus implements org.apache.thrift.TBase<SatelliteStatus,
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_availableStorageBytes = true;
-    list.add(present_availableStorageBytes);
-    if (present_availableStorageBytes)
-      list.add(availableStorageBytes);
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(availableStorageBytes);
 
-    boolean present_serverTime = true;
-    list.add(present_serverTime);
-    if (present_serverTime)
-      list.add(serverTime);
+    hashCode = hashCode * 8191 + org.apache.thrift.TBaseHelper.hashCode(serverTime);
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -314,7 +281,7 @@ public class SatelliteStatus implements org.apache.thrift.TBase<SatelliteStatus,
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetAvailableStorageBytes()).compareTo(other.isSetAvailableStorageBytes());
+    lastComparison = java.lang.Boolean.compare(isSetAvailableStorageBytes(), other.isSetAvailableStorageBytes());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -324,7 +291,7 @@ public class SatelliteStatus implements org.apache.thrift.TBase<SatelliteStatus,
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetServerTime()).compareTo(other.isSetServerTime());
+    lastComparison = java.lang.Boolean.compare(isSetServerTime(), other.isSetServerTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -337,21 +304,22 @@ public class SatelliteStatus implements org.apache.thrift.TBase<SatelliteStatus,
     return 0;
   }
 
+  @org.apache.thrift.annotation.Nullable
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("SatelliteStatus(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("SatelliteStatus(");
     boolean first = true;
 
     sb.append("availableStorageBytes:");
@@ -378,7 +346,7 @@ public class SatelliteStatus implements org.apache.thrift.TBase<SatelliteStatus,
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -388,13 +356,13 @@ public class SatelliteStatus implements org.apache.thrift.TBase<SatelliteStatus,
     }
   }
 
-  private static class SatelliteStatusStandardSchemeFactory implements SchemeFactory {
+  private static class SatelliteStatusStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public SatelliteStatusStandardScheme getScheme() {
       return new SatelliteStatusStandardScheme();
     }
   }
 
-  private static class SatelliteStatusStandardScheme extends StandardScheme<SatelliteStatus> {
+  private static class SatelliteStatusStandardScheme extends org.apache.thrift.scheme.StandardScheme<SatelliteStatus> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, SatelliteStatus struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -449,18 +417,18 @@ public class SatelliteStatus implements org.apache.thrift.TBase<SatelliteStatus,
 
   }
 
-  private static class SatelliteStatusTupleSchemeFactory implements SchemeFactory {
+  private static class SatelliteStatusTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public SatelliteStatusTupleScheme getScheme() {
       return new SatelliteStatusTupleScheme();
     }
   }
 
-  private static class SatelliteStatusTupleScheme extends TupleScheme<SatelliteStatus> {
+  private static class SatelliteStatusTupleScheme extends org.apache.thrift.scheme.TupleScheme<SatelliteStatus> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, SatelliteStatus struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetAvailableStorageBytes()) {
         optionals.set(0);
       }
@@ -478,8 +446,8 @@ public class SatelliteStatus implements org.apache.thrift.TBase<SatelliteStatus,
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, SatelliteStatus struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(2);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(2);
       if (incoming.get(0)) {
         struct.availableStorageBytes = iprot.readI64();
         struct.setAvailableStorageBytesIsSet(true);
@@ -491,5 +459,8 @@ public class SatelliteStatus implements org.apache.thrift.TBase<SatelliteStatus,
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/SatelliteUserConfig.java b/src/main/java/org/openslx/bwlp/thrift/iface/SatelliteUserConfig.java
index c8c4247..30c683b 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/SatelliteUserConfig.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/SatelliteUserConfig.java
@@ -1,50 +1,20 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.openslx.bwlp.thrift.iface;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
 public class SatelliteUserConfig implements org.apache.thrift.TBase<SatelliteUserConfig, SatelliteUserConfig._Fields>, java.io.Serializable, Cloneable, Comparable<SatelliteUserConfig> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SatelliteUserConfig");
 
   private static final org.apache.thrift.protocol.TField EMAIL_NOTIFICATIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("emailNotifications", org.apache.thrift.protocol.TType.BOOL, (short)1);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new SatelliteUserConfigStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new SatelliteUserConfigTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new SatelliteUserConfigStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new SatelliteUserConfigTupleSchemeFactory();
 
   public boolean emailNotifications; // required
 
@@ -52,10 +22,10 @@ public class SatelliteUserConfig implements org.apache.thrift.TBase<SatelliteUse
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     EMAIL_NOTIFICATIONS((short)1, "emailNotifications");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -63,6 +33,7 @@ public class SatelliteUserConfig implements org.apache.thrift.TBase<SatelliteUse
     /**
      * Find the _Fields constant that matches fieldId, or null if its not found.
      */
+    @org.apache.thrift.annotation.Nullable
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
         case 1: // EMAIL_NOTIFICATIONS
@@ -78,21 +49,22 @@ public class SatelliteUserConfig implements org.apache.thrift.TBase<SatelliteUse
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    @org.apache.thrift.annotation.Nullable
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -101,7 +73,7 @@ public class SatelliteUserConfig implements org.apache.thrift.TBase<SatelliteUse
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -109,12 +81,12 @@ public class SatelliteUserConfig implements org.apache.thrift.TBase<SatelliteUse
   // isset id assignments
   private static final int __EMAILNOTIFICATIONS_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.EMAIL_NOTIFICATIONS, new org.apache.thrift.meta_data.FieldMetaData("emailNotifications", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SatelliteUserConfig.class, metaDataMap);
   }
 
@@ -158,57 +130,56 @@ public class SatelliteUserConfig implements org.apache.thrift.TBase<SatelliteUse
   }
 
   public void unsetEmailNotifications() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __EMAILNOTIFICATIONS_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __EMAILNOTIFICATIONS_ISSET_ID);
   }
 
   /** Returns true if field emailNotifications is set (has been assigned a value) and false otherwise */
   public boolean isSetEmailNotifications() {
-    return EncodingUtils.testBit(__isset_bitfield, __EMAILNOTIFICATIONS_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __EMAILNOTIFICATIONS_ISSET_ID);
   }
 
   public void setEmailNotificationsIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __EMAILNOTIFICATIONS_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __EMAILNOTIFICATIONS_ISSET_ID, value);
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case EMAIL_NOTIFICATIONS:
       if (value == null) {
         unsetEmailNotifications();
       } else {
-        setEmailNotifications((Boolean)value);
+        setEmailNotifications((java.lang.Boolean)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case EMAIL_NOTIFICATIONS:
       return isEmailNotifications();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
     case EMAIL_NOTIFICATIONS:
       return isSetEmailNotifications();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
+  public boolean equals(java.lang.Object that) {
     if (that instanceof SatelliteUserConfig)
       return this.equals((SatelliteUserConfig)that);
     return false;
@@ -217,6 +188,8 @@ public class SatelliteUserConfig implements org.apache.thrift.TBase<SatelliteUse
   public boolean equals(SatelliteUserConfig that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_emailNotifications = true;
     boolean that_present_emailNotifications = true;
@@ -232,14 +205,11 @@ public class SatelliteUserConfig implements org.apache.thrift.TBase<SatelliteUse
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_emailNotifications = true;
-    list.add(present_emailNotifications);
-    if (present_emailNotifications)
-      list.add(emailNotifications);
+    hashCode = hashCode * 8191 + ((emailNotifications) ? 131071 : 524287);
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -250,7 +220,7 @@ public class SatelliteUserConfig implements org.apache.thrift.TBase<SatelliteUse
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetEmailNotifications()).compareTo(other.isSetEmailNotifications());
+    lastComparison = java.lang.Boolean.compare(isSetEmailNotifications(), other.isSetEmailNotifications());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -263,21 +233,22 @@ public class SatelliteUserConfig implements org.apache.thrift.TBase<SatelliteUse
     return 0;
   }
 
+  @org.apache.thrift.annotation.Nullable
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("SatelliteUserConfig(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("SatelliteUserConfig(");
     boolean first = true;
 
     sb.append("emailNotifications:");
@@ -300,7 +271,7 @@ public class SatelliteUserConfig implements org.apache.thrift.TBase<SatelliteUse
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -310,13 +281,13 @@ public class SatelliteUserConfig implements org.apache.thrift.TBase<SatelliteUse
     }
   }
 
-  private static class SatelliteUserConfigStandardSchemeFactory implements SchemeFactory {
+  private static class SatelliteUserConfigStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public SatelliteUserConfigStandardScheme getScheme() {
       return new SatelliteUserConfigStandardScheme();
     }
   }
 
-  private static class SatelliteUserConfigStandardScheme extends StandardScheme<SatelliteUserConfig> {
+  private static class SatelliteUserConfigStandardScheme extends org.apache.thrift.scheme.StandardScheme<SatelliteUserConfig> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, SatelliteUserConfig struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -360,18 +331,18 @@ public class SatelliteUserConfig implements org.apache.thrift.TBase<SatelliteUse
 
   }
 
-  private static class SatelliteUserConfigTupleSchemeFactory implements SchemeFactory {
+  private static class SatelliteUserConfigTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public SatelliteUserConfigTupleScheme getScheme() {
       return new SatelliteUserConfigTupleScheme();
     }
   }
 
-  private static class SatelliteUserConfigTupleScheme extends TupleScheme<SatelliteUserConfig> {
+  private static class SatelliteUserConfigTupleScheme extends org.apache.thrift.scheme.TupleScheme<SatelliteUserConfig> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, SatelliteUserConfig struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetEmailNotifications()) {
         optionals.set(0);
       }
@@ -383,8 +354,8 @@ public class SatelliteUserConfig implements org.apache.thrift.TBase<SatelliteUse
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, SatelliteUserConfig struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(1);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(1);
       if (incoming.get(0)) {
         struct.emailNotifications = iprot.readBool();
         struct.setEmailNotificationsIsSet(true);
@@ -392,5 +363,8 @@ public class SatelliteUserConfig implements org.apache.thrift.TBase<SatelliteUse
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/ServerSessionData.java b/src/main/java/org/openslx/bwlp/thrift/iface/ServerSessionData.java
index 5e45328..71b5b2f 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/ServerSessionData.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/ServerSessionData.java
@@ -1,61 +1,31 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.openslx.bwlp.thrift.iface;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
 public class ServerSessionData implements org.apache.thrift.TBase<ServerSessionData, ServerSessionData._Fields>, java.io.Serializable, Cloneable, Comparable<ServerSessionData> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ServerSessionData");
 
   private static final org.apache.thrift.protocol.TField SESSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("sessionId", org.apache.thrift.protocol.TType.STRING, (short)1);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new ServerSessionDataStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new ServerSessionDataTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new ServerSessionDataStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new ServerSessionDataTupleSchemeFactory();
 
-  public String sessionId; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String sessionId; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     SESSION_ID((short)1, "sessionId");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -63,6 +33,7 @@ public class ServerSessionData implements org.apache.thrift.TBase<ServerSessionD
     /**
      * Find the _Fields constant that matches fieldId, or null if its not found.
      */
+    @org.apache.thrift.annotation.Nullable
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
         case 1: // SESSION_ID
@@ -78,21 +49,22 @@ public class ServerSessionData implements org.apache.thrift.TBase<ServerSessionD
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    @org.apache.thrift.annotation.Nullable
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -101,18 +73,18 @@ public class ServerSessionData implements org.apache.thrift.TBase<ServerSessionD
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.SESSION_ID, new org.apache.thrift.meta_data.FieldMetaData("sessionId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , "Token")));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ServerSessionData.class, metaDataMap);
   }
 
@@ -120,7 +92,7 @@ public class ServerSessionData implements org.apache.thrift.TBase<ServerSessionD
   }
 
   public ServerSessionData(
-    String sessionId)
+    java.lang.String sessionId)
   {
     this();
     this.sessionId = sessionId;
@@ -144,11 +116,12 @@ public class ServerSessionData implements org.apache.thrift.TBase<ServerSessionD
     this.sessionId = null;
   }
 
-  public String getSessionId() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getSessionId() {
     return this.sessionId;
   }
 
-  public ServerSessionData setSessionId(String sessionId) {
+  public ServerSessionData setSessionId(@org.apache.thrift.annotation.Nullable java.lang.String sessionId) {
     this.sessionId = sessionId;
     return this;
   }
@@ -168,45 +141,44 @@ public class ServerSessionData implements org.apache.thrift.TBase<ServerSessionD
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case SESSION_ID:
       if (value == null) {
         unsetSessionId();
       } else {
-        setSessionId((String)value);
+        setSessionId((java.lang.String)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SESSION_ID:
       return getSessionId();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
     case SESSION_ID:
       return isSetSessionId();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
+  public boolean equals(java.lang.Object that) {
     if (that instanceof ServerSessionData)
       return this.equals((ServerSessionData)that);
     return false;
@@ -215,6 +187,8 @@ public class ServerSessionData implements org.apache.thrift.TBase<ServerSessionD
   public boolean equals(ServerSessionData that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_sessionId = true && this.isSetSessionId();
     boolean that_present_sessionId = true && that.isSetSessionId();
@@ -230,14 +204,13 @@ public class ServerSessionData implements org.apache.thrift.TBase<ServerSessionD
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_sessionId = true && (isSetSessionId());
-    list.add(present_sessionId);
-    if (present_sessionId)
-      list.add(sessionId);
+    hashCode = hashCode * 8191 + ((isSetSessionId()) ? 131071 : 524287);
+    if (isSetSessionId())
+      hashCode = hashCode * 8191 + sessionId.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -248,7 +221,7 @@ public class ServerSessionData implements org.apache.thrift.TBase<ServerSessionD
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetSessionId()).compareTo(other.isSetSessionId());
+    lastComparison = java.lang.Boolean.compare(isSetSessionId(), other.isSetSessionId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -261,21 +234,22 @@ public class ServerSessionData implements org.apache.thrift.TBase<ServerSessionD
     return 0;
   }
 
+  @org.apache.thrift.annotation.Nullable
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("ServerSessionData(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("ServerSessionData(");
     boolean first = true;
 
     sb.append("sessionId:");
@@ -302,7 +276,7 @@ public class ServerSessionData implements org.apache.thrift.TBase<ServerSessionD
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
     } catch (org.apache.thrift.TException te) {
@@ -310,13 +284,13 @@ public class ServerSessionData implements org.apache.thrift.TBase<ServerSessionD
     }
   }
 
-  private static class ServerSessionDataStandardSchemeFactory implements SchemeFactory {
+  private static class ServerSessionDataStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public ServerSessionDataStandardScheme getScheme() {
       return new ServerSessionDataStandardScheme();
     }
   }
 
-  private static class ServerSessionDataStandardScheme extends StandardScheme<ServerSessionData> {
+  private static class ServerSessionDataStandardScheme extends org.apache.thrift.scheme.StandardScheme<ServerSessionData> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, ServerSessionData struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -362,18 +336,18 @@ public class ServerSessionData implements org.apache.thrift.TBase<ServerSessionD
 
   }
 
-  private static class ServerSessionDataTupleSchemeFactory implements SchemeFactory {
+  private static class ServerSessionDataTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public ServerSessionDataTupleScheme getScheme() {
       return new ServerSessionDataTupleScheme();
     }
   }
 
-  private static class ServerSessionDataTupleScheme extends TupleScheme<ServerSessionData> {
+  private static class ServerSessionDataTupleScheme extends org.apache.thrift.scheme.TupleScheme<ServerSessionData> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, ServerSessionData struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetSessionId()) {
         optionals.set(0);
       }
@@ -385,8 +359,8 @@ public class ServerSessionData implements org.apache.thrift.TBase<ServerSessionD
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, ServerSessionData struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(1);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(1);
       if (incoming.get(0)) {
         struct.sessionId = iprot.readString();
         struct.setSessionIdIsSet(true);
@@ -394,5 +368,8 @@ public class ServerSessionData implements org.apache.thrift.TBase<ServerSessionD
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/SessionData.java b/src/main/java/org/openslx/bwlp/thrift/iface/SessionData.java
index 838b5d2..151f04e 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/SessionData.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/SessionData.java
@@ -1,40 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.openslx.bwlp.thrift.iface;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
 public class SessionData implements org.apache.thrift.TBase<SessionData, SessionData._Fields>, java.io.Serializable, Cloneable, Comparable<SessionData> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SessionData");
 
@@ -42,15 +15,12 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session
   private static final org.apache.thrift.protocol.TField AUTH_TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("authToken", org.apache.thrift.protocol.TType.STRING, (short)2);
   private static final org.apache.thrift.protocol.TField SERVER_ADDRESS_FIELD_DESC = new org.apache.thrift.protocol.TField("serverAddress", org.apache.thrift.protocol.TType.STRING, (short)3);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new SessionDataStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new SessionDataTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new SessionDataStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new SessionDataTupleSchemeFactory();
 
-  public String sessionId; // required
-  public String authToken; // required
-  public String serverAddress; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String sessionId; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String authToken; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String serverAddress; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -58,10 +28,10 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session
     AUTH_TOKEN((short)2, "authToken"),
     SERVER_ADDRESS((short)3, "serverAddress");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -69,6 +39,7 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session
     /**
      * Find the _Fields constant that matches fieldId, or null if its not found.
      */
+    @org.apache.thrift.annotation.Nullable
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
         case 1: // SESSION_ID
@@ -88,21 +59,22 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    @org.apache.thrift.annotation.Nullable
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -111,22 +83,22 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.SESSION_ID, new org.apache.thrift.meta_data.FieldMetaData("sessionId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , "Token")));
     tmpMap.put(_Fields.AUTH_TOKEN, new org.apache.thrift.meta_data.FieldMetaData("authToken", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , "Token")));
     tmpMap.put(_Fields.SERVER_ADDRESS, new org.apache.thrift.meta_data.FieldMetaData("serverAddress", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SessionData.class, metaDataMap);
   }
 
@@ -134,9 +106,9 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session
   }
 
   public SessionData(
-    String sessionId,
-    String authToken,
-    String serverAddress)
+    java.lang.String sessionId,
+    java.lang.String authToken,
+    java.lang.String serverAddress)
   {
     this();
     this.sessionId = sessionId;
@@ -170,11 +142,12 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session
     this.serverAddress = null;
   }
 
-  public String getSessionId() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getSessionId() {
     return this.sessionId;
   }
 
-  public SessionData setSessionId(String sessionId) {
+  public SessionData setSessionId(@org.apache.thrift.annotation.Nullable java.lang.String sessionId) {
     this.sessionId = sessionId;
     return this;
   }
@@ -194,11 +167,12 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session
     }
   }
 
-  public String getAuthToken() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getAuthToken() {
     return this.authToken;
   }
 
-  public SessionData setAuthToken(String authToken) {
+  public SessionData setAuthToken(@org.apache.thrift.annotation.Nullable java.lang.String authToken) {
     this.authToken = authToken;
     return this;
   }
@@ -218,11 +192,12 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session
     }
   }
 
-  public String getServerAddress() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getServerAddress() {
     return this.serverAddress;
   }
 
-  public SessionData setServerAddress(String serverAddress) {
+  public SessionData setServerAddress(@org.apache.thrift.annotation.Nullable java.lang.String serverAddress) {
     this.serverAddress = serverAddress;
     return this;
   }
@@ -242,13 +217,13 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case SESSION_ID:
       if (value == null) {
         unsetSessionId();
       } else {
-        setSessionId((String)value);
+        setSessionId((java.lang.String)value);
       }
       break;
 
@@ -256,7 +231,7 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session
       if (value == null) {
         unsetAuthToken();
       } else {
-        setAuthToken((String)value);
+        setAuthToken((java.lang.String)value);
       }
       break;
 
@@ -264,14 +239,15 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session
       if (value == null) {
         unsetServerAddress();
       } else {
-        setServerAddress((String)value);
+        setServerAddress((java.lang.String)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SESSION_ID:
       return getSessionId();
@@ -283,13 +259,13 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session
       return getServerAddress();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -300,13 +276,11 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session
     case SERVER_ADDRESS:
       return isSetServerAddress();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
+  public boolean equals(java.lang.Object that) {
     if (that instanceof SessionData)
       return this.equals((SessionData)that);
     return false;
@@ -315,6 +289,8 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session
   public boolean equals(SessionData that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_sessionId = true && this.isSetSessionId();
     boolean that_present_sessionId = true && that.isSetSessionId();
@@ -348,24 +324,21 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_sessionId = true && (isSetSessionId());
-    list.add(present_sessionId);
-    if (present_sessionId)
-      list.add(sessionId);
+    hashCode = hashCode * 8191 + ((isSetSessionId()) ? 131071 : 524287);
+    if (isSetSessionId())
+      hashCode = hashCode * 8191 + sessionId.hashCode();
 
-    boolean present_authToken = true && (isSetAuthToken());
-    list.add(present_authToken);
-    if (present_authToken)
-      list.add(authToken);
+    hashCode = hashCode * 8191 + ((isSetAuthToken()) ? 131071 : 524287);
+    if (isSetAuthToken())
+      hashCode = hashCode * 8191 + authToken.hashCode();
 
-    boolean present_serverAddress = true && (isSetServerAddress());
-    list.add(present_serverAddress);
-    if (present_serverAddress)
-      list.add(serverAddress);
+    hashCode = hashCode * 8191 + ((isSetServerAddress()) ? 131071 : 524287);
+    if (isSetServerAddress())
+      hashCode = hashCode * 8191 + serverAddress.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -376,7 +349,7 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetSessionId()).compareTo(other.isSetSessionId());
+    lastComparison = java.lang.Boolean.compare(isSetSessionId(), other.isSetSessionId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -386,7 +359,7 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetAuthToken()).compareTo(other.isSetAuthToken());
+    lastComparison = java.lang.Boolean.compare(isSetAuthToken(), other.isSetAuthToken());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -396,7 +369,7 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetServerAddress()).compareTo(other.isSetServerAddress());
+    lastComparison = java.lang.Boolean.compare(isSetServerAddress(), other.isSetServerAddress());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -409,21 +382,22 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session
     return 0;
   }
 
+  @org.apache.thrift.annotation.Nullable
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("SessionData(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("SessionData(");
     boolean first = true;
 
     sb.append("sessionId:");
@@ -466,7 +440,7 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
     } catch (org.apache.thrift.TException te) {
@@ -474,13 +448,13 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session
     }
   }
 
-  private static class SessionDataStandardSchemeFactory implements SchemeFactory {
+  private static class SessionDataStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public SessionDataStandardScheme getScheme() {
       return new SessionDataStandardScheme();
     }
   }
 
-  private static class SessionDataStandardScheme extends StandardScheme<SessionData> {
+  private static class SessionDataStandardScheme extends org.apache.thrift.scheme.StandardScheme<SessionData> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, SessionData struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -552,18 +526,18 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session
 
   }
 
-  private static class SessionDataTupleSchemeFactory implements SchemeFactory {
+  private static class SessionDataTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public SessionDataTupleScheme getScheme() {
       return new SessionDataTupleScheme();
     }
   }
 
-  private static class SessionDataTupleScheme extends TupleScheme<SessionData> {
+  private static class SessionDataTupleScheme extends org.apache.thrift.scheme.TupleScheme<SessionData> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, SessionData struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetSessionId()) {
         optionals.set(0);
       }
@@ -587,8 +561,8 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, SessionData struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(3);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(3);
       if (incoming.get(0)) {
         struct.sessionId = iprot.readString();
         struct.setSessionIdIsSet(true);
@@ -604,5 +578,8 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/ShareMode.java b/src/main/java/org/openslx/bwlp/thrift/iface/ShareMode.java
index 3774f9d..c57583a 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/ShareMode.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/ShareMode.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,10 +7,7 @@
 package org.openslx.bwlp.thrift.iface;
 
 
-import java.util.Map;
-import java.util.HashMap;
-import org.apache.thrift.TEnum;
-
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
 public enum ShareMode implements org.apache.thrift.TEnum {
   LOCAL(0),
   PUBLISH(1),
@@ -34,6 +31,7 @@ public enum ShareMode implements org.apache.thrift.TEnum {
    * Find a the enum type by its integer value, as defined in the Thrift IDL.
    * @return null if the value is not found.
    */
+  @org.apache.thrift.annotation.Nullable
   public static ShareMode findByValue(int value) { 
     switch (value) {
       case 0:
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/SscMode.java b/src/main/java/org/openslx/bwlp/thrift/iface/SscMode.java
index dae1b41..01a0c5c 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/SscMode.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/SscMode.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,10 +7,7 @@
 package org.openslx.bwlp.thrift.iface;
 
 
-import java.util.Map;
-import java.util.HashMap;
-import org.apache.thrift.TEnum;
-
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
 public enum SscMode implements org.apache.thrift.TEnum {
   OFF(0),
   ON(1),
@@ -34,6 +31,7 @@ public enum SscMode implements org.apache.thrift.TEnum {
    * Find a the enum type by its integer value, as defined in the Thrift IDL.
    * @return null if the value is not found.
    */
+  @org.apache.thrift.annotation.Nullable
   public static SscMode findByValue(int value) { 
     switch (value) {
       case 0:
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/TAuthorizationException.java b/src/main/java/org/openslx/bwlp/thrift/iface/TAuthorizationException.java
index 91cce5a..5351640 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/TAuthorizationException.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/TAuthorizationException.java
@@ -1,58 +1,28 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.openslx.bwlp.thrift.iface;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
-public class TAuthorizationException extends TException implements org.apache.thrift.TBase<TAuthorizationException, TAuthorizationException._Fields>, java.io.Serializable, Cloneable, Comparable<TAuthorizationException> {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
+public class TAuthorizationException extends org.apache.thrift.TException implements org.apache.thrift.TBase<TAuthorizationException, TAuthorizationException._Fields>, java.io.Serializable, Cloneable, Comparable<TAuthorizationException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TAuthorizationException");
 
   private static final org.apache.thrift.protocol.TField NUMBER_FIELD_DESC = new org.apache.thrift.protocol.TField("number", org.apache.thrift.protocol.TType.I32, (short)1);
   private static final org.apache.thrift.protocol.TField MESSAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("message", org.apache.thrift.protocol.TType.STRING, (short)2);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TAuthorizationExceptionStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TAuthorizationExceptionTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TAuthorizationExceptionStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TAuthorizationExceptionTupleSchemeFactory();
 
   /**
    * 
    * @see AuthorizationError
    */
-  public AuthorizationError number; // required
-  public String message; // required
+  public @org.apache.thrift.annotation.Nullable AuthorizationError number; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String message; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -63,10 +33,10 @@ public class TAuthorizationException extends TException implements org.apache.th
     NUMBER((short)1, "number"),
     MESSAGE((short)2, "message");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -74,6 +44,7 @@ public class TAuthorizationException extends TException implements org.apache.th
     /**
      * Find the _Fields constant that matches fieldId, or null if its not found.
      */
+    @org.apache.thrift.annotation.Nullable
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
         case 1: // NUMBER
@@ -91,21 +62,22 @@ public class TAuthorizationException extends TException implements org.apache.th
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    @org.apache.thrift.annotation.Nullable
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -114,20 +86,20 @@ public class TAuthorizationException extends TException implements org.apache.th
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.NUMBER, new org.apache.thrift.meta_data.FieldMetaData("number", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, AuthorizationError.class)));
     tmpMap.put(_Fields.MESSAGE, new org.apache.thrift.meta_data.FieldMetaData("message", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TAuthorizationException.class, metaDataMap);
   }
 
@@ -136,7 +108,7 @@ public class TAuthorizationException extends TException implements org.apache.th
 
   public TAuthorizationException(
     AuthorizationError number,
-    String message)
+    java.lang.String message)
   {
     this();
     this.number = number;
@@ -169,6 +141,7 @@ public class TAuthorizationException extends TException implements org.apache.th
    * 
    * @see AuthorizationError
    */
+  @org.apache.thrift.annotation.Nullable
   public AuthorizationError getNumber() {
     return this.number;
   }
@@ -177,7 +150,7 @@ public class TAuthorizationException extends TException implements org.apache.th
    * 
    * @see AuthorizationError
    */
-  public TAuthorizationException setNumber(AuthorizationError number) {
+  public TAuthorizationException setNumber(@org.apache.thrift.annotation.Nullable AuthorizationError number) {
     this.number = number;
     return this;
   }
@@ -197,11 +170,12 @@ public class TAuthorizationException extends TException implements org.apache.th
     }
   }
 
-  public String getMessage() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getMessage() {
     return this.message;
   }
 
-  public TAuthorizationException setMessage(String message) {
+  public TAuthorizationException setMessage(@org.apache.thrift.annotation.Nullable java.lang.String message) {
     this.message = message;
     return this;
   }
@@ -221,7 +195,7 @@ public class TAuthorizationException extends TException implements org.apache.th
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case NUMBER:
       if (value == null) {
@@ -235,14 +209,15 @@ public class TAuthorizationException extends TException implements org.apache.th
       if (value == null) {
         unsetMessage();
       } else {
-        setMessage((String)value);
+        setMessage((java.lang.String)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case NUMBER:
       return getNumber();
@@ -251,13 +226,13 @@ public class TAuthorizationException extends TException implements org.apache.th
       return getMessage();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -266,13 +241,11 @@ public class TAuthorizationException extends TException implements org.apache.th
     case MESSAGE:
       return isSetMessage();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
+  public boolean equals(java.lang.Object that) {
     if (that instanceof TAuthorizationException)
       return this.equals((TAuthorizationException)that);
     return false;
@@ -281,6 +254,8 @@ public class TAuthorizationException extends TException implements org.apache.th
   public boolean equals(TAuthorizationException that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_number = true && this.isSetNumber();
     boolean that_present_number = true && that.isSetNumber();
@@ -305,19 +280,17 @@ public class TAuthorizationException extends TException implements org.apache.th
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_number = true && (isSetNumber());
-    list.add(present_number);
-    if (present_number)
-      list.add(number.getValue());
+    hashCode = hashCode * 8191 + ((isSetNumber()) ? 131071 : 524287);
+    if (isSetNumber())
+      hashCode = hashCode * 8191 + number.getValue();
 
-    boolean present_message = true && (isSetMessage());
-    list.add(present_message);
-    if (present_message)
-      list.add(message);
+    hashCode = hashCode * 8191 + ((isSetMessage()) ? 131071 : 524287);
+    if (isSetMessage())
+      hashCode = hashCode * 8191 + message.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -328,7 +301,7 @@ public class TAuthorizationException extends TException implements org.apache.th
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetNumber()).compareTo(other.isSetNumber());
+    lastComparison = java.lang.Boolean.compare(isSetNumber(), other.isSetNumber());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -338,7 +311,7 @@ public class TAuthorizationException extends TException implements org.apache.th
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(other.isSetMessage());
+    lastComparison = java.lang.Boolean.compare(isSetMessage(), other.isSetMessage());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -351,21 +324,22 @@ public class TAuthorizationException extends TException implements org.apache.th
     return 0;
   }
 
+  @org.apache.thrift.annotation.Nullable
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TAuthorizationException(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TAuthorizationException(");
     boolean first = true;
 
     sb.append("number:");
@@ -400,7 +374,7 @@ public class TAuthorizationException extends TException implements org.apache.th
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
     } catch (org.apache.thrift.TException te) {
@@ -408,13 +382,13 @@ public class TAuthorizationException extends TException implements org.apache.th
     }
   }
 
-  private static class TAuthorizationExceptionStandardSchemeFactory implements SchemeFactory {
+  private static class TAuthorizationExceptionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TAuthorizationExceptionStandardScheme getScheme() {
       return new TAuthorizationExceptionStandardScheme();
     }
   }
 
-  private static class TAuthorizationExceptionStandardScheme extends StandardScheme<TAuthorizationException> {
+  private static class TAuthorizationExceptionStandardScheme extends org.apache.thrift.scheme.StandardScheme<TAuthorizationException> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TAuthorizationException struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -473,18 +447,18 @@ public class TAuthorizationException extends TException implements org.apache.th
 
   }
 
-  private static class TAuthorizationExceptionTupleSchemeFactory implements SchemeFactory {
+  private static class TAuthorizationExceptionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TAuthorizationExceptionTupleScheme getScheme() {
       return new TAuthorizationExceptionTupleScheme();
     }
   }
 
-  private static class TAuthorizationExceptionTupleScheme extends TupleScheme<TAuthorizationException> {
+  private static class TAuthorizationExceptionTupleScheme extends org.apache.thrift.scheme.TupleScheme<TAuthorizationException> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TAuthorizationException struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetNumber()) {
         optionals.set(0);
       }
@@ -502,8 +476,8 @@ public class TAuthorizationException extends TException implements org.apache.th
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TAuthorizationException struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(2);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(2);
       if (incoming.get(0)) {
         struct.number = org.openslx.bwlp.thrift.iface.AuthorizationError.findByValue(iprot.readI32());
         struct.setNumberIsSet(true);
@@ -515,5 +489,8 @@ public class TAuthorizationException extends TException implements org.apache.th
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/TInvalidDateParam.java b/src/main/java/org/openslx/bwlp/thrift/iface/TInvalidDateParam.java
index 4e01fbb..a168994 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/TInvalidDateParam.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/TInvalidDateParam.java
@@ -1,58 +1,28 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.openslx.bwlp.thrift.iface;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
-public class TInvalidDateParam extends TException implements org.apache.thrift.TBase<TInvalidDateParam, TInvalidDateParam._Fields>, java.io.Serializable, Cloneable, Comparable<TInvalidDateParam> {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
+public class TInvalidDateParam extends org.apache.thrift.TException implements org.apache.thrift.TBase<TInvalidDateParam, TInvalidDateParam._Fields>, java.io.Serializable, Cloneable, Comparable<TInvalidDateParam> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TInvalidDateParam");
 
   private static final org.apache.thrift.protocol.TField NUMBER_FIELD_DESC = new org.apache.thrift.protocol.TField("number", org.apache.thrift.protocol.TType.I32, (short)1);
   private static final org.apache.thrift.protocol.TField MESSAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("message", org.apache.thrift.protocol.TType.STRING, (short)2);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TInvalidDateParamStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TInvalidDateParamTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TInvalidDateParamStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TInvalidDateParamTupleSchemeFactory();
 
   /**
    * 
    * @see DateParamError
    */
-  public DateParamError number; // required
-  public String message; // required
+  public @org.apache.thrift.annotation.Nullable DateParamError number; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String message; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -63,10 +33,10 @@ public class TInvalidDateParam extends TException implements org.apache.thrift.T
     NUMBER((short)1, "number"),
     MESSAGE((short)2, "message");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -74,6 +44,7 @@ public class TInvalidDateParam extends TException implements org.apache.thrift.T
     /**
      * Find the _Fields constant that matches fieldId, or null if its not found.
      */
+    @org.apache.thrift.annotation.Nullable
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
         case 1: // NUMBER
@@ -91,21 +62,22 @@ public class TInvalidDateParam extends TException implements org.apache.thrift.T
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    @org.apache.thrift.annotation.Nullable
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -114,20 +86,20 @@ public class TInvalidDateParam extends TException implements org.apache.thrift.T
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.NUMBER, new org.apache.thrift.meta_data.FieldMetaData("number", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, DateParamError.class)));
     tmpMap.put(_Fields.MESSAGE, new org.apache.thrift.meta_data.FieldMetaData("message", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TInvalidDateParam.class, metaDataMap);
   }
 
@@ -136,7 +108,7 @@ public class TInvalidDateParam extends TException implements org.apache.thrift.T
 
   public TInvalidDateParam(
     DateParamError number,
-    String message)
+    java.lang.String message)
   {
     this();
     this.number = number;
@@ -169,6 +141,7 @@ public class TInvalidDateParam extends TException implements org.apache.thrift.T
    * 
    * @see DateParamError
    */
+  @org.apache.thrift.annotation.Nullable
   public DateParamError getNumber() {
     return this.number;
   }
@@ -177,7 +150,7 @@ public class TInvalidDateParam extends TException implements org.apache.thrift.T
    * 
    * @see DateParamError
    */
-  public TInvalidDateParam setNumber(DateParamError number) {
+  public TInvalidDateParam setNumber(@org.apache.thrift.annotation.Nullable DateParamError number) {
     this.number = number;
     return this;
   }
@@ -197,11 +170,12 @@ public class TInvalidDateParam extends TException implements org.apache.thrift.T
     }
   }
 
-  public String getMessage() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getMessage() {
     return this.message;
   }
 
-  public TInvalidDateParam setMessage(String message) {
+  public TInvalidDateParam setMessage(@org.apache.thrift.annotation.Nullable java.lang.String message) {
     this.message = message;
     return this;
   }
@@ -221,7 +195,7 @@ public class TInvalidDateParam extends TException implements org.apache.thrift.T
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case NUMBER:
       if (value == null) {
@@ -235,14 +209,15 @@ public class TInvalidDateParam extends TException implements org.apache.thrift.T
       if (value == null) {
         unsetMessage();
       } else {
-        setMessage((String)value);
+        setMessage((java.lang.String)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case NUMBER:
       return getNumber();
@@ -251,13 +226,13 @@ public class TInvalidDateParam extends TException implements org.apache.thrift.T
       return getMessage();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -266,13 +241,11 @@ public class TInvalidDateParam extends TException implements org.apache.thrift.T
     case MESSAGE:
       return isSetMessage();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
+  public boolean equals(java.lang.Object that) {
     if (that instanceof TInvalidDateParam)
       return this.equals((TInvalidDateParam)that);
     return false;
@@ -281,6 +254,8 @@ public class TInvalidDateParam extends TException implements org.apache.thrift.T
   public boolean equals(TInvalidDateParam that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_number = true && this.isSetNumber();
     boolean that_present_number = true && that.isSetNumber();
@@ -305,19 +280,17 @@ public class TInvalidDateParam extends TException implements org.apache.thrift.T
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_number = true && (isSetNumber());
-    list.add(present_number);
-    if (present_number)
-      list.add(number.getValue());
+    hashCode = hashCode * 8191 + ((isSetNumber()) ? 131071 : 524287);
+    if (isSetNumber())
+      hashCode = hashCode * 8191 + number.getValue();
 
-    boolean present_message = true && (isSetMessage());
-    list.add(present_message);
-    if (present_message)
-      list.add(message);
+    hashCode = hashCode * 8191 + ((isSetMessage()) ? 131071 : 524287);
+    if (isSetMessage())
+      hashCode = hashCode * 8191 + message.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -328,7 +301,7 @@ public class TInvalidDateParam extends TException implements org.apache.thrift.T
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetNumber()).compareTo(other.isSetNumber());
+    lastComparison = java.lang.Boolean.compare(isSetNumber(), other.isSetNumber());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -338,7 +311,7 @@ public class TInvalidDateParam extends TException implements org.apache.thrift.T
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(other.isSetMessage());
+    lastComparison = java.lang.Boolean.compare(isSetMessage(), other.isSetMessage());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -351,21 +324,22 @@ public class TInvalidDateParam extends TException implements org.apache.thrift.T
     return 0;
   }
 
+  @org.apache.thrift.annotation.Nullable
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TInvalidDateParam(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TInvalidDateParam(");
     boolean first = true;
 
     sb.append("number:");
@@ -400,7 +374,7 @@ public class TInvalidDateParam extends TException implements org.apache.thrift.T
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
     } catch (org.apache.thrift.TException te) {
@@ -408,13 +382,13 @@ public class TInvalidDateParam extends TException implements org.apache.thrift.T
     }
   }
 
-  private static class TInvalidDateParamStandardSchemeFactory implements SchemeFactory {
+  private static class TInvalidDateParamStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TInvalidDateParamStandardScheme getScheme() {
       return new TInvalidDateParamStandardScheme();
     }
   }
 
-  private static class TInvalidDateParamStandardScheme extends StandardScheme<TInvalidDateParam> {
+  private static class TInvalidDateParamStandardScheme extends org.apache.thrift.scheme.StandardScheme<TInvalidDateParam> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TInvalidDateParam struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -473,18 +447,18 @@ public class TInvalidDateParam extends TException implements org.apache.thrift.T
 
   }
 
-  private static class TInvalidDateParamTupleSchemeFactory implements SchemeFactory {
+  private static class TInvalidDateParamTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TInvalidDateParamTupleScheme getScheme() {
       return new TInvalidDateParamTupleScheme();
     }
   }
 
-  private static class TInvalidDateParamTupleScheme extends TupleScheme<TInvalidDateParam> {
+  private static class TInvalidDateParamTupleScheme extends org.apache.thrift.scheme.TupleScheme<TInvalidDateParam> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TInvalidDateParam struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetNumber()) {
         optionals.set(0);
       }
@@ -502,8 +476,8 @@ public class TInvalidDateParam extends TException implements org.apache.thrift.T
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TInvalidDateParam struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(2);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(2);
       if (incoming.get(0)) {
         struct.number = org.openslx.bwlp.thrift.iface.DateParamError.findByValue(iprot.readI32());
         struct.setNumberIsSet(true);
@@ -515,5 +489,8 @@ public class TInvalidDateParam extends TException implements org.apache.thrift.T
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/TInvalidTokenException.java b/src/main/java/org/openslx/bwlp/thrift/iface/TInvalidTokenException.java
index 0893444..cd8b66d 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/TInvalidTokenException.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/TInvalidTokenException.java
@@ -1,59 +1,29 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.openslx.bwlp.thrift.iface;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
-public class TInvalidTokenException extends TException implements org.apache.thrift.TBase<TInvalidTokenException, TInvalidTokenException._Fields>, java.io.Serializable, Cloneable, Comparable<TInvalidTokenException> {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
+public class TInvalidTokenException extends org.apache.thrift.TException implements org.apache.thrift.TBase<TInvalidTokenException, TInvalidTokenException._Fields>, java.io.Serializable, Cloneable, Comparable<TInvalidTokenException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TInvalidTokenException");
 
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TInvalidTokenExceptionStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TInvalidTokenExceptionTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TInvalidTokenExceptionStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TInvalidTokenExceptionTupleSchemeFactory();
 
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
 ;
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -61,6 +31,7 @@ public class TInvalidTokenException extends TException implements org.apache.thr
     /**
      * Find the _Fields constant that matches fieldId, or null if its not found.
      */
+    @org.apache.thrift.annotation.Nullable
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
         default:
@@ -74,21 +45,22 @@ public class TInvalidTokenException extends TException implements org.apache.thr
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    @org.apache.thrift.annotation.Nullable
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -97,14 +69,14 @@ public class TInvalidTokenException extends TException implements org.apache.thr
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TInvalidTokenException.class, metaDataMap);
   }
 
@@ -125,32 +97,31 @@ public class TInvalidTokenException extends TException implements org.apache.thr
   public void clear() {
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
+  public boolean equals(java.lang.Object that) {
     if (that instanceof TInvalidTokenException)
       return this.equals((TInvalidTokenException)that);
     return false;
@@ -159,15 +130,17 @@ public class TInvalidTokenException extends TException implements org.apache.thr
   public boolean equals(TInvalidTokenException that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     return true;
   }
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -181,21 +154,22 @@ public class TInvalidTokenException extends TException implements org.apache.thr
     return 0;
   }
 
+  @org.apache.thrift.annotation.Nullable
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TInvalidTokenException(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TInvalidTokenException(");
     boolean first = true;
 
     sb.append(")");
@@ -215,7 +189,7 @@ public class TInvalidTokenException extends TException implements org.apache.thr
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
     } catch (org.apache.thrift.TException te) {
@@ -223,13 +197,13 @@ public class TInvalidTokenException extends TException implements org.apache.thr
     }
   }
 
-  private static class TInvalidTokenExceptionStandardSchemeFactory implements SchemeFactory {
+  private static class TInvalidTokenExceptionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TInvalidTokenExceptionStandardScheme getScheme() {
       return new TInvalidTokenExceptionStandardScheme();
     }
   }
 
-  private static class TInvalidTokenExceptionStandardScheme extends StandardScheme<TInvalidTokenException> {
+  private static class TInvalidTokenExceptionStandardScheme extends org.apache.thrift.scheme.StandardScheme<TInvalidTokenException> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TInvalidTokenException struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -262,24 +236,27 @@ public class TInvalidTokenException extends TException implements org.apache.thr
 
   }
 
-  private static class TInvalidTokenExceptionTupleSchemeFactory implements SchemeFactory {
+  private static class TInvalidTokenExceptionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TInvalidTokenExceptionTupleScheme getScheme() {
       return new TInvalidTokenExceptionTupleScheme();
     }
   }
 
-  private static class TInvalidTokenExceptionTupleScheme extends TupleScheme<TInvalidTokenException> {
+  private static class TInvalidTokenExceptionTupleScheme extends org.apache.thrift.scheme.TupleScheme<TInvalidTokenException> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TInvalidTokenException struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
     }
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TInvalidTokenException struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/TInvocationException.java b/src/main/java/org/openslx/bwlp/thrift/iface/TInvocationException.java
index 3ea824b..da821f1 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/TInvocationException.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/TInvocationException.java
@@ -1,58 +1,28 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.openslx.bwlp.thrift.iface;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
-public class TInvocationException extends TException implements org.apache.thrift.TBase<TInvocationException, TInvocationException._Fields>, java.io.Serializable, Cloneable, Comparable<TInvocationException> {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
+public class TInvocationException extends org.apache.thrift.TException implements org.apache.thrift.TBase<TInvocationException, TInvocationException._Fields>, java.io.Serializable, Cloneable, Comparable<TInvocationException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TInvocationException");
 
   private static final org.apache.thrift.protocol.TField NUMBER_FIELD_DESC = new org.apache.thrift.protocol.TField("number", org.apache.thrift.protocol.TType.I32, (short)1);
   private static final org.apache.thrift.protocol.TField MESSAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("message", org.apache.thrift.protocol.TType.STRING, (short)2);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TInvocationExceptionStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TInvocationExceptionTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TInvocationExceptionStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TInvocationExceptionTupleSchemeFactory();
 
   /**
    * 
    * @see InvocationError
    */
-  public InvocationError number; // required
-  public String message; // required
+  public @org.apache.thrift.annotation.Nullable InvocationError number; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String message; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -63,10 +33,10 @@ public class TInvocationException extends TException implements org.apache.thrif
     NUMBER((short)1, "number"),
     MESSAGE((short)2, "message");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -74,6 +44,7 @@ public class TInvocationException extends TException implements org.apache.thrif
     /**
      * Find the _Fields constant that matches fieldId, or null if its not found.
      */
+    @org.apache.thrift.annotation.Nullable
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
         case 1: // NUMBER
@@ -91,21 +62,22 @@ public class TInvocationException extends TException implements org.apache.thrif
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    @org.apache.thrift.annotation.Nullable
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -114,20 +86,20 @@ public class TInvocationException extends TException implements org.apache.thrif
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.NUMBER, new org.apache.thrift.meta_data.FieldMetaData("number", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, InvocationError.class)));
     tmpMap.put(_Fields.MESSAGE, new org.apache.thrift.meta_data.FieldMetaData("message", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TInvocationException.class, metaDataMap);
   }
 
@@ -136,7 +108,7 @@ public class TInvocationException extends TException implements org.apache.thrif
 
   public TInvocationException(
     InvocationError number,
-    String message)
+    java.lang.String message)
   {
     this();
     this.number = number;
@@ -169,6 +141,7 @@ public class TInvocationException extends TException implements org.apache.thrif
    * 
    * @see InvocationError
    */
+  @org.apache.thrift.annotation.Nullable
   public InvocationError getNumber() {
     return this.number;
   }
@@ -177,7 +150,7 @@ public class TInvocationException extends TException implements org.apache.thrif
    * 
    * @see InvocationError
    */
-  public TInvocationException setNumber(InvocationError number) {
+  public TInvocationException setNumber(@org.apache.thrift.annotation.Nullable InvocationError number) {
     this.number = number;
     return this;
   }
@@ -197,11 +170,12 @@ public class TInvocationException extends TException implements org.apache.thrif
     }
   }
 
-  public String getMessage() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getMessage() {
     return this.message;
   }
 
-  public TInvocationException setMessage(String message) {
+  public TInvocationException setMessage(@org.apache.thrift.annotation.Nullable java.lang.String message) {
     this.message = message;
     return this;
   }
@@ -221,7 +195,7 @@ public class TInvocationException extends TException implements org.apache.thrif
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case NUMBER:
       if (value == null) {
@@ -235,14 +209,15 @@ public class TInvocationException extends TException implements org.apache.thrif
       if (value == null) {
         unsetMessage();
       } else {
-        setMessage((String)value);
+        setMessage((java.lang.String)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case NUMBER:
       return getNumber();
@@ -251,13 +226,13 @@ public class TInvocationException extends TException implements org.apache.thrif
       return getMessage();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -266,13 +241,11 @@ public class TInvocationException extends TException implements org.apache.thrif
     case MESSAGE:
       return isSetMessage();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
+  public boolean equals(java.lang.Object that) {
     if (that instanceof TInvocationException)
       return this.equals((TInvocationException)that);
     return false;
@@ -281,6 +254,8 @@ public class TInvocationException extends TException implements org.apache.thrif
   public boolean equals(TInvocationException that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_number = true && this.isSetNumber();
     boolean that_present_number = true && that.isSetNumber();
@@ -305,19 +280,17 @@ public class TInvocationException extends TException implements org.apache.thrif
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_number = true && (isSetNumber());
-    list.add(present_number);
-    if (present_number)
-      list.add(number.getValue());
+    hashCode = hashCode * 8191 + ((isSetNumber()) ? 131071 : 524287);
+    if (isSetNumber())
+      hashCode = hashCode * 8191 + number.getValue();
 
-    boolean present_message = true && (isSetMessage());
-    list.add(present_message);
-    if (present_message)
-      list.add(message);
+    hashCode = hashCode * 8191 + ((isSetMessage()) ? 131071 : 524287);
+    if (isSetMessage())
+      hashCode = hashCode * 8191 + message.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -328,7 +301,7 @@ public class TInvocationException extends TException implements org.apache.thrif
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetNumber()).compareTo(other.isSetNumber());
+    lastComparison = java.lang.Boolean.compare(isSetNumber(), other.isSetNumber());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -338,7 +311,7 @@ public class TInvocationException extends TException implements org.apache.thrif
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(other.isSetMessage());
+    lastComparison = java.lang.Boolean.compare(isSetMessage(), other.isSetMessage());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -351,21 +324,22 @@ public class TInvocationException extends TException implements org.apache.thrif
     return 0;
   }
 
+  @org.apache.thrift.annotation.Nullable
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TInvocationException(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TInvocationException(");
     boolean first = true;
 
     sb.append("number:");
@@ -400,7 +374,7 @@ public class TInvocationException extends TException implements org.apache.thrif
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
     } catch (org.apache.thrift.TException te) {
@@ -408,13 +382,13 @@ public class TInvocationException extends TException implements org.apache.thrif
     }
   }
 
-  private static class TInvocationExceptionStandardSchemeFactory implements SchemeFactory {
+  private static class TInvocationExceptionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TInvocationExceptionStandardScheme getScheme() {
       return new TInvocationExceptionStandardScheme();
     }
   }
 
-  private static class TInvocationExceptionStandardScheme extends StandardScheme<TInvocationException> {
+  private static class TInvocationExceptionStandardScheme extends org.apache.thrift.scheme.StandardScheme<TInvocationException> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TInvocationException struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -473,18 +447,18 @@ public class TInvocationException extends TException implements org.apache.thrif
 
   }
 
-  private static class TInvocationExceptionTupleSchemeFactory implements SchemeFactory {
+  private static class TInvocationExceptionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TInvocationExceptionTupleScheme getScheme() {
       return new TInvocationExceptionTupleScheme();
     }
   }
 
-  private static class TInvocationExceptionTupleScheme extends TupleScheme<TInvocationException> {
+  private static class TInvocationExceptionTupleScheme extends org.apache.thrift.scheme.TupleScheme<TInvocationException> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TInvocationException struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetNumber()) {
         optionals.set(0);
       }
@@ -502,8 +476,8 @@ public class TInvocationException extends TException implements org.apache.thrif
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TInvocationException struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(2);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(2);
       if (incoming.get(0)) {
         struct.number = org.openslx.bwlp.thrift.iface.InvocationError.findByValue(iprot.readI32());
         struct.setNumberIsSet(true);
@@ -515,5 +489,8 @@ public class TInvocationException extends TException implements org.apache.thrif
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/TNotFoundException.java b/src/main/java/org/openslx/bwlp/thrift/iface/TNotFoundException.java
index 46776e8..b9ae5eb 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/TNotFoundException.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/TNotFoundException.java
@@ -1,61 +1,31 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.openslx.bwlp.thrift.iface;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
-public class TNotFoundException extends TException implements org.apache.thrift.TBase<TNotFoundException, TNotFoundException._Fields>, java.io.Serializable, Cloneable, Comparable<TNotFoundException> {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
+public class TNotFoundException extends org.apache.thrift.TException implements org.apache.thrift.TBase<TNotFoundException, TNotFoundException._Fields>, java.io.Serializable, Cloneable, Comparable<TNotFoundException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TNotFoundException");
 
   private static final org.apache.thrift.protocol.TField MESSAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("message", org.apache.thrift.protocol.TType.STRING, (short)1);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TNotFoundExceptionStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TNotFoundExceptionTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TNotFoundExceptionStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TNotFoundExceptionTupleSchemeFactory();
 
-  public String message; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String message; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     MESSAGE((short)1, "message");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -63,6 +33,7 @@ public class TNotFoundException extends TException implements org.apache.thrift.
     /**
      * Find the _Fields constant that matches fieldId, or null if its not found.
      */
+    @org.apache.thrift.annotation.Nullable
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
         case 1: // MESSAGE
@@ -78,21 +49,22 @@ public class TNotFoundException extends TException implements org.apache.thrift.
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    @org.apache.thrift.annotation.Nullable
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -101,18 +73,18 @@ public class TNotFoundException extends TException implements org.apache.thrift.
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.MESSAGE, new org.apache.thrift.meta_data.FieldMetaData("message", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TNotFoundException.class, metaDataMap);
   }
 
@@ -120,7 +92,7 @@ public class TNotFoundException extends TException implements org.apache.thrift.
   }
 
   public TNotFoundException(
-    String message)
+    java.lang.String message)
   {
     this();
     this.message = message;
@@ -144,11 +116,12 @@ public class TNotFoundException extends TException implements org.apache.thrift.
     this.message = null;
   }
 
-  public String getMessage() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getMessage() {
     return this.message;
   }
 
-  public TNotFoundException setMessage(String message) {
+  public TNotFoundException setMessage(@org.apache.thrift.annotation.Nullable java.lang.String message) {
     this.message = message;
     return this;
   }
@@ -168,45 +141,44 @@ public class TNotFoundException extends TException implements org.apache.thrift.
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case MESSAGE:
       if (value == null) {
         unsetMessage();
       } else {
-        setMessage((String)value);
+        setMessage((java.lang.String)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case MESSAGE:
       return getMessage();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
     case MESSAGE:
       return isSetMessage();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
+  public boolean equals(java.lang.Object that) {
     if (that instanceof TNotFoundException)
       return this.equals((TNotFoundException)that);
     return false;
@@ -215,6 +187,8 @@ public class TNotFoundException extends TException implements org.apache.thrift.
   public boolean equals(TNotFoundException that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_message = true && this.isSetMessage();
     boolean that_present_message = true && that.isSetMessage();
@@ -230,14 +204,13 @@ public class TNotFoundException extends TException implements org.apache.thrift.
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_message = true && (isSetMessage());
-    list.add(present_message);
-    if (present_message)
-      list.add(message);
+    hashCode = hashCode * 8191 + ((isSetMessage()) ? 131071 : 524287);
+    if (isSetMessage())
+      hashCode = hashCode * 8191 + message.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -248,7 +221,7 @@ public class TNotFoundException extends TException implements org.apache.thrift.
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(other.isSetMessage());
+    lastComparison = java.lang.Boolean.compare(isSetMessage(), other.isSetMessage());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -261,21 +234,22 @@ public class TNotFoundException extends TException implements org.apache.thrift.
     return 0;
   }
 
+  @org.apache.thrift.annotation.Nullable
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TNotFoundException(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TNotFoundException(");
     boolean first = true;
 
     sb.append("message:");
@@ -302,7 +276,7 @@ public class TNotFoundException extends TException implements org.apache.thrift.
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
     } catch (org.apache.thrift.TException te) {
@@ -310,13 +284,13 @@ public class TNotFoundException extends TException implements org.apache.thrift.
     }
   }
 
-  private static class TNotFoundExceptionStandardSchemeFactory implements SchemeFactory {
+  private static class TNotFoundExceptionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TNotFoundExceptionStandardScheme getScheme() {
       return new TNotFoundExceptionStandardScheme();
     }
   }
 
-  private static class TNotFoundExceptionStandardScheme extends StandardScheme<TNotFoundException> {
+  private static class TNotFoundExceptionStandardScheme extends org.apache.thrift.scheme.StandardScheme<TNotFoundException> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TNotFoundException struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -362,18 +336,18 @@ public class TNotFoundException extends TException implements org.apache.thrift.
 
   }
 
-  private static class TNotFoundExceptionTupleSchemeFactory implements SchemeFactory {
+  private static class TNotFoundExceptionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TNotFoundExceptionTupleScheme getScheme() {
       return new TNotFoundExceptionTupleScheme();
     }
   }
 
-  private static class TNotFoundExceptionTupleScheme extends TupleScheme<TNotFoundException> {
+  private static class TNotFoundExceptionTupleScheme extends org.apache.thrift.scheme.TupleScheme<TNotFoundException> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TNotFoundException struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetMessage()) {
         optionals.set(0);
       }
@@ -385,8 +359,8 @@ public class TNotFoundException extends TException implements org.apache.thrift.
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TNotFoundException struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(1);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(1);
       if (incoming.get(0)) {
         struct.message = iprot.readString();
         struct.setMessageIsSet(true);
@@ -394,5 +368,8 @@ public class TNotFoundException extends TException implements org.apache.thrift.
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/TTransferRejectedException.java b/src/main/java/org/openslx/bwlp/thrift/iface/TTransferRejectedException.java
index 4ff27b2..441bc8d 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/TTransferRejectedException.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/TTransferRejectedException.java
@@ -1,61 +1,31 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.openslx.bwlp.thrift.iface;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
-public class TTransferRejectedException extends TException implements org.apache.thrift.TBase<TTransferRejectedException, TTransferRejectedException._Fields>, java.io.Serializable, Cloneable, Comparable<TTransferRejectedException> {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
+public class TTransferRejectedException extends org.apache.thrift.TException implements org.apache.thrift.TBase<TTransferRejectedException, TTransferRejectedException._Fields>, java.io.Serializable, Cloneable, Comparable<TTransferRejectedException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TTransferRejectedException");
 
   private static final org.apache.thrift.protocol.TField MESSAGE_FIELD_DESC = new org.apache.thrift.protocol.TField("message", org.apache.thrift.protocol.TType.STRING, (short)1);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TTransferRejectedExceptionStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TTransferRejectedExceptionTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TTransferRejectedExceptionStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TTransferRejectedExceptionTupleSchemeFactory();
 
-  public String message; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String message; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     MESSAGE((short)1, "message");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -63,6 +33,7 @@ public class TTransferRejectedException extends TException implements org.apache
     /**
      * Find the _Fields constant that matches fieldId, or null if its not found.
      */
+    @org.apache.thrift.annotation.Nullable
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
         case 1: // MESSAGE
@@ -78,21 +49,22 @@ public class TTransferRejectedException extends TException implements org.apache
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    @org.apache.thrift.annotation.Nullable
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -101,18 +73,18 @@ public class TTransferRejectedException extends TException implements org.apache
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.MESSAGE, new org.apache.thrift.meta_data.FieldMetaData("message", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TTransferRejectedException.class, metaDataMap);
   }
 
@@ -120,7 +92,7 @@ public class TTransferRejectedException extends TException implements org.apache
   }
 
   public TTransferRejectedException(
-    String message)
+    java.lang.String message)
   {
     this();
     this.message = message;
@@ -144,11 +116,12 @@ public class TTransferRejectedException extends TException implements org.apache
     this.message = null;
   }
 
-  public String getMessage() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getMessage() {
     return this.message;
   }
 
-  public TTransferRejectedException setMessage(String message) {
+  public TTransferRejectedException setMessage(@org.apache.thrift.annotation.Nullable java.lang.String message) {
     this.message = message;
     return this;
   }
@@ -168,45 +141,44 @@ public class TTransferRejectedException extends TException implements org.apache
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case MESSAGE:
       if (value == null) {
         unsetMessage();
       } else {
-        setMessage((String)value);
+        setMessage((java.lang.String)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case MESSAGE:
       return getMessage();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
     case MESSAGE:
       return isSetMessage();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
+  public boolean equals(java.lang.Object that) {
     if (that instanceof TTransferRejectedException)
       return this.equals((TTransferRejectedException)that);
     return false;
@@ -215,6 +187,8 @@ public class TTransferRejectedException extends TException implements org.apache
   public boolean equals(TTransferRejectedException that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_message = true && this.isSetMessage();
     boolean that_present_message = true && that.isSetMessage();
@@ -230,14 +204,13 @@ public class TTransferRejectedException extends TException implements org.apache
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_message = true && (isSetMessage());
-    list.add(present_message);
-    if (present_message)
-      list.add(message);
+    hashCode = hashCode * 8191 + ((isSetMessage()) ? 131071 : 524287);
+    if (isSetMessage())
+      hashCode = hashCode * 8191 + message.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -248,7 +221,7 @@ public class TTransferRejectedException extends TException implements org.apache
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(other.isSetMessage());
+    lastComparison = java.lang.Boolean.compare(isSetMessage(), other.isSetMessage());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -261,21 +234,22 @@ public class TTransferRejectedException extends TException implements org.apache
     return 0;
   }
 
+  @org.apache.thrift.annotation.Nullable
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TTransferRejectedException(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TTransferRejectedException(");
     boolean first = true;
 
     sb.append("message:");
@@ -302,7 +276,7 @@ public class TTransferRejectedException extends TException implements org.apache
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
     } catch (org.apache.thrift.TException te) {
@@ -310,13 +284,13 @@ public class TTransferRejectedException extends TException implements org.apache
     }
   }
 
-  private static class TTransferRejectedExceptionStandardSchemeFactory implements SchemeFactory {
+  private static class TTransferRejectedExceptionStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TTransferRejectedExceptionStandardScheme getScheme() {
       return new TTransferRejectedExceptionStandardScheme();
     }
   }
 
-  private static class TTransferRejectedExceptionStandardScheme extends StandardScheme<TTransferRejectedException> {
+  private static class TTransferRejectedExceptionStandardScheme extends org.apache.thrift.scheme.StandardScheme<TTransferRejectedException> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TTransferRejectedException struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -362,18 +336,18 @@ public class TTransferRejectedException extends TException implements org.apache
 
   }
 
-  private static class TTransferRejectedExceptionTupleSchemeFactory implements SchemeFactory {
+  private static class TTransferRejectedExceptionTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TTransferRejectedExceptionTupleScheme getScheme() {
       return new TTransferRejectedExceptionTupleScheme();
     }
   }
 
-  private static class TTransferRejectedExceptionTupleScheme extends TupleScheme<TTransferRejectedException> {
+  private static class TTransferRejectedExceptionTupleScheme extends org.apache.thrift.scheme.TupleScheme<TTransferRejectedException> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TTransferRejectedException struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetMessage()) {
         optionals.set(0);
       }
@@ -385,8 +359,8 @@ public class TTransferRejectedException extends TException implements org.apache
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TTransferRejectedException struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(1);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(1);
       if (incoming.get(0)) {
         struct.message = iprot.readString();
         struct.setMessageIsSet(true);
@@ -394,5 +368,8 @@ public class TTransferRejectedException extends TException implements org.apache
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/TransferInformation.java b/src/main/java/org/openslx/bwlp/thrift/iface/TransferInformation.java
index 40d5680..692d3df 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/TransferInformation.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/TransferInformation.java
@@ -1,40 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.openslx.bwlp.thrift.iface;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2017-09-06")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
 public class TransferInformation implements org.apache.thrift.TBase<TransferInformation, TransferInformation._Fields>, java.io.Serializable, Cloneable, Comparable<TransferInformation> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TransferInformation");
 
@@ -44,17 +17,14 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
   private static final org.apache.thrift.protocol.TField BLOCK_HASHES_FIELD_DESC = new org.apache.thrift.protocol.TField("blockHashes", org.apache.thrift.protocol.TType.LIST, (short)4);
   private static final org.apache.thrift.protocol.TField MACHINE_DESCRIPTION_FIELD_DESC = new org.apache.thrift.protocol.TField("machineDescription", org.apache.thrift.protocol.TType.STRING, (short)5);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TransferInformationStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TransferInformationTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TransferInformationStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TransferInformationTupleSchemeFactory();
 
-  public String token; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String token; // required
   public int plainPort; // required
   public int sslPort; // required
-  public List<ByteBuffer> blockHashes; // optional
-  public ByteBuffer machineDescription; // optional
+  public @org.apache.thrift.annotation.Nullable java.util.List<java.nio.ByteBuffer> blockHashes; // optional
+  public @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer machineDescription; // optional
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -64,10 +34,10 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
     BLOCK_HASHES((short)4, "blockHashes"),
     MACHINE_DESCRIPTION((short)5, "machineDescription");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -75,6 +45,7 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
     /**
      * Find the _Fields constant that matches fieldId, or null if its not found.
      */
+    @org.apache.thrift.annotation.Nullable
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
         case 1: // TOKEN
@@ -98,21 +69,22 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    @org.apache.thrift.annotation.Nullable
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -121,7 +93,7 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -131,9 +103,9 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
   private static final int __SSLPORT_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
   private static final _Fields optionals[] = {_Fields.BLOCK_HASHES,_Fields.MACHINE_DESCRIPTION};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.TOKEN, new org.apache.thrift.meta_data.FieldMetaData("token", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , "Token")));
     tmpMap.put(_Fields.PLAIN_PORT, new org.apache.thrift.meta_data.FieldMetaData("plainPort", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -145,7 +117,7 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
             new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING            , true))));
     tmpMap.put(_Fields.MACHINE_DESCRIPTION, new org.apache.thrift.meta_data.FieldMetaData("machineDescription", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , true)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TransferInformation.class, metaDataMap);
   }
 
@@ -153,7 +125,7 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
   }
 
   public TransferInformation(
-    String token,
+    java.lang.String token,
     int plainPort,
     int sslPort)
   {
@@ -176,7 +148,7 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
     this.plainPort = other.plainPort;
     this.sslPort = other.sslPort;
     if (other.isSetBlockHashes()) {
-      List<ByteBuffer> __this__blockHashes = new ArrayList<ByteBuffer>(other.blockHashes);
+      java.util.List<java.nio.ByteBuffer> __this__blockHashes = new java.util.ArrayList<java.nio.ByteBuffer>(other.blockHashes);
       this.blockHashes = __this__blockHashes;
     }
     if (other.isSetMachineDescription()) {
@@ -199,11 +171,12 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
     this.machineDescription = null;
   }
 
-  public String getToken() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getToken() {
     return this.token;
   }
 
-  public TransferInformation setToken(String token) {
+  public TransferInformation setToken(@org.apache.thrift.annotation.Nullable java.lang.String token) {
     this.token = token;
     return this;
   }
@@ -234,16 +207,16 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
   }
 
   public void unsetPlainPort() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __PLAINPORT_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __PLAINPORT_ISSET_ID);
   }
 
   /** Returns true if field plainPort is set (has been assigned a value) and false otherwise */
   public boolean isSetPlainPort() {
-    return EncodingUtils.testBit(__isset_bitfield, __PLAINPORT_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __PLAINPORT_ISSET_ID);
   }
 
   public void setPlainPortIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __PLAINPORT_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __PLAINPORT_ISSET_ID, value);
   }
 
   public int getSslPort() {
@@ -257,38 +230,40 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
   }
 
   public void unsetSslPort() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SSLPORT_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SSLPORT_ISSET_ID);
   }
 
   /** Returns true if field sslPort is set (has been assigned a value) and false otherwise */
   public boolean isSetSslPort() {
-    return EncodingUtils.testBit(__isset_bitfield, __SSLPORT_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SSLPORT_ISSET_ID);
   }
 
   public void setSslPortIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SSLPORT_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SSLPORT_ISSET_ID, value);
   }
 
   public int getBlockHashesSize() {
     return (this.blockHashes == null) ? 0 : this.blockHashes.size();
   }
 
-  public java.util.Iterator<ByteBuffer> getBlockHashesIterator() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.Iterator<java.nio.ByteBuffer> getBlockHashesIterator() {
     return (this.blockHashes == null) ? null : this.blockHashes.iterator();
   }
 
-  public void addToBlockHashes(ByteBuffer elem) {
+  public void addToBlockHashes(java.nio.ByteBuffer elem) {
     if (this.blockHashes == null) {
-      this.blockHashes = new ArrayList<ByteBuffer>();
+      this.blockHashes = new java.util.ArrayList<java.nio.ByteBuffer>();
     }
     this.blockHashes.add(elem);
   }
 
-  public List<ByteBuffer> getBlockHashes() {
+  @org.apache.thrift.annotation.Nullable
+  public java.util.List<java.nio.ByteBuffer> getBlockHashes() {
     return this.blockHashes;
   }
 
-  public TransferInformation setBlockHashes(List<ByteBuffer> blockHashes) {
+  public TransferInformation setBlockHashes(@org.apache.thrift.annotation.Nullable java.util.List<java.nio.ByteBuffer> blockHashes) {
     this.blockHashes = blockHashes;
     return this;
   }
@@ -313,16 +288,16 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
     return machineDescription == null ? null : machineDescription.array();
   }
 
-  public ByteBuffer bufferForMachineDescription() {
+  public java.nio.ByteBuffer bufferForMachineDescription() {
     return org.apache.thrift.TBaseHelper.copyBinary(machineDescription);
   }
 
   public TransferInformation setMachineDescription(byte[] machineDescription) {
-    this.machineDescription = machineDescription == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(machineDescription, machineDescription.length));
+    this.machineDescription = machineDescription == null ? (java.nio.ByteBuffer)null   : java.nio.ByteBuffer.wrap(machineDescription.clone());
     return this;
   }
 
-  public TransferInformation setMachineDescription(ByteBuffer machineDescription) {
+  public TransferInformation setMachineDescription(@org.apache.thrift.annotation.Nullable java.nio.ByteBuffer machineDescription) {
     this.machineDescription = org.apache.thrift.TBaseHelper.copyBinary(machineDescription);
     return this;
   }
@@ -342,13 +317,13 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case TOKEN:
       if (value == null) {
         unsetToken();
       } else {
-        setToken((String)value);
+        setToken((java.lang.String)value);
       }
       break;
 
@@ -356,7 +331,7 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
       if (value == null) {
         unsetPlainPort();
       } else {
-        setPlainPort((Integer)value);
+        setPlainPort((java.lang.Integer)value);
       }
       break;
 
@@ -364,7 +339,7 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
       if (value == null) {
         unsetSslPort();
       } else {
-        setSslPort((Integer)value);
+        setSslPort((java.lang.Integer)value);
       }
       break;
 
@@ -372,7 +347,7 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
       if (value == null) {
         unsetBlockHashes();
       } else {
-        setBlockHashes((List<ByteBuffer>)value);
+        setBlockHashes((java.util.List<java.nio.ByteBuffer>)value);
       }
       break;
 
@@ -380,14 +355,19 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
       if (value == null) {
         unsetMachineDescription();
       } else {
-        setMachineDescription((ByteBuffer)value);
+        if (value instanceof byte[]) {
+          setMachineDescription((byte[])value);
+        } else {
+          setMachineDescription((java.nio.ByteBuffer)value);
+        }
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case TOKEN:
       return getToken();
@@ -405,13 +385,13 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
       return getMachineDescription();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -426,13 +406,11 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
     case MACHINE_DESCRIPTION:
       return isSetMachineDescription();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
+  public boolean equals(java.lang.Object that) {
     if (that instanceof TransferInformation)
       return this.equals((TransferInformation)that);
     return false;
@@ -441,6 +419,8 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
   public boolean equals(TransferInformation that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_token = true && this.isSetToken();
     boolean that_present_token = true && that.isSetToken();
@@ -492,34 +472,25 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_token = true && (isSetToken());
-    list.add(present_token);
-    if (present_token)
-      list.add(token);
+    hashCode = hashCode * 8191 + ((isSetToken()) ? 131071 : 524287);
+    if (isSetToken())
+      hashCode = hashCode * 8191 + token.hashCode();
 
-    boolean present_plainPort = true;
-    list.add(present_plainPort);
-    if (present_plainPort)
-      list.add(plainPort);
+    hashCode = hashCode * 8191 + plainPort;
 
-    boolean present_sslPort = true;
-    list.add(present_sslPort);
-    if (present_sslPort)
-      list.add(sslPort);
+    hashCode = hashCode * 8191 + sslPort;
 
-    boolean present_blockHashes = true && (isSetBlockHashes());
-    list.add(present_blockHashes);
-    if (present_blockHashes)
-      list.add(blockHashes);
+    hashCode = hashCode * 8191 + ((isSetBlockHashes()) ? 131071 : 524287);
+    if (isSetBlockHashes())
+      hashCode = hashCode * 8191 + blockHashes.hashCode();
 
-    boolean present_machineDescription = true && (isSetMachineDescription());
-    list.add(present_machineDescription);
-    if (present_machineDescription)
-      list.add(machineDescription);
+    hashCode = hashCode * 8191 + ((isSetMachineDescription()) ? 131071 : 524287);
+    if (isSetMachineDescription())
+      hashCode = hashCode * 8191 + machineDescription.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -530,7 +501,7 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken());
+    lastComparison = java.lang.Boolean.compare(isSetToken(), other.isSetToken());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -540,7 +511,7 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetPlainPort()).compareTo(other.isSetPlainPort());
+    lastComparison = java.lang.Boolean.compare(isSetPlainPort(), other.isSetPlainPort());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -550,7 +521,7 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetSslPort()).compareTo(other.isSetSslPort());
+    lastComparison = java.lang.Boolean.compare(isSetSslPort(), other.isSetSslPort());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -560,7 +531,7 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetBlockHashes()).compareTo(other.isSetBlockHashes());
+    lastComparison = java.lang.Boolean.compare(isSetBlockHashes(), other.isSetBlockHashes());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -570,7 +541,7 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMachineDescription()).compareTo(other.isSetMachineDescription());
+    lastComparison = java.lang.Boolean.compare(isSetMachineDescription(), other.isSetMachineDescription());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -583,21 +554,22 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
     return 0;
   }
 
+  @org.apache.thrift.annotation.Nullable
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TransferInformation(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TransferInformation(");
     boolean first = true;
 
     sb.append("token:");
@@ -652,7 +624,7 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -662,13 +634,13 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
     }
   }
 
-  private static class TransferInformationStandardSchemeFactory implements SchemeFactory {
+  private static class TransferInformationStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TransferInformationStandardScheme getScheme() {
       return new TransferInformationStandardScheme();
     }
   }
 
-  private static class TransferInformationStandardScheme extends StandardScheme<TransferInformation> {
+  private static class TransferInformationStandardScheme extends org.apache.thrift.scheme.StandardScheme<TransferInformation> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TransferInformation struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -707,13 +679,13 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
           case 4: // BLOCK_HASHES
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list178 = iprot.readListBegin();
-                struct.blockHashes = new ArrayList<ByteBuffer>(_list178.size);
-                ByteBuffer _elem179;
-                for (int _i180 = 0; _i180 < _list178.size; ++_i180)
+                org.apache.thrift.protocol.TList _list290 = iprot.readListBegin();
+                struct.blockHashes = new java.util.ArrayList<java.nio.ByteBuffer>(_list290.size);
+                @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer _elem291;
+                for (int _i292 = 0; _i292 < _list290.size; ++_i292)
                 {
-                  _elem179 = iprot.readBinary();
-                  struct.blockHashes.add(_elem179);
+                  _elem291 = iprot.readBinary();
+                  struct.blockHashes.add(_elem291);
                 }
                 iprot.readListEnd();
               }
@@ -761,9 +733,9 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
           oprot.writeFieldBegin(BLOCK_HASHES_FIELD_DESC);
           {
             oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.blockHashes.size()));
-            for (ByteBuffer _iter181 : struct.blockHashes)
+            for (java.nio.ByteBuffer _iter293 : struct.blockHashes)
             {
-              oprot.writeBinary(_iter181);
+              oprot.writeBinary(_iter293);
             }
             oprot.writeListEnd();
           }
@@ -783,18 +755,18 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
 
   }
 
-  private static class TransferInformationTupleSchemeFactory implements SchemeFactory {
+  private static class TransferInformationTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TransferInformationTupleScheme getScheme() {
       return new TransferInformationTupleScheme();
     }
   }
 
-  private static class TransferInformationTupleScheme extends TupleScheme<TransferInformation> {
+  private static class TransferInformationTupleScheme extends org.apache.thrift.scheme.TupleScheme<TransferInformation> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TransferInformation struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetToken()) {
         optionals.set(0);
       }
@@ -823,9 +795,9 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
       if (struct.isSetBlockHashes()) {
         {
           oprot.writeI32(struct.blockHashes.size());
-          for (ByteBuffer _iter182 : struct.blockHashes)
+          for (java.nio.ByteBuffer _iter294 : struct.blockHashes)
           {
-            oprot.writeBinary(_iter182);
+            oprot.writeBinary(_iter294);
           }
         }
       }
@@ -836,8 +808,8 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TransferInformation struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(5);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(5);
       if (incoming.get(0)) {
         struct.token = iprot.readString();
         struct.setTokenIsSet(true);
@@ -852,13 +824,13 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
       }
       if (incoming.get(3)) {
         {
-          org.apache.thrift.protocol.TList _list183 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.blockHashes = new ArrayList<ByteBuffer>(_list183.size);
-          ByteBuffer _elem184;
-          for (int _i185 = 0; _i185 < _list183.size; ++_i185)
+          org.apache.thrift.protocol.TList _list295 = iprot.readListBegin(org.apache.thrift.protocol.TType.STRING);
+          struct.blockHashes = new java.util.ArrayList<java.nio.ByteBuffer>(_list295.size);
+          @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer _elem296;
+          for (int _i297 = 0; _i297 < _list295.size; ++_i297)
           {
-            _elem184 = iprot.readBinary();
-            struct.blockHashes.add(_elem184);
+            _elem296 = iprot.readBinary();
+            struct.blockHashes.add(_elem296);
           }
         }
         struct.setBlockHashesIsSet(true);
@@ -870,5 +842,8 @@ public class TransferInformation implements org.apache.thrift.TBase<TransferInfo
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/TransferState.java b/src/main/java/org/openslx/bwlp/thrift/iface/TransferState.java
index 972c6c0..80301e6 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/TransferState.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/TransferState.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -7,10 +7,7 @@
 package org.openslx.bwlp.thrift.iface;
 
 
-import java.util.Map;
-import java.util.HashMap;
-import org.apache.thrift.TEnum;
-
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
 public enum TransferState implements org.apache.thrift.TEnum {
   IDLE(0),
   WORKING(1),
@@ -34,6 +31,7 @@ public enum TransferState implements org.apache.thrift.TEnum {
    * Find a the enum type by its integer value, as defined in the Thrift IDL.
    * @return null if the value is not found.
    */
+  @org.apache.thrift.annotation.Nullable
   public static TransferState findByValue(int value) { 
     switch (value) {
       case 0:
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/TransferStatus.java b/src/main/java/org/openslx/bwlp/thrift/iface/TransferStatus.java
index 986e27d..c643e34 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/TransferStatus.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/TransferStatus.java
@@ -1,58 +1,28 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.openslx.bwlp.thrift.iface;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
 public class TransferStatus implements org.apache.thrift.TBase<TransferStatus, TransferStatus._Fields>, java.io.Serializable, Cloneable, Comparable<TransferStatus> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TransferStatus");
 
   private static final org.apache.thrift.protocol.TField BLOCK_STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("blockStatus", org.apache.thrift.protocol.TType.STRING, (short)1);
   private static final org.apache.thrift.protocol.TField STATE_FIELD_DESC = new org.apache.thrift.protocol.TField("state", org.apache.thrift.protocol.TType.I32, (short)2);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new TransferStatusStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new TransferStatusTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TransferStatusStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TransferStatusTupleSchemeFactory();
 
-  public ByteBuffer blockStatus; // required
+  public @org.apache.thrift.annotation.Nullable java.nio.ByteBuffer blockStatus; // required
   /**
    * 
    * @see TransferState
    */
-  public TransferState state; // required
+  public @org.apache.thrift.annotation.Nullable TransferState state; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -63,10 +33,10 @@ public class TransferStatus implements org.apache.thrift.TBase<TransferStatus, T
      */
     STATE((short)2, "state");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -74,6 +44,7 @@ public class TransferStatus implements org.apache.thrift.TBase<TransferStatus, T
     /**
      * Find the _Fields constant that matches fieldId, or null if its not found.
      */
+    @org.apache.thrift.annotation.Nullable
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
         case 1: // BLOCK_STATUS
@@ -91,21 +62,22 @@ public class TransferStatus implements org.apache.thrift.TBase<TransferStatus, T
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    @org.apache.thrift.annotation.Nullable
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -114,20 +86,20 @@ public class TransferStatus implements org.apache.thrift.TBase<TransferStatus, T
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.BLOCK_STATUS, new org.apache.thrift.meta_data.FieldMetaData("blockStatus", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , true)));
     tmpMap.put(_Fields.STATE, new org.apache.thrift.meta_data.FieldMetaData("state", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, TransferState.class)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TransferStatus.class, metaDataMap);
   }
 
@@ -135,7 +107,7 @@ public class TransferStatus implements org.apache.thrift.TBase<TransferStatus, T
   }
 
   public TransferStatus(
-    ByteBuffer blockStatus,
+    java.nio.ByteBuffer blockStatus,
     TransferState state)
   {
     this();
@@ -170,16 +142,16 @@ public class TransferStatus implements org.apache.thrift.TBase<TransferStatus, T
     return blockStatus == null ? null : blockStatus.array();
   }
 
-  public ByteBuffer bufferForBlockStatus() {
+  public java.nio.ByteBuffer bufferForBlockStatus() {
     return org.apache.thrift.TBaseHelper.copyBinary(blockStatus);
   }
 
   public TransferStatus setBlockStatus(byte[] blockStatus) {
-    this.blockStatus = blockStatus == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(blockStatus, blockStatus.length));
+    this.blockStatus = blockStatus == null ? (java.nio.ByteBuffer)null   : java.nio.ByteBuffer.wrap(blockStatus.clone());
     return this;
   }
 
-  public TransferStatus setBlockStatus(ByteBuffer blockStatus) {
+  public TransferStatus setBlockStatus(@org.apache.thrift.annotation.Nullable java.nio.ByteBuffer blockStatus) {
     this.blockStatus = org.apache.thrift.TBaseHelper.copyBinary(blockStatus);
     return this;
   }
@@ -203,6 +175,7 @@ public class TransferStatus implements org.apache.thrift.TBase<TransferStatus, T
    * 
    * @see TransferState
    */
+  @org.apache.thrift.annotation.Nullable
   public TransferState getState() {
     return this.state;
   }
@@ -211,7 +184,7 @@ public class TransferStatus implements org.apache.thrift.TBase<TransferStatus, T
    * 
    * @see TransferState
    */
-  public TransferStatus setState(TransferState state) {
+  public TransferStatus setState(@org.apache.thrift.annotation.Nullable TransferState state) {
     this.state = state;
     return this;
   }
@@ -231,13 +204,17 @@ public class TransferStatus implements org.apache.thrift.TBase<TransferStatus, T
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case BLOCK_STATUS:
       if (value == null) {
         unsetBlockStatus();
       } else {
-        setBlockStatus((ByteBuffer)value);
+        if (value instanceof byte[]) {
+          setBlockStatus((byte[])value);
+        } else {
+          setBlockStatus((java.nio.ByteBuffer)value);
+        }
       }
       break;
 
@@ -252,7 +229,8 @@ public class TransferStatus implements org.apache.thrift.TBase<TransferStatus, T
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case BLOCK_STATUS:
       return getBlockStatus();
@@ -261,13 +239,13 @@ public class TransferStatus implements org.apache.thrift.TBase<TransferStatus, T
       return getState();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -276,13 +254,11 @@ public class TransferStatus implements org.apache.thrift.TBase<TransferStatus, T
     case STATE:
       return isSetState();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
+  public boolean equals(java.lang.Object that) {
     if (that instanceof TransferStatus)
       return this.equals((TransferStatus)that);
     return false;
@@ -291,6 +267,8 @@ public class TransferStatus implements org.apache.thrift.TBase<TransferStatus, T
   public boolean equals(TransferStatus that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_blockStatus = true && this.isSetBlockStatus();
     boolean that_present_blockStatus = true && that.isSetBlockStatus();
@@ -315,19 +293,17 @@ public class TransferStatus implements org.apache.thrift.TBase<TransferStatus, T
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_blockStatus = true && (isSetBlockStatus());
-    list.add(present_blockStatus);
-    if (present_blockStatus)
-      list.add(blockStatus);
+    hashCode = hashCode * 8191 + ((isSetBlockStatus()) ? 131071 : 524287);
+    if (isSetBlockStatus())
+      hashCode = hashCode * 8191 + blockStatus.hashCode();
 
-    boolean present_state = true && (isSetState());
-    list.add(present_state);
-    if (present_state)
-      list.add(state.getValue());
+    hashCode = hashCode * 8191 + ((isSetState()) ? 131071 : 524287);
+    if (isSetState())
+      hashCode = hashCode * 8191 + state.getValue();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -338,7 +314,7 @@ public class TransferStatus implements org.apache.thrift.TBase<TransferStatus, T
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetBlockStatus()).compareTo(other.isSetBlockStatus());
+    lastComparison = java.lang.Boolean.compare(isSetBlockStatus(), other.isSetBlockStatus());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -348,7 +324,7 @@ public class TransferStatus implements org.apache.thrift.TBase<TransferStatus, T
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetState()).compareTo(other.isSetState());
+    lastComparison = java.lang.Boolean.compare(isSetState(), other.isSetState());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -361,21 +337,22 @@ public class TransferStatus implements org.apache.thrift.TBase<TransferStatus, T
     return 0;
   }
 
+  @org.apache.thrift.annotation.Nullable
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("TransferStatus(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("TransferStatus(");
     boolean first = true;
 
     sb.append("blockStatus:");
@@ -410,7 +387,7 @@ public class TransferStatus implements org.apache.thrift.TBase<TransferStatus, T
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
     } catch (org.apache.thrift.TException te) {
@@ -418,13 +395,13 @@ public class TransferStatus implements org.apache.thrift.TBase<TransferStatus, T
     }
   }
 
-  private static class TransferStatusStandardSchemeFactory implements SchemeFactory {
+  private static class TransferStatusStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TransferStatusStandardScheme getScheme() {
       return new TransferStatusStandardScheme();
     }
   }
 
-  private static class TransferStatusStandardScheme extends StandardScheme<TransferStatus> {
+  private static class TransferStatusStandardScheme extends org.apache.thrift.scheme.StandardScheme<TransferStatus> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, TransferStatus struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -483,18 +460,18 @@ public class TransferStatus implements org.apache.thrift.TBase<TransferStatus, T
 
   }
 
-  private static class TransferStatusTupleSchemeFactory implements SchemeFactory {
+  private static class TransferStatusTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public TransferStatusTupleScheme getScheme() {
       return new TransferStatusTupleScheme();
     }
   }
 
-  private static class TransferStatusTupleScheme extends TupleScheme<TransferStatus> {
+  private static class TransferStatusTupleScheme extends org.apache.thrift.scheme.TupleScheme<TransferStatus> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, TransferStatus struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetBlockStatus()) {
         optionals.set(0);
       }
@@ -512,8 +489,8 @@ public class TransferStatus implements org.apache.thrift.TBase<TransferStatus, T
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, TransferStatus struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(2);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(2);
       if (incoming.get(0)) {
         struct.blockStatus = iprot.readBinary();
         struct.setBlockStatusIsSet(true);
@@ -525,5 +502,8 @@ public class TransferStatus implements org.apache.thrift.TBase<TransferStatus, T
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/UploadOptions.java b/src/main/java/org/openslx/bwlp/thrift/iface/UploadOptions.java
index 3a36fce..5d80c14 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/UploadOptions.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/UploadOptions.java
@@ -1,50 +1,20 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.openslx.bwlp.thrift.iface;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2018-05-11")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
 public class UploadOptions implements org.apache.thrift.TBase<UploadOptions, UploadOptions._Fields>, java.io.Serializable, Cloneable, Comparable<UploadOptions> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UploadOptions");
 
   private static final org.apache.thrift.protocol.TField SERVER_SIDE_COPYING_FIELD_DESC = new org.apache.thrift.protocol.TField("serverSideCopying", org.apache.thrift.protocol.TType.BOOL, (short)1);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new UploadOptionsStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new UploadOptionsTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new UploadOptionsStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new UploadOptionsTupleSchemeFactory();
 
   public boolean serverSideCopying; // required
 
@@ -52,10 +22,10 @@ public class UploadOptions implements org.apache.thrift.TBase<UploadOptions, Upl
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     SERVER_SIDE_COPYING((short)1, "serverSideCopying");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -63,6 +33,7 @@ public class UploadOptions implements org.apache.thrift.TBase<UploadOptions, Upl
     /**
      * Find the _Fields constant that matches fieldId, or null if its not found.
      */
+    @org.apache.thrift.annotation.Nullable
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
         case 1: // SERVER_SIDE_COPYING
@@ -78,21 +49,22 @@ public class UploadOptions implements org.apache.thrift.TBase<UploadOptions, Upl
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    @org.apache.thrift.annotation.Nullable
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -101,7 +73,7 @@ public class UploadOptions implements org.apache.thrift.TBase<UploadOptions, Upl
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -109,12 +81,12 @@ public class UploadOptions implements org.apache.thrift.TBase<UploadOptions, Upl
   // isset id assignments
   private static final int __SERVERSIDECOPYING_ISSET_ID = 0;
   private byte __isset_bitfield = 0;
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.SERVER_SIDE_COPYING, new org.apache.thrift.meta_data.FieldMetaData("serverSideCopying", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(UploadOptions.class, metaDataMap);
   }
 
@@ -158,57 +130,56 @@ public class UploadOptions implements org.apache.thrift.TBase<UploadOptions, Upl
   }
 
   public void unsetServerSideCopying() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SERVERSIDECOPYING_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __SERVERSIDECOPYING_ISSET_ID);
   }
 
   /** Returns true if field serverSideCopying is set (has been assigned a value) and false otherwise */
   public boolean isSetServerSideCopying() {
-    return EncodingUtils.testBit(__isset_bitfield, __SERVERSIDECOPYING_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __SERVERSIDECOPYING_ISSET_ID);
   }
 
   public void setServerSideCopyingIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SERVERSIDECOPYING_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __SERVERSIDECOPYING_ISSET_ID, value);
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case SERVER_SIDE_COPYING:
       if (value == null) {
         unsetServerSideCopying();
       } else {
-        setServerSideCopying((Boolean)value);
+        setServerSideCopying((java.lang.Boolean)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case SERVER_SIDE_COPYING:
       return isServerSideCopying();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
     case SERVER_SIDE_COPYING:
       return isSetServerSideCopying();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
+  public boolean equals(java.lang.Object that) {
     if (that instanceof UploadOptions)
       return this.equals((UploadOptions)that);
     return false;
@@ -217,6 +188,8 @@ public class UploadOptions implements org.apache.thrift.TBase<UploadOptions, Upl
   public boolean equals(UploadOptions that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_serverSideCopying = true;
     boolean that_present_serverSideCopying = true;
@@ -232,14 +205,11 @@ public class UploadOptions implements org.apache.thrift.TBase<UploadOptions, Upl
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_serverSideCopying = true;
-    list.add(present_serverSideCopying);
-    if (present_serverSideCopying)
-      list.add(serverSideCopying);
+    hashCode = hashCode * 8191 + ((serverSideCopying) ? 131071 : 524287);
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -250,7 +220,7 @@ public class UploadOptions implements org.apache.thrift.TBase<UploadOptions, Upl
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetServerSideCopying()).compareTo(other.isSetServerSideCopying());
+    lastComparison = java.lang.Boolean.compare(isSetServerSideCopying(), other.isSetServerSideCopying());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -263,21 +233,22 @@ public class UploadOptions implements org.apache.thrift.TBase<UploadOptions, Upl
     return 0;
   }
 
+  @org.apache.thrift.annotation.Nullable
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("UploadOptions(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("UploadOptions(");
     boolean first = true;
 
     sb.append("serverSideCopying:");
@@ -300,7 +271,7 @@ public class UploadOptions implements org.apache.thrift.TBase<UploadOptions, Upl
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -310,13 +281,13 @@ public class UploadOptions implements org.apache.thrift.TBase<UploadOptions, Upl
     }
   }
 
-  private static class UploadOptionsStandardSchemeFactory implements SchemeFactory {
+  private static class UploadOptionsStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public UploadOptionsStandardScheme getScheme() {
       return new UploadOptionsStandardScheme();
     }
   }
 
-  private static class UploadOptionsStandardScheme extends StandardScheme<UploadOptions> {
+  private static class UploadOptionsStandardScheme extends org.apache.thrift.scheme.StandardScheme<UploadOptions> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, UploadOptions struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -360,18 +331,18 @@ public class UploadOptions implements org.apache.thrift.TBase<UploadOptions, Upl
 
   }
 
-  private static class UploadOptionsTupleSchemeFactory implements SchemeFactory {
+  private static class UploadOptionsTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public UploadOptionsTupleScheme getScheme() {
       return new UploadOptionsTupleScheme();
     }
   }
 
-  private static class UploadOptionsTupleScheme extends TupleScheme<UploadOptions> {
+  private static class UploadOptionsTupleScheme extends org.apache.thrift.scheme.TupleScheme<UploadOptions> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, UploadOptions struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetServerSideCopying()) {
         optionals.set(0);
       }
@@ -383,8 +354,8 @@ public class UploadOptions implements org.apache.thrift.TBase<UploadOptions, Upl
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, UploadOptions struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(1);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(1);
       if (incoming.get(0)) {
         struct.serverSideCopying = iprot.readBool();
         struct.setServerSideCopyingIsSet(true);
@@ -392,5 +363,8 @@ public class UploadOptions implements org.apache.thrift.TBase<UploadOptions, Upl
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/UserInfo.java b/src/main/java/org/openslx/bwlp/thrift/iface/UserInfo.java
index ced8149..04a0f3c 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/UserInfo.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/UserInfo.java
@@ -1,40 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.openslx.bwlp.thrift.iface;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
 public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fields>, java.io.Serializable, Cloneable, Comparable<UserInfo> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UserInfo");
 
@@ -45,22 +18,19 @@ public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fie
   private static final org.apache.thrift.protocol.TField ORGANIZATION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("organizationId", org.apache.thrift.protocol.TType.STRING, (short)5);
   private static final org.apache.thrift.protocol.TField ROLE_FIELD_DESC = new org.apache.thrift.protocol.TField("role", org.apache.thrift.protocol.TType.I32, (short)6);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new UserInfoStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new UserInfoTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new UserInfoStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new UserInfoTupleSchemeFactory();
 
-  public String userId; // required
-  public String firstName; // required
-  public String lastName; // required
-  public String eMail; // required
-  public String organizationId; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String userId; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String firstName; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String lastName; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String eMail; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String organizationId; // required
   /**
    * 
    * @see Role
    */
-  public Role role; // optional
+  public @org.apache.thrift.annotation.Nullable Role role; // optional
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -75,10 +45,10 @@ public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fie
      */
     ROLE((short)6, "role");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -86,6 +56,7 @@ public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fie
     /**
      * Find the _Fields constant that matches fieldId, or null if its not found.
      */
+    @org.apache.thrift.annotation.Nullable
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
         case 1: // USER_ID
@@ -111,21 +82,22 @@ public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fie
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    @org.apache.thrift.annotation.Nullable
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -134,16 +106,16 @@ public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fie
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
   private static final _Fields optionals[] = {_Fields.ROLE};
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.USER_ID, new org.apache.thrift.meta_data.FieldMetaData("userId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.FIRST_NAME, new org.apache.thrift.meta_data.FieldMetaData("firstName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -156,7 +128,7 @@ public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fie
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.ROLE, new org.apache.thrift.meta_data.FieldMetaData("role", org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, Role.class)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(UserInfo.class, metaDataMap);
   }
 
@@ -164,11 +136,11 @@ public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fie
   }
 
   public UserInfo(
-    String userId,
-    String firstName,
-    String lastName,
-    String eMail,
-    String organizationId)
+    java.lang.String userId,
+    java.lang.String firstName,
+    java.lang.String lastName,
+    java.lang.String eMail,
+    java.lang.String organizationId)
   {
     this();
     this.userId = userId;
@@ -216,11 +188,12 @@ public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fie
     this.role = null;
   }
 
-  public String getUserId() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getUserId() {
     return this.userId;
   }
 
-  public UserInfo setUserId(String userId) {
+  public UserInfo setUserId(@org.apache.thrift.annotation.Nullable java.lang.String userId) {
     this.userId = userId;
     return this;
   }
@@ -240,11 +213,12 @@ public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fie
     }
   }
 
-  public String getFirstName() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getFirstName() {
     return this.firstName;
   }
 
-  public UserInfo setFirstName(String firstName) {
+  public UserInfo setFirstName(@org.apache.thrift.annotation.Nullable java.lang.String firstName) {
     this.firstName = firstName;
     return this;
   }
@@ -264,11 +238,12 @@ public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fie
     }
   }
 
-  public String getLastName() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getLastName() {
     return this.lastName;
   }
 
-  public UserInfo setLastName(String lastName) {
+  public UserInfo setLastName(@org.apache.thrift.annotation.Nullable java.lang.String lastName) {
     this.lastName = lastName;
     return this;
   }
@@ -288,11 +263,12 @@ public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fie
     }
   }
 
-  public String getEMail() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getEMail() {
     return this.eMail;
   }
 
-  public UserInfo setEMail(String eMail) {
+  public UserInfo setEMail(@org.apache.thrift.annotation.Nullable java.lang.String eMail) {
     this.eMail = eMail;
     return this;
   }
@@ -312,11 +288,12 @@ public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fie
     }
   }
 
-  public String getOrganizationId() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getOrganizationId() {
     return this.organizationId;
   }
 
-  public UserInfo setOrganizationId(String organizationId) {
+  public UserInfo setOrganizationId(@org.apache.thrift.annotation.Nullable java.lang.String organizationId) {
     this.organizationId = organizationId;
     return this;
   }
@@ -340,6 +317,7 @@ public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fie
    * 
    * @see Role
    */
+  @org.apache.thrift.annotation.Nullable
   public Role getRole() {
     return this.role;
   }
@@ -348,7 +326,7 @@ public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fie
    * 
    * @see Role
    */
-  public UserInfo setRole(Role role) {
+  public UserInfo setRole(@org.apache.thrift.annotation.Nullable Role role) {
     this.role = role;
     return this;
   }
@@ -368,13 +346,13 @@ public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fie
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case USER_ID:
       if (value == null) {
         unsetUserId();
       } else {
-        setUserId((String)value);
+        setUserId((java.lang.String)value);
       }
       break;
 
@@ -382,7 +360,7 @@ public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fie
       if (value == null) {
         unsetFirstName();
       } else {
-        setFirstName((String)value);
+        setFirstName((java.lang.String)value);
       }
       break;
 
@@ -390,7 +368,7 @@ public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fie
       if (value == null) {
         unsetLastName();
       } else {
-        setLastName((String)value);
+        setLastName((java.lang.String)value);
       }
       break;
 
@@ -398,7 +376,7 @@ public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fie
       if (value == null) {
         unsetEMail();
       } else {
-        setEMail((String)value);
+        setEMail((java.lang.String)value);
       }
       break;
 
@@ -406,7 +384,7 @@ public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fie
       if (value == null) {
         unsetOrganizationId();
       } else {
-        setOrganizationId((String)value);
+        setOrganizationId((java.lang.String)value);
       }
       break;
 
@@ -421,7 +399,8 @@ public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fie
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case USER_ID:
       return getUserId();
@@ -442,13 +421,13 @@ public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fie
       return getRole();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -465,13 +444,11 @@ public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fie
     case ROLE:
       return isSetRole();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
+  public boolean equals(java.lang.Object that) {
     if (that instanceof UserInfo)
       return this.equals((UserInfo)that);
     return false;
@@ -480,6 +457,8 @@ public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fie
   public boolean equals(UserInfo that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_userId = true && this.isSetUserId();
     boolean that_present_userId = true && that.isSetUserId();
@@ -540,39 +519,33 @@ public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fie
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_userId = true && (isSetUserId());
-    list.add(present_userId);
-    if (present_userId)
-      list.add(userId);
+    hashCode = hashCode * 8191 + ((isSetUserId()) ? 131071 : 524287);
+    if (isSetUserId())
+      hashCode = hashCode * 8191 + userId.hashCode();
 
-    boolean present_firstName = true && (isSetFirstName());
-    list.add(present_firstName);
-    if (present_firstName)
-      list.add(firstName);
+    hashCode = hashCode * 8191 + ((isSetFirstName()) ? 131071 : 524287);
+    if (isSetFirstName())
+      hashCode = hashCode * 8191 + firstName.hashCode();
 
-    boolean present_lastName = true && (isSetLastName());
-    list.add(present_lastName);
-    if (present_lastName)
-      list.add(lastName);
+    hashCode = hashCode * 8191 + ((isSetLastName()) ? 131071 : 524287);
+    if (isSetLastName())
+      hashCode = hashCode * 8191 + lastName.hashCode();
 
-    boolean present_eMail = true && (isSetEMail());
-    list.add(present_eMail);
-    if (present_eMail)
-      list.add(eMail);
+    hashCode = hashCode * 8191 + ((isSetEMail()) ? 131071 : 524287);
+    if (isSetEMail())
+      hashCode = hashCode * 8191 + eMail.hashCode();
 
-    boolean present_organizationId = true && (isSetOrganizationId());
-    list.add(present_organizationId);
-    if (present_organizationId)
-      list.add(organizationId);
+    hashCode = hashCode * 8191 + ((isSetOrganizationId()) ? 131071 : 524287);
+    if (isSetOrganizationId())
+      hashCode = hashCode * 8191 + organizationId.hashCode();
 
-    boolean present_role = true && (isSetRole());
-    list.add(present_role);
-    if (present_role)
-      list.add(role.getValue());
+    hashCode = hashCode * 8191 + ((isSetRole()) ? 131071 : 524287);
+    if (isSetRole())
+      hashCode = hashCode * 8191 + role.getValue();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -583,7 +556,7 @@ public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fie
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetUserId()).compareTo(other.isSetUserId());
+    lastComparison = java.lang.Boolean.compare(isSetUserId(), other.isSetUserId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -593,7 +566,7 @@ public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fie
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetFirstName()).compareTo(other.isSetFirstName());
+    lastComparison = java.lang.Boolean.compare(isSetFirstName(), other.isSetFirstName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -603,7 +576,7 @@ public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fie
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetLastName()).compareTo(other.isSetLastName());
+    lastComparison = java.lang.Boolean.compare(isSetLastName(), other.isSetLastName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -613,7 +586,7 @@ public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fie
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetEMail()).compareTo(other.isSetEMail());
+    lastComparison = java.lang.Boolean.compare(isSetEMail(), other.isSetEMail());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -623,7 +596,7 @@ public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fie
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetOrganizationId()).compareTo(other.isSetOrganizationId());
+    lastComparison = java.lang.Boolean.compare(isSetOrganizationId(), other.isSetOrganizationId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -633,7 +606,7 @@ public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fie
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetRole()).compareTo(other.isSetRole());
+    lastComparison = java.lang.Boolean.compare(isSetRole(), other.isSetRole());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -646,21 +619,22 @@ public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fie
     return 0;
   }
 
+  @org.apache.thrift.annotation.Nullable
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("UserInfo(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("UserInfo(");
     boolean first = true;
 
     sb.append("userId:");
@@ -729,7 +703,7 @@ public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fie
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
     } catch (org.apache.thrift.TException te) {
@@ -737,13 +711,13 @@ public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fie
     }
   }
 
-  private static class UserInfoStandardSchemeFactory implements SchemeFactory {
+  private static class UserInfoStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public UserInfoStandardScheme getScheme() {
       return new UserInfoStandardScheme();
     }
   }
 
-  private static class UserInfoStandardScheme extends StandardScheme<UserInfo> {
+  private static class UserInfoStandardScheme extends org.apache.thrift.scheme.StandardScheme<UserInfo> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, UserInfo struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -856,18 +830,18 @@ public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fie
 
   }
 
-  private static class UserInfoTupleSchemeFactory implements SchemeFactory {
+  private static class UserInfoTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public UserInfoTupleScheme getScheme() {
       return new UserInfoTupleScheme();
     }
   }
 
-  private static class UserInfoTupleScheme extends TupleScheme<UserInfo> {
+  private static class UserInfoTupleScheme extends org.apache.thrift.scheme.TupleScheme<UserInfo> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, UserInfo struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetUserId()) {
         optionals.set(0);
       }
@@ -909,8 +883,8 @@ public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fie
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, UserInfo struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(6);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(6);
       if (incoming.get(0)) {
         struct.userId = iprot.readString();
         struct.setUserIdIsSet(true);
@@ -938,5 +912,8 @@ public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fie
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/Virtualizer.java b/src/main/java/org/openslx/bwlp/thrift/iface/Virtualizer.java
index 8cf4d13..a35e827 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/Virtualizer.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/Virtualizer.java
@@ -1,64 +1,34 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.openslx.bwlp.thrift.iface;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
 public class Virtualizer implements org.apache.thrift.TBase<Virtualizer, Virtualizer._Fields>, java.io.Serializable, Cloneable, Comparable<Virtualizer> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Virtualizer");
 
   private static final org.apache.thrift.protocol.TField VIRT_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("virtId", org.apache.thrift.protocol.TType.STRING, (short)1);
   private static final org.apache.thrift.protocol.TField VIRT_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("virtName", org.apache.thrift.protocol.TType.STRING, (short)2);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new VirtualizerStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new VirtualizerTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new VirtualizerStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new VirtualizerTupleSchemeFactory();
 
-  public String virtId; // required
-  public String virtName; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String virtId; // required
+  public @org.apache.thrift.annotation.Nullable java.lang.String virtName; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     VIRT_ID((short)1, "virtId"),
     VIRT_NAME((short)2, "virtName");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -66,6 +36,7 @@ public class Virtualizer implements org.apache.thrift.TBase<Virtualizer, Virtual
     /**
      * Find the _Fields constant that matches fieldId, or null if its not found.
      */
+    @org.apache.thrift.annotation.Nullable
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
         case 1: // VIRT_ID
@@ -83,21 +54,22 @@ public class Virtualizer implements org.apache.thrift.TBase<Virtualizer, Virtual
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    @org.apache.thrift.annotation.Nullable
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -106,20 +78,20 @@ public class Virtualizer implements org.apache.thrift.TBase<Virtualizer, Virtual
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
 
   // isset id assignments
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.VIRT_ID, new org.apache.thrift.meta_data.FieldMetaData("virtId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.VIRT_NAME, new org.apache.thrift.meta_data.FieldMetaData("virtName", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Virtualizer.class, metaDataMap);
   }
 
@@ -127,8 +99,8 @@ public class Virtualizer implements org.apache.thrift.TBase<Virtualizer, Virtual
   }
 
   public Virtualizer(
-    String virtId,
-    String virtName)
+    java.lang.String virtId,
+    java.lang.String virtName)
   {
     this();
     this.virtId = virtId;
@@ -157,11 +129,12 @@ public class Virtualizer implements org.apache.thrift.TBase<Virtualizer, Virtual
     this.virtName = null;
   }
 
-  public String getVirtId() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getVirtId() {
     return this.virtId;
   }
 
-  public Virtualizer setVirtId(String virtId) {
+  public Virtualizer setVirtId(@org.apache.thrift.annotation.Nullable java.lang.String virtId) {
     this.virtId = virtId;
     return this;
   }
@@ -181,11 +154,12 @@ public class Virtualizer implements org.apache.thrift.TBase<Virtualizer, Virtual
     }
   }
 
-  public String getVirtName() {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.String getVirtName() {
     return this.virtName;
   }
 
-  public Virtualizer setVirtName(String virtName) {
+  public Virtualizer setVirtName(@org.apache.thrift.annotation.Nullable java.lang.String virtName) {
     this.virtName = virtName;
     return this;
   }
@@ -205,13 +179,13 @@ public class Virtualizer implements org.apache.thrift.TBase<Virtualizer, Virtual
     }
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case VIRT_ID:
       if (value == null) {
         unsetVirtId();
       } else {
-        setVirtId((String)value);
+        setVirtId((java.lang.String)value);
       }
       break;
 
@@ -219,14 +193,15 @@ public class Virtualizer implements org.apache.thrift.TBase<Virtualizer, Virtual
       if (value == null) {
         unsetVirtName();
       } else {
-        setVirtName((String)value);
+        setVirtName((java.lang.String)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case VIRT_ID:
       return getVirtId();
@@ -235,13 +210,13 @@ public class Virtualizer implements org.apache.thrift.TBase<Virtualizer, Virtual
       return getVirtName();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -250,13 +225,11 @@ public class Virtualizer implements org.apache.thrift.TBase<Virtualizer, Virtual
     case VIRT_NAME:
       return isSetVirtName();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
+  public boolean equals(java.lang.Object that) {
     if (that instanceof Virtualizer)
       return this.equals((Virtualizer)that);
     return false;
@@ -265,6 +238,8 @@ public class Virtualizer implements org.apache.thrift.TBase<Virtualizer, Virtual
   public boolean equals(Virtualizer that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_virtId = true && this.isSetVirtId();
     boolean that_present_virtId = true && that.isSetVirtId();
@@ -289,19 +264,17 @@ public class Virtualizer implements org.apache.thrift.TBase<Virtualizer, Virtual
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_virtId = true && (isSetVirtId());
-    list.add(present_virtId);
-    if (present_virtId)
-      list.add(virtId);
+    hashCode = hashCode * 8191 + ((isSetVirtId()) ? 131071 : 524287);
+    if (isSetVirtId())
+      hashCode = hashCode * 8191 + virtId.hashCode();
 
-    boolean present_virtName = true && (isSetVirtName());
-    list.add(present_virtName);
-    if (present_virtName)
-      list.add(virtName);
+    hashCode = hashCode * 8191 + ((isSetVirtName()) ? 131071 : 524287);
+    if (isSetVirtName())
+      hashCode = hashCode * 8191 + virtName.hashCode();
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -312,7 +285,7 @@ public class Virtualizer implements org.apache.thrift.TBase<Virtualizer, Virtual
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetVirtId()).compareTo(other.isSetVirtId());
+    lastComparison = java.lang.Boolean.compare(isSetVirtId(), other.isSetVirtId());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -322,7 +295,7 @@ public class Virtualizer implements org.apache.thrift.TBase<Virtualizer, Virtual
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetVirtName()).compareTo(other.isSetVirtName());
+    lastComparison = java.lang.Boolean.compare(isSetVirtName(), other.isSetVirtName());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -335,21 +308,22 @@ public class Virtualizer implements org.apache.thrift.TBase<Virtualizer, Virtual
     return 0;
   }
 
+  @org.apache.thrift.annotation.Nullable
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("Virtualizer(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("Virtualizer(");
     boolean first = true;
 
     sb.append("virtId:");
@@ -384,7 +358,7 @@ public class Virtualizer implements org.apache.thrift.TBase<Virtualizer, Virtual
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
     } catch (org.apache.thrift.TException te) {
@@ -392,13 +366,13 @@ public class Virtualizer implements org.apache.thrift.TBase<Virtualizer, Virtual
     }
   }
 
-  private static class VirtualizerStandardSchemeFactory implements SchemeFactory {
+  private static class VirtualizerStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public VirtualizerStandardScheme getScheme() {
       return new VirtualizerStandardScheme();
     }
   }
 
-  private static class VirtualizerStandardScheme extends StandardScheme<Virtualizer> {
+  private static class VirtualizerStandardScheme extends org.apache.thrift.scheme.StandardScheme<Virtualizer> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, Virtualizer struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -457,18 +431,18 @@ public class Virtualizer implements org.apache.thrift.TBase<Virtualizer, Virtual
 
   }
 
-  private static class VirtualizerTupleSchemeFactory implements SchemeFactory {
+  private static class VirtualizerTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public VirtualizerTupleScheme getScheme() {
       return new VirtualizerTupleScheme();
     }
   }
 
-  private static class VirtualizerTupleScheme extends TupleScheme<Virtualizer> {
+  private static class VirtualizerTupleScheme extends org.apache.thrift.scheme.TupleScheme<Virtualizer> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, Virtualizer struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetVirtId()) {
         optionals.set(0);
       }
@@ -486,8 +460,8 @@ public class Virtualizer implements org.apache.thrift.TBase<Virtualizer, Virtual
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, Virtualizer struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(2);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(2);
       if (incoming.get(0)) {
         struct.virtId = iprot.readString();
         struct.setVirtIdIsSet(true);
@@ -499,5 +473,8 @@ public class Virtualizer implements org.apache.thrift.TBase<Virtualizer, Virtual
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/src/main/java/org/openslx/bwlp/thrift/iface/WhoamiInfo.java b/src/main/java/org/openslx/bwlp/thrift/iface/WhoamiInfo.java
index ad22344..9b45c29 100644
--- a/src/main/java/org/openslx/bwlp/thrift/iface/WhoamiInfo.java
+++ b/src/main/java/org/openslx/bwlp/thrift/iface/WhoamiInfo.java
@@ -1,40 +1,13 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.15.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.openslx.bwlp.thrift.iface;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import javax.annotation.Generated;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = "2016-01-04")
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.15.0)", date = "2021-12-17")
 public class WhoamiInfo implements org.apache.thrift.TBase<WhoamiInfo, WhoamiInfo._Fields>, java.io.Serializable, Cloneable, Comparable<WhoamiInfo> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("WhoamiInfo");
 
@@ -42,13 +15,10 @@ public class WhoamiInfo implements org.apache.thrift.TBase<WhoamiInfo, WhoamiInf
   private static final org.apache.thrift.protocol.TField IS_SUPER_USER_FIELD_DESC = new org.apache.thrift.protocol.TField("isSuperUser", org.apache.thrift.protocol.TType.BOOL, (short)2);
   private static final org.apache.thrift.protocol.TField CAN_LIST_IMAGES_FIELD_DESC = new org.apache.thrift.protocol.TField("canListImages", org.apache.thrift.protocol.TType.BOOL, (short)3);
 
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new WhoamiInfoStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new WhoamiInfoTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new WhoamiInfoStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new WhoamiInfoTupleSchemeFactory();
 
-  public UserInfo user; // required
+  public @org.apache.thrift.annotation.Nullable UserInfo user; // required
   public boolean isSuperUser; // required
   public boolean canListImages; // required
 
@@ -58,10 +28,10 @@ public class WhoamiInfo implements org.apache.thrift.TBase<WhoamiInfo, WhoamiInf
     IS_SUPER_USER((short)2, "isSuperUser"),
     CAN_LIST_IMAGES((short)3, "canListImages");
 
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+    private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
 
     static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+      for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
         byName.put(field.getFieldName(), field);
       }
     }
@@ -69,6 +39,7 @@ public class WhoamiInfo implements org.apache.thrift.TBase<WhoamiInfo, WhoamiInf
     /**
      * Find the _Fields constant that matches fieldId, or null if its not found.
      */
+    @org.apache.thrift.annotation.Nullable
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
         case 1: // USER
@@ -88,21 +59,22 @@ public class WhoamiInfo implements org.apache.thrift.TBase<WhoamiInfo, WhoamiInf
      */
     public static _Fields findByThriftIdOrThrow(int fieldId) {
       _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      if (fields == null) throw new java.lang.IllegalArgumentException("Field " + fieldId + " doesn't exist!");
       return fields;
     }
 
     /**
      * Find the _Fields constant that matches name, or null if its not found.
      */
-    public static _Fields findByName(String name) {
+    @org.apache.thrift.annotation.Nullable
+    public static _Fields findByName(java.lang.String name) {
       return byName.get(name);
     }
 
     private final short _thriftId;
-    private final String _fieldName;
+    private final java.lang.String _fieldName;
 
-    _Fields(short thriftId, String fieldName) {
+    _Fields(short thriftId, java.lang.String fieldName) {
       _thriftId = thriftId;
       _fieldName = fieldName;
     }
@@ -111,7 +83,7 @@ public class WhoamiInfo implements org.apache.thrift.TBase<WhoamiInfo, WhoamiInf
       return _thriftId;
     }
 
-    public String getFieldName() {
+    public java.lang.String getFieldName() {
       return _fieldName;
     }
   }
@@ -120,16 +92,16 @@ public class WhoamiInfo implements org.apache.thrift.TBase<WhoamiInfo, WhoamiInf
   private static final int __ISSUPERUSER_ISSET_ID = 0;
   private static final int __CANLISTIMAGES_ISSET_ID = 1;
   private byte __isset_bitfield = 0;
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+  public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+    java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.USER, new org.apache.thrift.meta_data.FieldMetaData("user", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, UserInfo.class)));
     tmpMap.put(_Fields.IS_SUPER_USER, new org.apache.thrift.meta_data.FieldMetaData("isSuperUser", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
     tmpMap.put(_Fields.CAN_LIST_IMAGES, new org.apache.thrift.meta_data.FieldMetaData("canListImages", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(WhoamiInfo.class, metaDataMap);
   }
 
@@ -174,11 +146,12 @@ public class WhoamiInfo implements org.apache.thrift.TBase<WhoamiInfo, WhoamiInf
     this.canListImages = false;
   }
 
+  @org.apache.thrift.annotation.Nullable
   public UserInfo getUser() {
     return this.user;
   }
 
-  public WhoamiInfo setUser(UserInfo user) {
+  public WhoamiInfo setUser(@org.apache.thrift.annotation.Nullable UserInfo user) {
     this.user = user;
     return this;
   }
@@ -209,16 +182,16 @@ public class WhoamiInfo implements org.apache.thrift.TBase<WhoamiInfo, WhoamiInf
   }
 
   public void unsetIsSuperUser() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ISSUPERUSER_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __ISSUPERUSER_ISSET_ID);
   }
 
   /** Returns true if field isSuperUser is set (has been assigned a value) and false otherwise */
   public boolean isSetIsSuperUser() {
-    return EncodingUtils.testBit(__isset_bitfield, __ISSUPERUSER_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __ISSUPERUSER_ISSET_ID);
   }
 
   public void setIsSuperUserIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ISSUPERUSER_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __ISSUPERUSER_ISSET_ID, value);
   }
 
   public boolean isCanListImages() {
@@ -232,19 +205,19 @@ public class WhoamiInfo implements org.apache.thrift.TBase<WhoamiInfo, WhoamiInf
   }
 
   public void unsetCanListImages() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __CANLISTIMAGES_ISSET_ID);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.clearBit(__isset_bitfield, __CANLISTIMAGES_ISSET_ID);
   }
 
   /** Returns true if field canListImages is set (has been assigned a value) and false otherwise */
   public boolean isSetCanListImages() {
-    return EncodingUtils.testBit(__isset_bitfield, __CANLISTIMAGES_ISSET_ID);
+    return org.apache.thrift.EncodingUtils.testBit(__isset_bitfield, __CANLISTIMAGES_ISSET_ID);
   }
 
   public void setCanListImagesIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __CANLISTIMAGES_ISSET_ID, value);
+    __isset_bitfield = org.apache.thrift.EncodingUtils.setBit(__isset_bitfield, __CANLISTIMAGES_ISSET_ID, value);
   }
 
-  public void setFieldValue(_Fields field, Object value) {
+  public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) {
     switch (field) {
     case USER:
       if (value == null) {
@@ -258,7 +231,7 @@ public class WhoamiInfo implements org.apache.thrift.TBase<WhoamiInfo, WhoamiInf
       if (value == null) {
         unsetIsSuperUser();
       } else {
-        setIsSuperUser((Boolean)value);
+        setIsSuperUser((java.lang.Boolean)value);
       }
       break;
 
@@ -266,14 +239,15 @@ public class WhoamiInfo implements org.apache.thrift.TBase<WhoamiInfo, WhoamiInf
       if (value == null) {
         unsetCanListImages();
       } else {
-        setCanListImages((Boolean)value);
+        setCanListImages((java.lang.Boolean)value);
       }
       break;
 
     }
   }
 
-  public Object getFieldValue(_Fields field) {
+  @org.apache.thrift.annotation.Nullable
+  public java.lang.Object getFieldValue(_Fields field) {
     switch (field) {
     case USER:
       return getUser();
@@ -285,13 +259,13 @@ public class WhoamiInfo implements org.apache.thrift.TBase<WhoamiInfo, WhoamiInf
       return isCanListImages();
 
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
   public boolean isSet(_Fields field) {
     if (field == null) {
-      throw new IllegalArgumentException();
+      throw new java.lang.IllegalArgumentException();
     }
 
     switch (field) {
@@ -302,13 +276,11 @@ public class WhoamiInfo implements org.apache.thrift.TBase<WhoamiInfo, WhoamiInf
     case CAN_LIST_IMAGES:
       return isSetCanListImages();
     }
-    throw new IllegalStateException();
+    throw new java.lang.IllegalStateException();
   }
 
   @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
+  public boolean equals(java.lang.Object that) {
     if (that instanceof WhoamiInfo)
       return this.equals((WhoamiInfo)that);
     return false;
@@ -317,6 +289,8 @@ public class WhoamiInfo implements org.apache.thrift.TBase<WhoamiInfo, WhoamiInf
   public boolean equals(WhoamiInfo that) {
     if (that == null)
       return false;
+    if (this == that)
+      return true;
 
     boolean this_present_user = true && this.isSetUser();
     boolean that_present_user = true && that.isSetUser();
@@ -350,24 +324,17 @@ public class WhoamiInfo implements org.apache.thrift.TBase<WhoamiInfo, WhoamiInf
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
+    int hashCode = 1;
 
-    boolean present_user = true && (isSetUser());
-    list.add(present_user);
-    if (present_user)
-      list.add(user);
+    hashCode = hashCode * 8191 + ((isSetUser()) ? 131071 : 524287);
+    if (isSetUser())
+      hashCode = hashCode * 8191 + user.hashCode();
 
-    boolean present_isSuperUser = true;
-    list.add(present_isSuperUser);
-    if (present_isSuperUser)
-      list.add(isSuperUser);
+    hashCode = hashCode * 8191 + ((isSuperUser) ? 131071 : 524287);
 
-    boolean present_canListImages = true;
-    list.add(present_canListImages);
-    if (present_canListImages)
-      list.add(canListImages);
+    hashCode = hashCode * 8191 + ((canListImages) ? 131071 : 524287);
 
-    return list.hashCode();
+    return hashCode;
   }
 
   @Override
@@ -378,7 +345,7 @@ public class WhoamiInfo implements org.apache.thrift.TBase<WhoamiInfo, WhoamiInf
 
     int lastComparison = 0;
 
-    lastComparison = Boolean.valueOf(isSetUser()).compareTo(other.isSetUser());
+    lastComparison = java.lang.Boolean.compare(isSetUser(), other.isSetUser());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -388,7 +355,7 @@ public class WhoamiInfo implements org.apache.thrift.TBase<WhoamiInfo, WhoamiInf
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetIsSuperUser()).compareTo(other.isSetIsSuperUser());
+    lastComparison = java.lang.Boolean.compare(isSetIsSuperUser(), other.isSetIsSuperUser());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -398,7 +365,7 @@ public class WhoamiInfo implements org.apache.thrift.TBase<WhoamiInfo, WhoamiInf
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetCanListImages()).compareTo(other.isSetCanListImages());
+    lastComparison = java.lang.Boolean.compare(isSetCanListImages(), other.isSetCanListImages());
     if (lastComparison != 0) {
       return lastComparison;
     }
@@ -411,21 +378,22 @@ public class WhoamiInfo implements org.apache.thrift.TBase<WhoamiInfo, WhoamiInf
     return 0;
   }
 
+  @org.apache.thrift.annotation.Nullable
   public _Fields fieldForId(int fieldId) {
     return _Fields.findByThriftId(fieldId);
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    scheme(iprot).read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    scheme(oprot).write(oprot, this);
   }
 
   @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("WhoamiInfo(");
+  public java.lang.String toString() {
+    java.lang.StringBuilder sb = new java.lang.StringBuilder("WhoamiInfo(");
     boolean first = true;
 
     sb.append("user:");
@@ -463,7 +431,7 @@ public class WhoamiInfo implements org.apache.thrift.TBase<WhoamiInfo, WhoamiInf
     }
   }
 
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, java.lang.ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
       __isset_bitfield = 0;
@@ -473,13 +441,13 @@ public class WhoamiInfo implements org.apache.thrift.TBase<WhoamiInfo, WhoamiInf
     }
   }
 
-  private static class WhoamiInfoStandardSchemeFactory implements SchemeFactory {
+  private static class WhoamiInfoStandardSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public WhoamiInfoStandardScheme getScheme() {
       return new WhoamiInfoStandardScheme();
     }
   }
 
-  private static class WhoamiInfoStandardScheme extends StandardScheme<WhoamiInfo> {
+  private static class WhoamiInfoStandardScheme extends org.apache.thrift.scheme.StandardScheme<WhoamiInfo> {
 
     public void read(org.apache.thrift.protocol.TProtocol iprot, WhoamiInfo struct) throws org.apache.thrift.TException {
       org.apache.thrift.protocol.TField schemeField;
@@ -548,18 +516,18 @@ public class WhoamiInfo implements org.apache.thrift.TBase<WhoamiInfo, WhoamiInf
 
   }
 
-  private static class WhoamiInfoTupleSchemeFactory implements SchemeFactory {
+  private static class WhoamiInfoTupleSchemeFactory implements org.apache.thrift.scheme.SchemeFactory {
     public WhoamiInfoTupleScheme getScheme() {
       return new WhoamiInfoTupleScheme();
     }
   }
 
-  private static class WhoamiInfoTupleScheme extends TupleScheme<WhoamiInfo> {
+  private static class WhoamiInfoTupleScheme extends org.apache.thrift.scheme.TupleScheme<WhoamiInfo> {
 
     @Override
     public void write(org.apache.thrift.protocol.TProtocol prot, WhoamiInfo struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
+      org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet optionals = new java.util.BitSet();
       if (struct.isSetUser()) {
         optionals.set(0);
       }
@@ -583,8 +551,8 @@ public class WhoamiInfo implements org.apache.thrift.TBase<WhoamiInfo, WhoamiInf
 
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, WhoamiInfo struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(3);
+      org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot;
+      java.util.BitSet incoming = iprot.readBitSet(3);
       if (incoming.get(0)) {
         struct.user = new UserInfo();
         struct.user.read(iprot);
@@ -601,5 +569,8 @@ public class WhoamiInfo implements org.apache.thrift.TBase<WhoamiInfo, WhoamiInf
     }
   }
 
+  private static <S extends org.apache.thrift.scheme.IScheme> S scheme(org.apache.thrift.protocol.TProtocol proto) {
+    return (org.apache.thrift.scheme.StandardScheme.class.equals(proto.getScheme()) ? STANDARD_SCHEME_FACTORY : TUPLE_SCHEME_FACTORY).getScheme();
+  }
 }
 
diff --git a/src/main/java/org/openslx/thrifthelper/ThriftManager.java b/src/main/java/org/openslx/thrifthelper/ThriftManager.java
index 8bb5dd7..4971b97 100644
--- a/src/main/java/org/openslx/thrifthelper/ThriftManager.java
+++ b/src/main/java/org/openslx/thrifthelper/ThriftManager.java
@@ -13,9 +13,9 @@ import org.apache.logging.log4j.Logger;
 import org.apache.thrift.TServiceClient;
 import org.apache.thrift.protocol.TBinaryProtocol;
 import org.apache.thrift.protocol.TProtocol;
-import org.apache.thrift.transport.TFramedTransport;
 import org.apache.thrift.transport.TSocket;
 import org.apache.thrift.transport.TTransportException;
+import org.apache.thrift.transport.layered.TFramedTransport;
 import org.openslx.bwlp.thrift.iface.MasterServer;
 import org.openslx.bwlp.thrift.iface.SatelliteServer;
 import org.openslx.thrifthelper.ThriftHandler.WantClientCallback;