Change Date to UnixTimestamp, add Exception codes to UploadError

19 files changed, 747 insertions, 819 deletions

diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/AuthenticationError.java b/src/main/java/org/openslx/imagemaster/thrift/iface/AuthenticationError.java
index 8e9c880..2fd9fcf 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/AuthenticationError.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/AuthenticationError.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/AuthenticationException.java b/src/main/java/org/openslx/imagemaster/thrift/iface/AuthenticationException.java
index bd4bb0b..5efc66c 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/AuthenticationException.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/AuthenticationException.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -15,6 +15,8 @@ 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;
@@ -30,7 +32,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class AuthenticationException extends TException implements org.apache.thrift.TBase<AuthenticationException, AuthenticationException._Fields>, java.io.Serializable, Cloneable {
+public class AuthenticationException extends TException implements org.apache.thrift.TBase<AuthenticationException, AuthenticationException._Fields>, java.io.Serializable, Cloneable, Comparable<AuthenticationException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AuthenticationException");
 
   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);
@@ -303,30 +305,30 @@ public class AuthenticationException extends TException implements org.apache.th
     return 0;
   }
 
+  @Override
   public int compareTo(AuthenticationException other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    AuthenticationException typedOther = (AuthenticationException)other;
 
-    lastComparison = Boolean.valueOf(isSetNumber()).compareTo(typedOther.isSetNumber());
+    lastComparison = Boolean.valueOf(isSetNumber()).compareTo(other.isSetNumber());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetNumber()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.number, typedOther.number);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.number, other.number);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(typedOther.isSetMessage());
+    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(other.isSetMessage());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMessage()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, typedOther.message);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, other.message);
       if (lastComparison != 0) {
         return lastComparison;
       }
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/AuthorizationError.java b/src/main/java/org/openslx/imagemaster/thrift/iface/AuthorizationError.java
index 61c5960..a49ad92 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/AuthorizationError.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/AuthorizationError.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/AuthorizationException.java b/src/main/java/org/openslx/imagemaster/thrift/iface/AuthorizationException.java
index fec2e3e..5f798ac 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/AuthorizationException.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/AuthorizationException.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -15,6 +15,8 @@ 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;
@@ -30,7 +32,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class AuthorizationException extends TException implements org.apache.thrift.TBase<AuthorizationException, AuthorizationException._Fields>, java.io.Serializable, Cloneable {
+public class AuthorizationException extends TException implements org.apache.thrift.TBase<AuthorizationException, AuthorizationException._Fields>, java.io.Serializable, Cloneable, Comparable<AuthorizationException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AuthorizationException");
 
   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);
@@ -303,30 +305,30 @@ public class AuthorizationException extends TException implements org.apache.thr
     return 0;
   }
 
+  @Override
   public int compareTo(AuthorizationException other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    AuthorizationException typedOther = (AuthorizationException)other;
 
-    lastComparison = Boolean.valueOf(isSetNumber()).compareTo(typedOther.isSetNumber());
+    lastComparison = Boolean.valueOf(isSetNumber()).compareTo(other.isSetNumber());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetNumber()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.number, typedOther.number);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.number, other.number);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(typedOther.isSetMessage());
+    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(other.isSetMessage());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMessage()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, typedOther.message);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, other.message);
       if (lastComparison != 0) {
         return lastComparison;
       }
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/DownloadInfos.java b/src/main/java/org/openslx/imagemaster/thrift/iface/DownloadInfos.java
index 3cdedec..baf3ad1 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/DownloadInfos.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/DownloadInfos.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -15,6 +15,8 @@ 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;
@@ -30,7 +32,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class DownloadInfos implements org.apache.thrift.TBase<DownloadInfos, DownloadInfos._Fields>, java.io.Serializable, Cloneable {
+public class DownloadInfos implements org.apache.thrift.TBase<DownloadInfos, DownloadInfos._Fields>, java.io.Serializable, Cloneable, Comparable<DownloadInfos> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DownloadInfos");
 
   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);
@@ -289,30 +291,30 @@ public class DownloadInfos implements org.apache.thrift.TBase<DownloadInfos, Dow
     return 0;
   }
 
+  @Override
   public int compareTo(DownloadInfos other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    DownloadInfos typedOther = (DownloadInfos)other;
 
-    lastComparison = Boolean.valueOf(isSetToken()).compareTo(typedOther.isSetToken());
+    lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetToken()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, typedOther.token);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetPort()).compareTo(typedOther.isSetPort());
+    lastComparison = Boolean.valueOf(isSetPort()).compareTo(other.isSetPort());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetPort()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.port, typedOther.port);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.port, other.port);
       if (lastComparison != 0) {
         return lastComparison;
       }
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/FtpCredentials.java b/src/main/java/org/openslx/imagemaster/thrift/iface/FtpCredentials.java
deleted file mode 100644
index a3a292f..0000000
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/FtpCredentials.java
+++ /dev/null
@@ -1,586 +0,0 @@
-/**
- * Autogenerated by Thrift Compiler (0.9.0)
- *
- * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
- *  @generated
- */
-package org.openslx.imagemaster.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 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 org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class FtpCredentials implements org.apache.thrift.TBase<FtpCredentials, FtpCredentials._Fields>, java.io.Serializable, Cloneable {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("FtpCredentials");
-
-  private static final org.apache.thrift.protocol.TField USERNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("username", 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 org.apache.thrift.protocol.TField FILENAME_FIELD_DESC = new org.apache.thrift.protocol.TField("filename", 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 FtpCredentialsStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new FtpCredentialsTupleSchemeFactory());
-  }
-
-  public String username; // required
-  public String password; // required
-  public String filename; // 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 {
-    USERNAME((short)1, "username"),
-    PASSWORD((short)2, "password"),
-    FILENAME((short)3, "filename");
-
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
-
-    static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
-        byName.put(field.getFieldName(), field);
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, or null if its not found.
-     */
-    public static _Fields findByThriftId(int fieldId) {
-      switch(fieldId) {
-        case 1: // USERNAME
-          return USERNAME;
-        case 2: // PASSWORD
-          return PASSWORD;
-        case 3: // FILENAME
-          return FILENAME;
-        default:
-          return null;
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, throwing an exception
-     * if it is not found.
-     */
-    public static _Fields findByThriftIdOrThrow(int fieldId) {
-      _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new 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) {
-      return byName.get(name);
-    }
-
-    private final short _thriftId;
-    private final String _fieldName;
-
-    _Fields(short thriftId, String fieldName) {
-      _thriftId = thriftId;
-      _fieldName = fieldName;
-    }
-
-    public short getThriftFieldId() {
-      return _thriftId;
-    }
-
-    public String getFieldName() {
-      return _fieldName;
-    }
-  }
-
-  // isset id assignments
-  public static final 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);
-    tmpMap.put(_Fields.USERNAME, new org.apache.thrift.meta_data.FieldMetaData("username", 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)));
-    tmpMap.put(_Fields.FILENAME, new org.apache.thrift.meta_data.FieldMetaData("filename", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(FtpCredentials.class, metaDataMap);
-  }
-
-  public FtpCredentials() {
-  }
-
-  public FtpCredentials(
-    String username,
-    String password,
-    String filename)
-  {
-    this();
-    this.username = username;
-    this.password = password;
-    this.filename = filename;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public FtpCredentials(FtpCredentials other) {
-    if (other.isSetUsername()) {
-      this.username = other.username;
-    }
-    if (other.isSetPassword()) {
-      this.password = other.password;
-    }
-    if (other.isSetFilename()) {
-      this.filename = other.filename;
-    }
-  }
-
-  public FtpCredentials deepCopy() {
-    return new FtpCredentials(this);
-  }
-
-  @Override
-  public void clear() {
-    this.username = null;
-    this.password = null;
-    this.filename = null;
-  }
-
-  public String getUsername() {
-    return this.username;
-  }
-
-  public FtpCredentials setUsername(String username) {
-    this.username = username;
-    return this;
-  }
-
-  public void unsetUsername() {
-    this.username = null;
-  }
-
-  /** Returns true if field username is set (has been assigned a value) and false otherwise */
-  public boolean isSetUsername() {
-    return this.username != null;
-  }
-
-  public void setUsernameIsSet(boolean value) {
-    if (!value) {
-      this.username = null;
-    }
-  }
-
-  public String getPassword() {
-    return this.password;
-  }
-
-  public FtpCredentials setPassword(String password) {
-    this.password = password;
-    return this;
-  }
-
-  public void unsetPassword() {
-    this.password = null;
-  }
-
-  /** Returns true if field password is set (has been assigned a value) and false otherwise */
-  public boolean isSetPassword() {
-    return this.password != null;
-  }
-
-  public void setPasswordIsSet(boolean value) {
-    if (!value) {
-      this.password = null;
-    }
-  }
-
-  public String getFilename() {
-    return this.filename;
-  }
-
-  public FtpCredentials setFilename(String filename) {
-    this.filename = filename;
-    return this;
-  }
-
-  public void unsetFilename() {
-    this.filename = null;
-  }
-
-  /** Returns true if field filename is set (has been assigned a value) and false otherwise */
-  public boolean isSetFilename() {
-    return this.filename != null;
-  }
-
-  public void setFilenameIsSet(boolean value) {
-    if (!value) {
-      this.filename = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case USERNAME:
-      if (value == null) {
-        unsetUsername();
-      } else {
-        setUsername((String)value);
-      }
-      break;
-
-    case PASSWORD:
-      if (value == null) {
-        unsetPassword();
-      } else {
-        setPassword((String)value);
-      }
-      break;
-
-    case FILENAME:
-      if (value == null) {
-        unsetFilename();
-      } else {
-        setFilename((String)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case USERNAME:
-      return getUsername();
-
-    case PASSWORD:
-      return getPassword();
-
-    case FILENAME:
-      return getFilename();
-
-    }
-    throw new 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();
-    }
-
-    switch (field) {
-    case USERNAME:
-      return isSetUsername();
-    case PASSWORD:
-      return isSetPassword();
-    case FILENAME:
-      return isSetFilename();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof FtpCredentials)
-      return this.equals((FtpCredentials)that);
-    return false;
-  }
-
-  public boolean equals(FtpCredentials that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_username = true && this.isSetUsername();
-    boolean that_present_username = true && that.isSetUsername();
-    if (this_present_username || that_present_username) {
-      if (!(this_present_username && that_present_username))
-        return false;
-      if (!this.username.equals(that.username))
-        return false;
-    }
-
-    boolean this_present_password = true && this.isSetPassword();
-    boolean that_present_password = true && that.isSetPassword();
-    if (this_present_password || that_present_password) {
-      if (!(this_present_password && that_present_password))
-        return false;
-      if (!this.password.equals(that.password))
-        return false;
-    }
-
-    boolean this_present_filename = true && this.isSetFilename();
-    boolean that_present_filename = true && that.isSetFilename();
-    if (this_present_filename || that_present_filename) {
-      if (!(this_present_filename && that_present_filename))
-        return false;
-      if (!this.filename.equals(that.filename))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    return 0;
-  }
-
-  public int compareTo(FtpCredentials other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-    FtpCredentials typedOther = (FtpCredentials)other;
-
-    lastComparison = Boolean.valueOf(isSetUsername()).compareTo(typedOther.isSetUsername());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetUsername()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.username, typedOther.username);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetPassword()).compareTo(typedOther.isSetPassword());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetPassword()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.password, typedOther.password);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetFilename()).compareTo(typedOther.isSetFilename());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetFilename()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.filename, typedOther.filename);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    return 0;
-  }
-
-  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);
-  }
-
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("FtpCredentials(");
-    boolean first = true;
-
-    sb.append("username:");
-    if (this.username == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.username);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("password:");
-    if (this.password == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.password);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("filename:");
-    if (this.filename == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.filename);
-    }
-    first = false;
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    // check for sub-struct validity
-  }
-
-  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
-    try {
-      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
-    try {
-      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private static class FtpCredentialsStandardSchemeFactory implements SchemeFactory {
-    public FtpCredentialsStandardScheme getScheme() {
-      return new FtpCredentialsStandardScheme();
-    }
-  }
-
-  private static class FtpCredentialsStandardScheme extends StandardScheme<FtpCredentials> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, FtpCredentials struct) throws org.apache.thrift.TException {
-      org.apache.thrift.protocol.TField schemeField;
-      iprot.readStructBegin();
-      while (true)
-      {
-        schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
-          break;
-        }
-        switch (schemeField.id) {
-          case 1: // USERNAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.username = iprot.readString();
-              struct.setUsernameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // PASSWORD
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.password = iprot.readString();
-              struct.setPasswordIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // FILENAME
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.filename = iprot.readString();
-              struct.setFilenameIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-        }
-        iprot.readFieldEnd();
-      }
-      iprot.readStructEnd();
-
-      // check for required fields of primitive type, which can't be checked in the validate method
-      struct.validate();
-    }
-
-    public void write(org.apache.thrift.protocol.TProtocol oprot, FtpCredentials struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.username != null) {
-        oprot.writeFieldBegin(USERNAME_FIELD_DESC);
-        oprot.writeString(struct.username);
-        oprot.writeFieldEnd();
-      }
-      if (struct.password != null) {
-        oprot.writeFieldBegin(PASSWORD_FIELD_DESC);
-        oprot.writeString(struct.password);
-        oprot.writeFieldEnd();
-      }
-      if (struct.filename != null) {
-        oprot.writeFieldBegin(FILENAME_FIELD_DESC);
-        oprot.writeString(struct.filename);
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class FtpCredentialsTupleSchemeFactory implements SchemeFactory {
-    public FtpCredentialsTupleScheme getScheme() {
-      return new FtpCredentialsTupleScheme();
-    }
-  }
-
-  private static class FtpCredentialsTupleScheme extends TupleScheme<FtpCredentials> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, FtpCredentials struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
-      if (struct.isSetUsername()) {
-        optionals.set(0);
-      }
-      if (struct.isSetPassword()) {
-        optionals.set(1);
-      }
-      if (struct.isSetFilename()) {
-        optionals.set(2);
-      }
-      oprot.writeBitSet(optionals, 3);
-      if (struct.isSetUsername()) {
-        oprot.writeString(struct.username);
-      }
-      if (struct.isSetPassword()) {
-        oprot.writeString(struct.password);
-      }
-      if (struct.isSetFilename()) {
-        oprot.writeString(struct.filename);
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, FtpCredentials struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(3);
-      if (incoming.get(0)) {
-        struct.username = iprot.readString();
-        struct.setUsernameIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.password = iprot.readString();
-        struct.setPasswordIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.filename = iprot.readString();
-        struct.setFilenameIsSet(true);
-      }
-    }
-  }
-
-}
-
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/ImageData.java b/src/main/java/org/openslx/imagemaster/thrift/iface/ImageData.java
index 6672485..02daf62 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/ImageData.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/ImageData.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -15,6 +15,8 @@ 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;
@@ -30,7 +32,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class ImageData implements org.apache.thrift.TBase<ImageData, ImageData._Fields>, java.io.Serializable, Cloneable {
+public class ImageData implements org.apache.thrift.TBase<ImageData, ImageData._Fields>, java.io.Serializable, Cloneable, Comparable<ImageData> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ImageData");
 
   private static final org.apache.thrift.protocol.TField UUID_FIELD_DESC = new org.apache.thrift.protocol.TField("uuid", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -174,9 +176,9 @@ public class ImageData implements org.apache.thrift.TBase<ImageData, ImageData._
     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.IMAGE_CREATE_TIME, new org.apache.thrift.meta_data.FieldMetaData("imageCreateTime", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64        , "Date")));
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64        , "UnixTimestamp")));
     tmpMap.put(_Fields.IMAGE_UPDATE_TIME, new org.apache.thrift.meta_data.FieldMetaData("imageUpdateTime", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64        , "Date")));
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64        , "UnixTimestamp")));
     tmpMap.put(_Fields.IMAGE_OWNER, new org.apache.thrift.meta_data.FieldMetaData("imageOwner", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.CONTENT_OPERATING_SYSTEM, new org.apache.thrift.meta_data.FieldMetaData("contentOperatingSystem", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -879,130 +881,130 @@ public class ImageData implements org.apache.thrift.TBase<ImageData, ImageData._
     return 0;
   }
 
+  @Override
   public int compareTo(ImageData other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    ImageData typedOther = (ImageData)other;
 
-    lastComparison = Boolean.valueOf(isSetUuid()).compareTo(typedOther.isSetUuid());
+    lastComparison = Boolean.valueOf(isSetUuid()).compareTo(other.isSetUuid());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetUuid()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.uuid, typedOther.uuid);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.uuid, other.uuid);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetImageVersion()).compareTo(typedOther.isSetImageVersion());
+    lastComparison = Boolean.valueOf(isSetImageVersion()).compareTo(other.isSetImageVersion());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetImageVersion()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imageVersion, typedOther.imageVersion);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imageVersion, other.imageVersion);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetImageName()).compareTo(typedOther.isSetImageName());
+    lastComparison = Boolean.valueOf(isSetImageName()).compareTo(other.isSetImageName());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetImageName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imageName, typedOther.imageName);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imageName, other.imageName);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetImageCreateTime()).compareTo(typedOther.isSetImageCreateTime());
+    lastComparison = Boolean.valueOf(isSetImageCreateTime()).compareTo(other.isSetImageCreateTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetImageCreateTime()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imageCreateTime, typedOther.imageCreateTime);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imageCreateTime, other.imageCreateTime);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetImageUpdateTime()).compareTo(typedOther.isSetImageUpdateTime());
+    lastComparison = Boolean.valueOf(isSetImageUpdateTime()).compareTo(other.isSetImageUpdateTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetImageUpdateTime()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imageUpdateTime, typedOther.imageUpdateTime);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imageUpdateTime, other.imageUpdateTime);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetImageOwner()).compareTo(typedOther.isSetImageOwner());
+    lastComparison = Boolean.valueOf(isSetImageOwner()).compareTo(other.isSetImageOwner());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetImageOwner()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imageOwner, typedOther.imageOwner);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imageOwner, other.imageOwner);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetContentOperatingSystem()).compareTo(typedOther.isSetContentOperatingSystem());
+    lastComparison = Boolean.valueOf(isSetContentOperatingSystem()).compareTo(other.isSetContentOperatingSystem());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetContentOperatingSystem()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.contentOperatingSystem, typedOther.contentOperatingSystem);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.contentOperatingSystem, other.contentOperatingSystem);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetStatusIsValid()).compareTo(typedOther.isSetStatusIsValid());
+    lastComparison = Boolean.valueOf(isSetStatusIsValid()).compareTo(other.isSetStatusIsValid());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetStatusIsValid()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.statusIsValid, typedOther.statusIsValid);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.statusIsValid, other.statusIsValid);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetStatusIsDeleted()).compareTo(typedOther.isSetStatusIsDeleted());
+    lastComparison = Boolean.valueOf(isSetStatusIsDeleted()).compareTo(other.isSetStatusIsDeleted());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetStatusIsDeleted()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.statusIsDeleted, typedOther.statusIsDeleted);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.statusIsDeleted, other.statusIsDeleted);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetImageShortDescription()).compareTo(typedOther.isSetImageShortDescription());
+    lastComparison = Boolean.valueOf(isSetImageShortDescription()).compareTo(other.isSetImageShortDescription());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetImageShortDescription()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imageShortDescription, typedOther.imageShortDescription);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imageShortDescription, other.imageShortDescription);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetImageLongDescription()).compareTo(typedOther.isSetImageLongDescription());
+    lastComparison = Boolean.valueOf(isSetImageLongDescription()).compareTo(other.isSetImageLongDescription());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetImageLongDescription()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imageLongDescription, typedOther.imageLongDescription);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imageLongDescription, other.imageLongDescription);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetFileSize()).compareTo(typedOther.isSetFileSize());
+    lastComparison = Boolean.valueOf(isSetFileSize()).compareTo(other.isSetFileSize());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetFileSize()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.fileSize, typedOther.fileSize);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.fileSize, other.fileSize);
       if (lastComparison != 0) {
         return lastComparison;
       }
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/ImageDataError.java b/src/main/java/org/openslx/imagemaster/thrift/iface/ImageDataError.java
index c9e52ae..fdd7b81 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/ImageDataError.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/ImageDataError.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/ImageDataException.java b/src/main/java/org/openslx/imagemaster/thrift/iface/ImageDataException.java
index dbf28cd..a5ac923 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/ImageDataException.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/ImageDataException.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -15,6 +15,8 @@ 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;
@@ -30,7 +32,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class ImageDataException extends TException implements org.apache.thrift.TBase<ImageDataException, ImageDataException._Fields>, java.io.Serializable, Cloneable {
+public class ImageDataException extends TException implements org.apache.thrift.TBase<ImageDataException, ImageDataException._Fields>, java.io.Serializable, Cloneable, Comparable<ImageDataException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ImageDataException");
 
   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);
@@ -303,30 +305,30 @@ public class ImageDataException extends TException implements org.apache.thrift.
     return 0;
   }
 
+  @Override
   public int compareTo(ImageDataException other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    ImageDataException typedOther = (ImageDataException)other;
 
-    lastComparison = Boolean.valueOf(isSetNumber()).compareTo(typedOther.isSetNumber());
+    lastComparison = Boolean.valueOf(isSetNumber()).compareTo(other.isSetNumber());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetNumber()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.number, typedOther.number);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.number, other.number);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(typedOther.isSetMessage());
+    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(other.isSetMessage());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMessage()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, typedOther.message);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, other.message);
       if (lastComparison != 0) {
         return lastComparison;
       }
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/ImageServer.java b/src/main/java/org/openslx/imagemaster/thrift/iface/ImageServer.java
index 33372d2..fb3aef7 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/ImageServer.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/ImageServer.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -15,6 +15,8 @@ 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;
@@ -54,21 +56,21 @@ public class ImageServer {
 
   public interface AsyncIface {
 
-    public void ping(org.apache.thrift.async.AsyncMethodCallback<AsyncClient.ping_call> resultHandler) throws org.apache.thrift.TException;
+    public void ping(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
-    public void authenticate(String username, String password, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.authenticate_call> resultHandler) throws org.apache.thrift.TException;
+    public void authenticate(String username, String password, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
-    public void getUserFromToken(String token, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getUserFromToken_call> resultHandler) throws org.apache.thrift.TException;
+    public void getUserFromToken(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
-    public void startServerAuthentication(String organization, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.startServerAuthentication_call> resultHandler) throws org.apache.thrift.TException;
+    public void startServerAuthentication(String organization, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
-    public void isServerAuthenticated(String serverSessionId, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.isServerAuthenticated_call> resultHandler) throws org.apache.thrift.TException;
+    public void isServerAuthenticated(String serverSessionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
-    public void serverAuthenticate(String organization, ByteBuffer challengeResponse, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.serverAuthenticate_call> resultHandler) throws org.apache.thrift.TException;
+    public void serverAuthenticate(String organization, ByteBuffer challengeResponse, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
-    public void submitImage(String serverSessionId, ImageData imageDescription, List<Integer> crcSums, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.submitImage_call> resultHandler) throws org.apache.thrift.TException;
+    public void submitImage(String serverSessionId, ImageData imageDescription, List<Integer> crcSums, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
-    public void getImage(String uuid, String serverSessionId, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getImage_call> resultHandler) throws org.apache.thrift.TException;
+    public void getImage(String uuid, String serverSessionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
   }
 
@@ -325,7 +327,7 @@ public class ImageServer {
       super(protocolFactory, clientManager, transport);
     }
 
-    public void ping(org.apache.thrift.async.AsyncMethodCallback<ping_call> resultHandler) throws org.apache.thrift.TException {
+    public void ping(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
       checkReady();
       ping_call method_call = new ping_call(resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -333,7 +335,7 @@ public class ImageServer {
     }
 
     public static class ping_call extends org.apache.thrift.async.TAsyncMethodCall {
-      public ping_call(org.apache.thrift.async.AsyncMethodCallback<ping_call> 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 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 {
         super(client, protocolFactory, transport, resultHandler, false);
       }
 
@@ -354,7 +356,7 @@ public class ImageServer {
       }
     }
 
-    public void authenticate(String username, String password, org.apache.thrift.async.AsyncMethodCallback<authenticate_call> resultHandler) throws org.apache.thrift.TException {
+    public void authenticate(String username, String password, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
       checkReady();
       authenticate_call method_call = new authenticate_call(username, password, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -364,7 +366,7 @@ public class ImageServer {
     public static class authenticate_call extends org.apache.thrift.async.TAsyncMethodCall {
       private String username;
       private String password;
-      public authenticate_call(String username, String password, org.apache.thrift.async.AsyncMethodCallback<authenticate_call> 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 authenticate_call(String username, 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 {
         super(client, protocolFactory, transport, resultHandler, false);
         this.username = username;
         this.password = password;
@@ -389,7 +391,7 @@ public class ImageServer {
       }
     }
 
-    public void getUserFromToken(String token, org.apache.thrift.async.AsyncMethodCallback<getUserFromToken_call> resultHandler) throws org.apache.thrift.TException {
+    public void getUserFromToken(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
       checkReady();
       getUserFromToken_call method_call = new getUserFromToken_call(token, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -398,7 +400,7 @@ public class ImageServer {
 
     public static class getUserFromToken_call extends org.apache.thrift.async.TAsyncMethodCall {
       private String token;
-      public getUserFromToken_call(String token, org.apache.thrift.async.AsyncMethodCallback<getUserFromToken_call> 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 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 {
         super(client, protocolFactory, transport, resultHandler, false);
         this.token = token;
       }
@@ -421,7 +423,7 @@ public class ImageServer {
       }
     }
 
-    public void startServerAuthentication(String organization, org.apache.thrift.async.AsyncMethodCallback<startServerAuthentication_call> resultHandler) throws org.apache.thrift.TException {
+    public void startServerAuthentication(String organization, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
       checkReady();
       startServerAuthentication_call method_call = new startServerAuthentication_call(organization, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -430,7 +432,7 @@ public class ImageServer {
 
     public static class startServerAuthentication_call extends org.apache.thrift.async.TAsyncMethodCall {
       private String organization;
-      public startServerAuthentication_call(String organization, org.apache.thrift.async.AsyncMethodCallback<startServerAuthentication_call> 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(String organization, 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 {
         super(client, protocolFactory, transport, resultHandler, false);
         this.organization = organization;
       }
@@ -453,7 +455,7 @@ public class ImageServer {
       }
     }
 
-    public void isServerAuthenticated(String serverSessionId, org.apache.thrift.async.AsyncMethodCallback<isServerAuthenticated_call> resultHandler) throws org.apache.thrift.TException {
+    public void isServerAuthenticated(String serverSessionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
       checkReady();
       isServerAuthenticated_call method_call = new isServerAuthenticated_call(serverSessionId, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -462,7 +464,7 @@ public class ImageServer {
 
     public static class isServerAuthenticated_call extends org.apache.thrift.async.TAsyncMethodCall {
       private String serverSessionId;
-      public isServerAuthenticated_call(String serverSessionId, org.apache.thrift.async.AsyncMethodCallback<isServerAuthenticated_call> 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 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 {
         super(client, protocolFactory, transport, resultHandler, false);
         this.serverSessionId = serverSessionId;
       }
@@ -485,7 +487,7 @@ public class ImageServer {
       }
     }
 
-    public void serverAuthenticate(String organization, ByteBuffer challengeResponse, org.apache.thrift.async.AsyncMethodCallback<serverAuthenticate_call> resultHandler) throws org.apache.thrift.TException {
+    public void serverAuthenticate(String organization, ByteBuffer challengeResponse, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
       checkReady();
       serverAuthenticate_call method_call = new serverAuthenticate_call(organization, challengeResponse, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -495,7 +497,7 @@ public class ImageServer {
     public static class serverAuthenticate_call extends org.apache.thrift.async.TAsyncMethodCall {
       private String organization;
       private ByteBuffer challengeResponse;
-      public serverAuthenticate_call(String organization, ByteBuffer challengeResponse, org.apache.thrift.async.AsyncMethodCallback<serverAuthenticate_call> 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 serverAuthenticate_call(String organization, 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 {
         super(client, protocolFactory, transport, resultHandler, false);
         this.organization = organization;
         this.challengeResponse = challengeResponse;
@@ -520,7 +522,7 @@ public class ImageServer {
       }
     }
 
-    public void submitImage(String serverSessionId, ImageData imageDescription, List<Integer> crcSums, org.apache.thrift.async.AsyncMethodCallback<submitImage_call> resultHandler) throws org.apache.thrift.TException {
+    public void submitImage(String serverSessionId, ImageData imageDescription, List<Integer> crcSums, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
       checkReady();
       submitImage_call method_call = new submitImage_call(serverSessionId, imageDescription, crcSums, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -531,7 +533,7 @@ public class ImageServer {
       private String serverSessionId;
       private ImageData imageDescription;
       private List<Integer> crcSums;
-      public submitImage_call(String serverSessionId, ImageData imageDescription, List<Integer> crcSums, org.apache.thrift.async.AsyncMethodCallback<submitImage_call> 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 submitImage_call(String serverSessionId, ImageData imageDescription, List<Integer> crcSums, 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 {
         super(client, protocolFactory, transport, resultHandler, false);
         this.serverSessionId = serverSessionId;
         this.imageDescription = imageDescription;
@@ -558,7 +560,7 @@ public class ImageServer {
       }
     }
 
-    public void getImage(String uuid, String serverSessionId, org.apache.thrift.async.AsyncMethodCallback<getImage_call> resultHandler) throws org.apache.thrift.TException {
+    public void getImage(String uuid, String serverSessionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
       checkReady();
       getImage_call method_call = new getImage_call(uuid, serverSessionId, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -568,7 +570,7 @@ public class ImageServer {
     public static class getImage_call extends org.apache.thrift.async.TAsyncMethodCall {
       private String uuid;
       private String serverSessionId;
-      public getImage_call(String uuid, String serverSessionId, org.apache.thrift.async.AsyncMethodCallback<getImage_call> 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 getImage_call(String uuid, 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 {
         super(client, protocolFactory, transport, resultHandler, false);
         this.uuid = uuid;
         this.serverSessionId = serverSessionId;
@@ -811,7 +813,492 @@ public class ImageServer {
 
   }
 
-  public static class ping_args implements org.apache.thrift.TBase<ping_args, ping_args._Fields>, java.io.Serializable, Cloneable   {
+  public static class AsyncProcessor<I extends AsyncIface> extends org.apache.thrift.TBaseAsyncProcessor<I> {
+    private static final Logger LOGGER = 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, ?>>()));
+    }
+
+    protected AsyncProcessor(I iface, Map<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) {
+      processMap.put("ping", new ping());
+      processMap.put("authenticate", new authenticate());
+      processMap.put("getUserFromToken", new getUserFromToken());
+      processMap.put("startServerAuthentication", new startServerAuthentication());
+      processMap.put("isServerAuthenticated", new isServerAuthenticated());
+      processMap.put("serverAuthenticate", new serverAuthenticate());
+      processMap.put("submitImage", new submitImage());
+      processMap.put("getImage", new getImage());
+      return processMap;
+    }
+
+    public static class ping<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, ping_args, Boolean> {
+      public ping() {
+        super("ping");
+      }
+
+      public ping_args getEmptyArgsInstance() {
+        return new ping_args();
+      }
+
+      public AsyncMethodCallback<Boolean> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+        final org.apache.thrift.AsyncProcessFunction fcall = this;
+        return new AsyncMethodCallback<Boolean>() { 
+          public void onComplete(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);
+            }
+            fb.close();
+          }
+          public void onError(Exception e) {
+            byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+            org.apache.thrift.TBase msg;
+            ping_result result = new ping_result();
+            {
+              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());
+            }
+            try {
+              fcall.sendResponse(fb,msg,msgType,seqid);
+              return;
+            } catch (Exception ex) {
+              LOGGER.error("Exception writing to internal frame buffer", ex);
+            }
+            fb.close();
+          }
+        };
+      }
+
+      protected boolean isOneway() {
+        return false;
+      }
+
+      public void start(I iface, ping_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
+        iface.ping(resultHandler);
+      }
+    }
+
+    public static class authenticate<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, authenticate_args, SessionData> {
+      public authenticate() {
+        super("authenticate");
+      }
+
+      public authenticate_args getEmptyArgsInstance() {
+        return new authenticate_args();
+      }
+
+      public AsyncMethodCallback<SessionData> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+        final org.apache.thrift.AsyncProcessFunction fcall = this;
+        return new 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);
+            }
+            fb.close();
+          }
+          public void onError(Exception e) {
+            byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+            org.apache.thrift.TBase msg;
+            authenticate_result result = new authenticate_result();
+            if (e instanceof AuthenticationException) {
+                        result.failure = (AuthenticationException) e;
+                        result.setFailureIsSet(true);
+                        msg = result;
+            }
+             else 
+            {
+              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());
+            }
+            try {
+              fcall.sendResponse(fb,msg,msgType,seqid);
+              return;
+            } catch (Exception ex) {
+              LOGGER.error("Exception writing to internal frame buffer", ex);
+            }
+            fb.close();
+          }
+        };
+      }
+
+      protected boolean isOneway() {
+        return false;
+      }
+
+      public void start(I iface, authenticate_args args, org.apache.thrift.async.AsyncMethodCallback<SessionData> resultHandler) throws TException {
+        iface.authenticate(args.username, args.password,resultHandler);
+      }
+    }
+
+    public static class getUserFromToken<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getUserFromToken_args, UserInfo> {
+      public getUserFromToken() {
+        super("getUserFromToken");
+      }
+
+      public getUserFromToken_args getEmptyArgsInstance() {
+        return new getUserFromToken_args();
+      }
+
+      public AsyncMethodCallback<UserInfo> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+        final org.apache.thrift.AsyncProcessFunction fcall = this;
+        return new 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);
+            }
+            fb.close();
+          }
+          public void onError(Exception e) {
+            byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+            org.apache.thrift.TBase msg;
+            getUserFromToken_result result = new getUserFromToken_result();
+            if (e instanceof InvalidTokenException) {
+                        result.failure = (InvalidTokenException) e;
+                        result.setFailureIsSet(true);
+                        msg = result;
+            }
+             else 
+            {
+              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());
+            }
+            try {
+              fcall.sendResponse(fb,msg,msgType,seqid);
+              return;
+            } catch (Exception ex) {
+              LOGGER.error("Exception writing to internal frame buffer", ex);
+            }
+            fb.close();
+          }
+        };
+      }
+
+      protected boolean isOneway() {
+        return false;
+      }
+
+      public void start(I iface, getUserFromToken_args args, org.apache.thrift.async.AsyncMethodCallback<UserInfo> resultHandler) throws TException {
+        iface.getUserFromToken(args.token,resultHandler);
+      }
+    }
+
+    public static class startServerAuthentication<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, startServerAuthentication_args, String> {
+      public startServerAuthentication() {
+        super("startServerAuthentication");
+      }
+
+      public startServerAuthentication_args getEmptyArgsInstance() {
+        return new startServerAuthentication_args();
+      }
+
+      public AsyncMethodCallback<String> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+        final org.apache.thrift.AsyncProcessFunction fcall = this;
+        return new AsyncMethodCallback<String>() { 
+          public void onComplete(String 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);
+            }
+            fb.close();
+          }
+          public void onError(Exception e) {
+            byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+            org.apache.thrift.TBase msg;
+            startServerAuthentication_result result = new startServerAuthentication_result();
+            if (e instanceof ServerAuthenticationException) {
+                        result.failure = (ServerAuthenticationException) e;
+                        result.setFailureIsSet(true);
+                        msg = result;
+            }
+             else 
+            {
+              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());
+            }
+            try {
+              fcall.sendResponse(fb,msg,msgType,seqid);
+              return;
+            } catch (Exception ex) {
+              LOGGER.error("Exception writing to internal frame buffer", ex);
+            }
+            fb.close();
+          }
+        };
+      }
+
+      protected boolean isOneway() {
+        return false;
+      }
+
+      public void start(I iface, startServerAuthentication_args args, org.apache.thrift.async.AsyncMethodCallback<String> resultHandler) throws TException {
+        iface.startServerAuthentication(args.organization,resultHandler);
+      }
+    }
+
+    public static class isServerAuthenticated<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, isServerAuthenticated_args, Boolean> {
+      public isServerAuthenticated() {
+        super("isServerAuthenticated");
+      }
+
+      public isServerAuthenticated_args getEmptyArgsInstance() {
+        return new isServerAuthenticated_args();
+      }
+
+      public AsyncMethodCallback<Boolean> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+        final org.apache.thrift.AsyncProcessFunction fcall = this;
+        return new AsyncMethodCallback<Boolean>() { 
+          public void onComplete(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);
+            }
+            fb.close();
+          }
+          public void onError(Exception e) {
+            byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+            org.apache.thrift.TBase msg;
+            isServerAuthenticated_result result = new isServerAuthenticated_result();
+            {
+              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());
+            }
+            try {
+              fcall.sendResponse(fb,msg,msgType,seqid);
+              return;
+            } catch (Exception ex) {
+              LOGGER.error("Exception writing to internal frame buffer", ex);
+            }
+            fb.close();
+          }
+        };
+      }
+
+      protected boolean isOneway() {
+        return false;
+      }
+
+      public void start(I iface, isServerAuthenticated_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
+        iface.isServerAuthenticated(args.serverSessionId,resultHandler);
+      }
+    }
+
+    public static class serverAuthenticate<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, serverAuthenticate_args, ServerSessionData> {
+      public serverAuthenticate() {
+        super("serverAuthenticate");
+      }
+
+      public serverAuthenticate_args getEmptyArgsInstance() {
+        return new serverAuthenticate_args();
+      }
+
+      public AsyncMethodCallback<ServerSessionData> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+        final org.apache.thrift.AsyncProcessFunction fcall = this;
+        return new 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);
+            }
+            fb.close();
+          }
+          public void onError(Exception e) {
+            byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+            org.apache.thrift.TBase msg;
+            serverAuthenticate_result result = new serverAuthenticate_result();
+            if (e instanceof ServerAuthenticationException) {
+                        result.failure = (ServerAuthenticationException) e;
+                        result.setFailureIsSet(true);
+                        msg = result;
+            }
+             else 
+            {
+              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());
+            }
+            try {
+              fcall.sendResponse(fb,msg,msgType,seqid);
+              return;
+            } catch (Exception ex) {
+              LOGGER.error("Exception writing to internal frame buffer", ex);
+            }
+            fb.close();
+          }
+        };
+      }
+
+      protected boolean isOneway() {
+        return false;
+      }
+
+      public void start(I iface, serverAuthenticate_args args, org.apache.thrift.async.AsyncMethodCallback<ServerSessionData> resultHandler) throws TException {
+        iface.serverAuthenticate(args.organization, args.challengeResponse,resultHandler);
+      }
+    }
+
+    public static class submitImage<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, submitImage_args, UploadInfos> {
+      public submitImage() {
+        super("submitImage");
+      }
+
+      public submitImage_args getEmptyArgsInstance() {
+        return new submitImage_args();
+      }
+
+      public AsyncMethodCallback<UploadInfos> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+        final org.apache.thrift.AsyncProcessFunction fcall = this;
+        return new AsyncMethodCallback<UploadInfos>() { 
+          public void onComplete(UploadInfos 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);
+            }
+            fb.close();
+          }
+          public void onError(Exception e) {
+            byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+            org.apache.thrift.TBase msg;
+            submitImage_result result = new submitImage_result();
+            if (e instanceof AuthorizationException) {
+                        result.failure = (AuthorizationException) e;
+                        result.setFailureIsSet(true);
+                        msg = result;
+            }
+            else             if (e instanceof ImageDataException) {
+                        result.failure2 = (ImageDataException) e;
+                        result.setFailure2IsSet(true);
+                        msg = result;
+            }
+            else             if (e instanceof UploadException) {
+                        result.failure3 = (UploadException) e;
+                        result.setFailure3IsSet(true);
+                        msg = result;
+            }
+             else 
+            {
+              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());
+            }
+            try {
+              fcall.sendResponse(fb,msg,msgType,seqid);
+              return;
+            } catch (Exception ex) {
+              LOGGER.error("Exception writing to internal frame buffer", ex);
+            }
+            fb.close();
+          }
+        };
+      }
+
+      protected boolean isOneway() {
+        return false;
+      }
+
+      public void start(I iface, submitImage_args args, org.apache.thrift.async.AsyncMethodCallback<UploadInfos> resultHandler) throws TException {
+        iface.submitImage(args.serverSessionId, args.imageDescription, args.crcSums,resultHandler);
+      }
+    }
+
+    public static class getImage<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getImage_args, DownloadInfos> {
+      public getImage() {
+        super("getImage");
+      }
+
+      public getImage_args getEmptyArgsInstance() {
+        return new getImage_args();
+      }
+
+      public AsyncMethodCallback<DownloadInfos> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+        final org.apache.thrift.AsyncProcessFunction fcall = this;
+        return new AsyncMethodCallback<DownloadInfos>() { 
+          public void onComplete(DownloadInfos o) {
+            getImage_result result = new getImage_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);
+            }
+            fb.close();
+          }
+          public void onError(Exception e) {
+            byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+            org.apache.thrift.TBase msg;
+            getImage_result result = new getImage_result();
+            if (e instanceof AuthorizationException) {
+                        result.failure = (AuthorizationException) e;
+                        result.setFailureIsSet(true);
+                        msg = result;
+            }
+            else             if (e instanceof ImageDataException) {
+                        result.failure2 = (ImageDataException) e;
+                        result.setFailure2IsSet(true);
+                        msg = result;
+            }
+             else 
+            {
+              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());
+            }
+            try {
+              fcall.sendResponse(fb,msg,msgType,seqid);
+              return;
+            } catch (Exception ex) {
+              LOGGER.error("Exception writing to internal frame buffer", ex);
+            }
+            fb.close();
+          }
+        };
+      }
+
+      protected boolean isOneway() {
+        return false;
+      }
+
+      public void start(I iface, getImage_args args, org.apache.thrift.async.AsyncMethodCallback<DownloadInfos> resultHandler) throws TException {
+        iface.getImage(args.uuid, args.serverSessionId,resultHandler);
+      }
+    }
+
+  }
+
+  public static class ping_args implements org.apache.thrift.TBase<ping_args, ping_args._Fields>, java.io.Serializable, Cloneable, Comparable<ping_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ping_args");
 
 
@@ -944,13 +1431,13 @@ public class ImageServer {
       return 0;
     }
 
+    @Override
     public int compareTo(ping_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      ping_args typedOther = (ping_args)other;
 
       return 0;
     }
@@ -1057,7 +1544,7 @@ public class ImageServer {
 
   }
 
-  public static class ping_result implements org.apache.thrift.TBase<ping_result, ping_result._Fields>, java.io.Serializable, Cloneable   {
+  public static class ping_result implements org.apache.thrift.TBase<ping_result, ping_result._Fields>, java.io.Serializable, Cloneable, Comparable<ping_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ping_result");
 
     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);
@@ -1257,20 +1744,20 @@ public class ImageServer {
       return 0;
     }
 
+    @Override
     public int compareTo(ping_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      ping_result typedOther = (ping_result)other;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetSuccess()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -1411,7 +1898,7 @@ public class ImageServer {
 
   }
 
-  public static class authenticate_args implements org.apache.thrift.TBase<authenticate_args, authenticate_args._Fields>, java.io.Serializable, Cloneable   {
+  public static class authenticate_args implements org.apache.thrift.TBase<authenticate_args, authenticate_args._Fields>, java.io.Serializable, Cloneable, Comparable<authenticate_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("authenticate_args");
 
     private static final org.apache.thrift.protocol.TField USERNAME_FIELD_DESC = new org.apache.thrift.protocol.TField("username", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -1668,30 +2155,30 @@ public class ImageServer {
       return 0;
     }
 
+    @Override
     public int compareTo(authenticate_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      authenticate_args typedOther = (authenticate_args)other;
 
-      lastComparison = Boolean.valueOf(isSetUsername()).compareTo(typedOther.isSetUsername());
+      lastComparison = Boolean.valueOf(isSetUsername()).compareTo(other.isSetUsername());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetUsername()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.username, typedOther.username);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.username, other.username);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetPassword()).compareTo(typedOther.isSetPassword());
+      lastComparison = Boolean.valueOf(isSetPassword()).compareTo(other.isSetPassword());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetPassword()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.password, typedOther.password);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.password, other.password);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -1865,7 +2352,7 @@ public class ImageServer {
 
   }
 
-  public static class authenticate_result implements org.apache.thrift.TBase<authenticate_result, authenticate_result._Fields>, java.io.Serializable, Cloneable   {
+  public static class authenticate_result implements org.apache.thrift.TBase<authenticate_result, authenticate_result._Fields>, java.io.Serializable, Cloneable, Comparable<authenticate_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("authenticate_result");
 
     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);
@@ -2122,30 +2609,30 @@ public class ImageServer {
       return 0;
     }
 
+    @Override
     public int compareTo(authenticate_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      authenticate_result typedOther = (authenticate_result)other;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetSuccess()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(typedOther.isSetFailure());
+      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetFailure()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, typedOther.failure);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, other.failure);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -2326,7 +2813,7 @@ public class ImageServer {
 
   }
 
-  public static class getUserFromToken_args implements org.apache.thrift.TBase<getUserFromToken_args, getUserFromToken_args._Fields>, java.io.Serializable, Cloneable   {
+  public static class getUserFromToken_args implements org.apache.thrift.TBase<getUserFromToken_args, getUserFromToken_args._Fields>, java.io.Serializable, Cloneable, Comparable<getUserFromToken_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getUserFromToken_args");
 
     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);
@@ -2524,20 +3011,20 @@ public class ImageServer {
       return 0;
     }
 
+    @Override
     public int compareTo(getUserFromToken_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      getUserFromToken_args typedOther = (getUserFromToken_args)other;
 
-      lastComparison = Boolean.valueOf(isSetToken()).compareTo(typedOther.isSetToken());
+      lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetToken()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, typedOther.token);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -2680,7 +3167,7 @@ public class ImageServer {
 
   }
 
-  public static class getUserFromToken_result implements org.apache.thrift.TBase<getUserFromToken_result, getUserFromToken_result._Fields>, java.io.Serializable, Cloneable   {
+  public static class getUserFromToken_result implements org.apache.thrift.TBase<getUserFromToken_result, getUserFromToken_result._Fields>, java.io.Serializable, Cloneable, Comparable<getUserFromToken_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getUserFromToken_result");
 
     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);
@@ -2937,30 +3424,30 @@ public class ImageServer {
       return 0;
     }
 
+    @Override
     public int compareTo(getUserFromToken_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      getUserFromToken_result typedOther = (getUserFromToken_result)other;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetSuccess()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(typedOther.isSetFailure());
+      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetFailure()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, typedOther.failure);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, other.failure);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -3141,7 +3628,7 @@ public class ImageServer {
 
   }
 
-  public static class startServerAuthentication_args implements org.apache.thrift.TBase<startServerAuthentication_args, startServerAuthentication_args._Fields>, java.io.Serializable, Cloneable   {
+  public static class startServerAuthentication_args implements org.apache.thrift.TBase<startServerAuthentication_args, startServerAuthentication_args._Fields>, java.io.Serializable, Cloneable, Comparable<startServerAuthentication_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("startServerAuthentication_args");
 
     private static final org.apache.thrift.protocol.TField ORGANIZATION_FIELD_DESC = new org.apache.thrift.protocol.TField("organization", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -3339,20 +3826,20 @@ public class ImageServer {
       return 0;
     }
 
+    @Override
     public int compareTo(startServerAuthentication_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      startServerAuthentication_args typedOther = (startServerAuthentication_args)other;
 
-      lastComparison = Boolean.valueOf(isSetOrganization()).compareTo(typedOther.isSetOrganization());
+      lastComparison = Boolean.valueOf(isSetOrganization()).compareTo(other.isSetOrganization());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetOrganization()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.organization, typedOther.organization);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.organization, other.organization);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -3495,7 +3982,7 @@ public class ImageServer {
 
   }
 
-  public static class startServerAuthentication_result implements org.apache.thrift.TBase<startServerAuthentication_result, startServerAuthentication_result._Fields>, java.io.Serializable, Cloneable   {
+  public static class startServerAuthentication_result implements org.apache.thrift.TBase<startServerAuthentication_result, startServerAuthentication_result._Fields>, java.io.Serializable, Cloneable, Comparable<startServerAuthentication_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("startServerAuthentication_result");
 
     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);
@@ -3752,30 +4239,30 @@ public class ImageServer {
       return 0;
     }
 
+    @Override
     public int compareTo(startServerAuthentication_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      startServerAuthentication_result typedOther = (startServerAuthentication_result)other;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetSuccess()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(typedOther.isSetFailure());
+      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetFailure()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, typedOther.failure);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, other.failure);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -3951,7 +4438,7 @@ public class ImageServer {
 
   }
 
-  public static class isServerAuthenticated_args implements org.apache.thrift.TBase<isServerAuthenticated_args, isServerAuthenticated_args._Fields>, java.io.Serializable, Cloneable   {
+  public static class isServerAuthenticated_args implements org.apache.thrift.TBase<isServerAuthenticated_args, isServerAuthenticated_args._Fields>, java.io.Serializable, Cloneable, Comparable<isServerAuthenticated_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("isServerAuthenticated_args");
 
     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);
@@ -4149,20 +4636,20 @@ public class ImageServer {
       return 0;
     }
 
+    @Override
     public int compareTo(isServerAuthenticated_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      isServerAuthenticated_args typedOther = (isServerAuthenticated_args)other;
 
-      lastComparison = Boolean.valueOf(isSetServerSessionId()).compareTo(typedOther.isSetServerSessionId());
+      lastComparison = Boolean.valueOf(isSetServerSessionId()).compareTo(other.isSetServerSessionId());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetServerSessionId()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverSessionId, typedOther.serverSessionId);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverSessionId, other.serverSessionId);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -4305,7 +4792,7 @@ public class ImageServer {
 
   }
 
-  public static class isServerAuthenticated_result implements org.apache.thrift.TBase<isServerAuthenticated_result, isServerAuthenticated_result._Fields>, java.io.Serializable, Cloneable   {
+  public static class isServerAuthenticated_result implements org.apache.thrift.TBase<isServerAuthenticated_result, isServerAuthenticated_result._Fields>, java.io.Serializable, Cloneable, Comparable<isServerAuthenticated_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("isServerAuthenticated_result");
 
     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);
@@ -4505,20 +4992,20 @@ public class ImageServer {
       return 0;
     }
 
+    @Override
     public int compareTo(isServerAuthenticated_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      isServerAuthenticated_result typedOther = (isServerAuthenticated_result)other;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetSuccess()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -4659,7 +5146,7 @@ public class ImageServer {
 
   }
 
-  public static class serverAuthenticate_args implements org.apache.thrift.TBase<serverAuthenticate_args, serverAuthenticate_args._Fields>, java.io.Serializable, Cloneable   {
+  public static class serverAuthenticate_args implements org.apache.thrift.TBase<serverAuthenticate_args, serverAuthenticate_args._Fields>, java.io.Serializable, Cloneable, Comparable<serverAuthenticate_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("serverAuthenticate_args");
 
     private static final org.apache.thrift.protocol.TField ORGANIZATION_FIELD_DESC = new org.apache.thrift.protocol.TField("organization", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -4927,30 +5414,30 @@ public class ImageServer {
       return 0;
     }
 
+    @Override
     public int compareTo(serverAuthenticate_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      serverAuthenticate_args typedOther = (serverAuthenticate_args)other;
 
-      lastComparison = Boolean.valueOf(isSetOrganization()).compareTo(typedOther.isSetOrganization());
+      lastComparison = Boolean.valueOf(isSetOrganization()).compareTo(other.isSetOrganization());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetOrganization()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.organization, typedOther.organization);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.organization, other.organization);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetChallengeResponse()).compareTo(typedOther.isSetChallengeResponse());
+      lastComparison = Boolean.valueOf(isSetChallengeResponse()).compareTo(other.isSetChallengeResponse());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetChallengeResponse()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.challengeResponse, typedOther.challengeResponse);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.challengeResponse, other.challengeResponse);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -5124,7 +5611,7 @@ public class ImageServer {
 
   }
 
-  public static class serverAuthenticate_result implements org.apache.thrift.TBase<serverAuthenticate_result, serverAuthenticate_result._Fields>, java.io.Serializable, Cloneable   {
+  public static class serverAuthenticate_result implements org.apache.thrift.TBase<serverAuthenticate_result, serverAuthenticate_result._Fields>, java.io.Serializable, Cloneable, Comparable<serverAuthenticate_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("serverAuthenticate_result");
 
     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);
@@ -5381,30 +5868,30 @@ public class ImageServer {
       return 0;
     }
 
+    @Override
     public int compareTo(serverAuthenticate_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      serverAuthenticate_result typedOther = (serverAuthenticate_result)other;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetSuccess()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(typedOther.isSetFailure());
+      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetFailure()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, typedOther.failure);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, other.failure);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -5585,7 +6072,7 @@ public class ImageServer {
 
   }
 
-  public static class submitImage_args implements org.apache.thrift.TBase<submitImage_args, submitImage_args._Fields>, java.io.Serializable, Cloneable   {
+  public static class submitImage_args implements org.apache.thrift.TBase<submitImage_args, submitImage_args._Fields>, java.io.Serializable, Cloneable, Comparable<submitImage_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("submitImage_args");
 
     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);
@@ -5706,10 +6193,7 @@ public class ImageServer {
         this.imageDescription = new ImageData(other.imageDescription);
       }
       if (other.isSetCrcSums()) {
-        List<Integer> __this__crcSums = new ArrayList<Integer>();
-        for (Integer other_element : other.crcSums) {
-          __this__crcSums.add(other_element);
-        }
+        List<Integer> __this__crcSums = new ArrayList<Integer>(other.crcSums);
         this.crcSums = __this__crcSums;
       }
     }
@@ -5921,40 +6405,40 @@ public class ImageServer {
       return 0;
     }
 
+    @Override
     public int compareTo(submitImage_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      submitImage_args typedOther = (submitImage_args)other;
 
-      lastComparison = Boolean.valueOf(isSetServerSessionId()).compareTo(typedOther.isSetServerSessionId());
+      lastComparison = Boolean.valueOf(isSetServerSessionId()).compareTo(other.isSetServerSessionId());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetServerSessionId()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverSessionId, typedOther.serverSessionId);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverSessionId, other.serverSessionId);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetImageDescription()).compareTo(typedOther.isSetImageDescription());
+      lastComparison = Boolean.valueOf(isSetImageDescription()).compareTo(other.isSetImageDescription());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetImageDescription()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imageDescription, typedOther.imageDescription);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imageDescription, other.imageDescription);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetCrcSums()).compareTo(typedOther.isSetCrcSums());
+      lastComparison = Boolean.valueOf(isSetCrcSums()).compareTo(other.isSetCrcSums());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetCrcSums()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.crcSums, typedOther.crcSums);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.crcSums, other.crcSums);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -6072,7 +6556,7 @@ public class ImageServer {
                   struct.crcSums = new ArrayList<Integer>(_list0.size);
                   for (int _i1 = 0; _i1 < _list0.size; ++_i1)
                   {
-                    int _elem2; // required
+                    int _elem2;
                     _elem2 = iprot.readI32();
                     struct.crcSums.add(_elem2);
                   }
@@ -6184,7 +6668,7 @@ public class ImageServer {
             struct.crcSums = new ArrayList<Integer>(_list5.size);
             for (int _i6 = 0; _i6 < _list5.size; ++_i6)
             {
-              int _elem7; // required
+              int _elem7;
               _elem7 = iprot.readI32();
               struct.crcSums.add(_elem7);
             }
@@ -6196,7 +6680,7 @@ public class ImageServer {
 
   }
 
-  public static class submitImage_result implements org.apache.thrift.TBase<submitImage_result, submitImage_result._Fields>, java.io.Serializable, Cloneable   {
+  public static class submitImage_result implements org.apache.thrift.TBase<submitImage_result, submitImage_result._Fields>, java.io.Serializable, Cloneable, Comparable<submitImage_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("submitImage_result");
 
     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);
@@ -6571,50 +7055,50 @@ public class ImageServer {
       return 0;
     }
 
+    @Override
     public int compareTo(submitImage_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      submitImage_result typedOther = (submitImage_result)other;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetSuccess()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(typedOther.isSetFailure());
+      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetFailure()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, typedOther.failure);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, other.failure);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFailure2()).compareTo(typedOther.isSetFailure2());
+      lastComparison = Boolean.valueOf(isSetFailure2()).compareTo(other.isSetFailure2());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetFailure2()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure2, typedOther.failure2);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure2, other.failure2);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFailure3()).compareTo(typedOther.isSetFailure3());
+      lastComparison = Boolean.valueOf(isSetFailure3()).compareTo(other.isSetFailure3());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetFailure3()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure3, typedOther.failure3);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure3, other.failure3);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -6861,7 +7345,7 @@ public class ImageServer {
 
   }
 
-  public static class getImage_args implements org.apache.thrift.TBase<getImage_args, getImage_args._Fields>, java.io.Serializable, Cloneable   {
+  public static class getImage_args implements org.apache.thrift.TBase<getImage_args, getImage_args._Fields>, java.io.Serializable, Cloneable, Comparable<getImage_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getImage_args");
 
     private static final org.apache.thrift.protocol.TField UUID_FIELD_DESC = new org.apache.thrift.protocol.TField("uuid", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -7118,30 +7602,30 @@ public class ImageServer {
       return 0;
     }
 
+    @Override
     public int compareTo(getImage_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      getImage_args typedOther = (getImage_args)other;
 
-      lastComparison = Boolean.valueOf(isSetUuid()).compareTo(typedOther.isSetUuid());
+      lastComparison = Boolean.valueOf(isSetUuid()).compareTo(other.isSetUuid());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetUuid()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.uuid, typedOther.uuid);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.uuid, other.uuid);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetServerSessionId()).compareTo(typedOther.isSetServerSessionId());
+      lastComparison = Boolean.valueOf(isSetServerSessionId()).compareTo(other.isSetServerSessionId());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetServerSessionId()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverSessionId, typedOther.serverSessionId);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverSessionId, other.serverSessionId);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -7315,7 +7799,7 @@ public class ImageServer {
 
   }
 
-  public static class getImage_result implements org.apache.thrift.TBase<getImage_result, getImage_result._Fields>, java.io.Serializable, Cloneable   {
+  public static class getImage_result implements org.apache.thrift.TBase<getImage_result, getImage_result._Fields>, java.io.Serializable, Cloneable, Comparable<getImage_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getImage_result");
 
     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);
@@ -7631,40 +8115,40 @@ public class ImageServer {
       return 0;
     }
 
+    @Override
     public int compareTo(getImage_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      getImage_result typedOther = (getImage_result)other;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetSuccess()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(typedOther.isSetFailure());
+      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetFailure()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, typedOther.failure);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, other.failure);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFailure2()).compareTo(typedOther.isSetFailure2());
+      lastComparison = Boolean.valueOf(isSetFailure2()).compareTo(other.isSetFailure2());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetFailure2()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure2, typedOther.failure2);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure2, other.failure2);
         if (lastComparison != 0) {
           return lastComparison;
         }
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/InvalidTokenException.java b/src/main/java/org/openslx/imagemaster/thrift/iface/InvalidTokenException.java
index 50a6e5d..e163c4f 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/InvalidTokenException.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/InvalidTokenException.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -15,6 +15,8 @@ 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;
@@ -30,7 +32,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class InvalidTokenException extends TException implements org.apache.thrift.TBase<InvalidTokenException, InvalidTokenException._Fields>, java.io.Serializable, Cloneable {
+public class InvalidTokenException extends TException implements org.apache.thrift.TBase<InvalidTokenException, InvalidTokenException._Fields>, java.io.Serializable, Cloneable, Comparable<InvalidTokenException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InvalidTokenException");
 
 
@@ -163,13 +165,13 @@ public class InvalidTokenException extends TException implements org.apache.thri
     return 0;
   }
 
+  @Override
   public int compareTo(InvalidTokenException other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    InvalidTokenException typedOther = (InvalidTokenException)other;
 
     return 0;
   }
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/ServerAuthenticationError.java b/src/main/java/org/openslx/imagemaster/thrift/iface/ServerAuthenticationError.java
index 406ed80..df3f9b6 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/ServerAuthenticationError.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/ServerAuthenticationError.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/ServerAuthenticationException.java b/src/main/java/org/openslx/imagemaster/thrift/iface/ServerAuthenticationException.java
index ee78ac1..69c29b7 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/ServerAuthenticationException.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/ServerAuthenticationException.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -15,6 +15,8 @@ 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;
@@ -30,7 +32,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class ServerAuthenticationException extends TException implements org.apache.thrift.TBase<ServerAuthenticationException, ServerAuthenticationException._Fields>, java.io.Serializable, Cloneable {
+public class ServerAuthenticationException extends TException implements org.apache.thrift.TBase<ServerAuthenticationException, ServerAuthenticationException._Fields>, java.io.Serializable, Cloneable, Comparable<ServerAuthenticationException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ServerAuthenticationException");
 
   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);
@@ -303,30 +305,30 @@ public class ServerAuthenticationException extends TException implements org.apa
     return 0;
   }
 
+  @Override
   public int compareTo(ServerAuthenticationException other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    ServerAuthenticationException typedOther = (ServerAuthenticationException)other;
 
-    lastComparison = Boolean.valueOf(isSetNumber()).compareTo(typedOther.isSetNumber());
+    lastComparison = Boolean.valueOf(isSetNumber()).compareTo(other.isSetNumber());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetNumber()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.number, typedOther.number);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.number, other.number);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(typedOther.isSetMessage());
+    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(other.isSetMessage());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMessage()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, typedOther.message);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, other.message);
       if (lastComparison != 0) {
         return lastComparison;
       }
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/ServerSessionData.java b/src/main/java/org/openslx/imagemaster/thrift/iface/ServerSessionData.java
index ce5482a..8f8893a 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/ServerSessionData.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/ServerSessionData.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -15,6 +15,8 @@ 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;
@@ -30,7 +32,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class ServerSessionData implements org.apache.thrift.TBase<ServerSessionData, ServerSessionData._Fields>, java.io.Serializable, Cloneable {
+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);
@@ -228,20 +230,20 @@ public class ServerSessionData implements org.apache.thrift.TBase<ServerSessionD
     return 0;
   }
 
+  @Override
   public int compareTo(ServerSessionData other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    ServerSessionData typedOther = (ServerSessionData)other;
 
-    lastComparison = Boolean.valueOf(isSetSessionId()).compareTo(typedOther.isSetSessionId());
+    lastComparison = Boolean.valueOf(isSetSessionId()).compareTo(other.isSetSessionId());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetSessionId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sessionId, typedOther.sessionId);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sessionId, other.sessionId);
       if (lastComparison != 0) {
         return lastComparison;
       }
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/SessionData.java b/src/main/java/org/openslx/imagemaster/thrift/iface/SessionData.java
index a1a30e1..711abeb 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/SessionData.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/SessionData.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -15,6 +15,8 @@ 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;
@@ -30,7 +32,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class SessionData implements org.apache.thrift.TBase<SessionData, SessionData._Fields>, java.io.Serializable, Cloneable {
+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");
 
   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);
@@ -346,40 +348,40 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session
     return 0;
   }
 
+  @Override
   public int compareTo(SessionData other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    SessionData typedOther = (SessionData)other;
 
-    lastComparison = Boolean.valueOf(isSetSessionId()).compareTo(typedOther.isSetSessionId());
+    lastComparison = Boolean.valueOf(isSetSessionId()).compareTo(other.isSetSessionId());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetSessionId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sessionId, typedOther.sessionId);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sessionId, other.sessionId);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetAuthToken()).compareTo(typedOther.isSetAuthToken());
+    lastComparison = Boolean.valueOf(isSetAuthToken()).compareTo(other.isSetAuthToken());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetAuthToken()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.authToken, typedOther.authToken);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.authToken, other.authToken);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetServerAddress()).compareTo(typedOther.isSetServerAddress());
+    lastComparison = Boolean.valueOf(isSetServerAddress()).compareTo(other.isSetServerAddress());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetServerAddress()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverAddress, typedOther.serverAddress);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverAddress, other.serverAddress);
       if (lastComparison != 0) {
         return lastComparison;
       }
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/UploadError.java b/src/main/java/org/openslx/imagemaster/thrift/iface/UploadError.java
index 02a8f9e..0a50985 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/UploadError.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/UploadError.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -13,7 +13,9 @@ import org.apache.thrift.TEnum;
 
 public enum UploadError implements org.apache.thrift.TEnum {
   INVALID_CRC(0),
-  BROKEN_BLOCK(1);
+  BROKEN_BLOCK(1),
+  GENERIC_ERROR(2),
+  INVALID_METADATA(3);
 
   private final int value;
 
@@ -38,6 +40,10 @@ public enum UploadError implements org.apache.thrift.TEnum {
         return INVALID_CRC;
       case 1:
         return BROKEN_BLOCK;
+      case 2:
+        return GENERIC_ERROR;
+      case 3:
+        return INVALID_METADATA;
       default:
         return null;
     }
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/UploadException.java b/src/main/java/org/openslx/imagemaster/thrift/iface/UploadException.java
index eeaee66..bc4c150 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/UploadException.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/UploadException.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -15,6 +15,8 @@ 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;
@@ -30,7 +32,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class UploadException extends TException implements org.apache.thrift.TBase<UploadException, UploadException._Fields>, java.io.Serializable, Cloneable {
+public class UploadException extends TException implements org.apache.thrift.TBase<UploadException, UploadException._Fields>, java.io.Serializable, Cloneable, Comparable<UploadException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UploadException");
 
   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);
@@ -303,30 +305,30 @@ public class UploadException extends TException implements org.apache.thrift.TBa
     return 0;
   }
 
+  @Override
   public int compareTo(UploadException other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    UploadException typedOther = (UploadException)other;
 
-    lastComparison = Boolean.valueOf(isSetNumber()).compareTo(typedOther.isSetNumber());
+    lastComparison = Boolean.valueOf(isSetNumber()).compareTo(other.isSetNumber());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetNumber()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.number, typedOther.number);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.number, other.number);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(typedOther.isSetMessage());
+    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(other.isSetMessage());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMessage()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, typedOther.message);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, other.message);
       if (lastComparison != 0) {
         return lastComparison;
       }
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/UploadInfos.java b/src/main/java/org/openslx/imagemaster/thrift/iface/UploadInfos.java
index 3de9d62..352ffc4 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/UploadInfos.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/UploadInfos.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -15,6 +15,8 @@ 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;
@@ -30,7 +32,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class UploadInfos implements org.apache.thrift.TBase<UploadInfos, UploadInfos._Fields>, java.io.Serializable, Cloneable {
+public class UploadInfos implements org.apache.thrift.TBase<UploadInfos, UploadInfos._Fields>, java.io.Serializable, Cloneable, Comparable<UploadInfos> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UploadInfos");
 
   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);
@@ -289,30 +291,30 @@ public class UploadInfos implements org.apache.thrift.TBase<UploadInfos, UploadI
     return 0;
   }
 
+  @Override
   public int compareTo(UploadInfos other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    UploadInfos typedOther = (UploadInfos)other;
 
-    lastComparison = Boolean.valueOf(isSetToken()).compareTo(typedOther.isSetToken());
+    lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetToken()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, typedOther.token);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetPort()).compareTo(typedOther.isSetPort());
+    lastComparison = Boolean.valueOf(isSetPort()).compareTo(other.isSetPort());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetPort()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.port, typedOther.port);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.port, other.port);
       if (lastComparison != 0) {
         return lastComparison;
       }
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/UserInfo.java b/src/main/java/org/openslx/imagemaster/thrift/iface/UserInfo.java
index 98f329d..67f9340 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/UserInfo.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/UserInfo.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -15,6 +15,8 @@ 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;
@@ -30,7 +32,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fields>, java.io.Serializable, Cloneable {
+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");
 
   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)1);
@@ -405,50 +407,50 @@ public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fie
     return 0;
   }
 
+  @Override
   public int compareTo(UserInfo other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    UserInfo typedOther = (UserInfo)other;
 
-    lastComparison = Boolean.valueOf(isSetUserId()).compareTo(typedOther.isSetUserId());
+    lastComparison = Boolean.valueOf(isSetUserId()).compareTo(other.isSetUserId());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetUserId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.userId, typedOther.userId);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.userId, other.userId);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetFirstName()).compareTo(typedOther.isSetFirstName());
+    lastComparison = Boolean.valueOf(isSetFirstName()).compareTo(other.isSetFirstName());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetFirstName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.firstName, typedOther.firstName);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.firstName, other.firstName);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetLastName()).compareTo(typedOther.isSetLastName());
+    lastComparison = Boolean.valueOf(isSetLastName()).compareTo(other.isSetLastName());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetLastName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lastName, typedOther.lastName);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lastName, other.lastName);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetEMail()).compareTo(typedOther.isSetEMail());
+    lastComparison = Boolean.valueOf(isSetEMail()).compareTo(other.isSetEMail());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetEMail()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.eMail, typedOther.eMail);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.eMail, other.eMail);
       if (lastComparison != 0) {
         return lastComparison;
       }