First adaptions to new filetransfer class.

19 files changed, 311 insertions, 1415 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 e2b2b89..8e9c880 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 (1.0.0-dev)
+ * Autogenerated by Thrift Compiler (0.9.0)
  *
  * 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 b700583..bd4bb0b 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 (1.0.0-dev)
+ * Autogenerated by Thrift Compiler (0.9.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -15,8 +15,6 @@ 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;
@@ -29,13 +27,10 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
-import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-21")
-public class AuthenticationException extends TException implements org.apache.thrift.TBase<AuthenticationException, AuthenticationException._Fields>, java.io.Serializable, Cloneable, Comparable<AuthenticationException> {
+public class AuthenticationException extends TException implements org.apache.thrift.TBase<AuthenticationException, AuthenticationException._Fields>, java.io.Serializable, Cloneable {
   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);
@@ -305,45 +300,33 @@ public class AuthenticationException extends TException implements org.apache.th
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_number = true && (isSetNumber());
-    list.add(present_number);
-    if (present_number)
-      list.add(number.getValue());
-
-    boolean present_message = true && (isSetMessage());
-    list.add(present_message);
-    if (present_message)
-      list.add(message);
-
-    return list.hashCode();
+    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(other.isSetNumber());
+    lastComparison = Boolean.valueOf(isSetNumber()).compareTo(typedOther.isSetNumber());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetNumber()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.number, other.number);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.number, typedOther.number);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(other.isSetMessage());
+    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(typedOther.isSetMessage());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMessage()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, other.message);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, typedOther.message);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -428,7 +411,7 @@ public class AuthenticationException extends TException implements org.apache.th
         switch (schemeField.id) {
           case 1: // NUMBER
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.number = org.openslx.imagemaster.thrift.iface.AuthenticationError.findByValue(iprot.readI32());
+              struct.number = AuthenticationError.findByValue(iprot.readI32());
               struct.setNumberIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -505,7 +488,7 @@ public class AuthenticationException extends TException implements org.apache.th
       TTupleProtocol iprot = (TTupleProtocol) prot;
       BitSet incoming = iprot.readBitSet(2);
       if (incoming.get(0)) {
-        struct.number = org.openslx.imagemaster.thrift.iface.AuthenticationError.findByValue(iprot.readI32());
+        struct.number = AuthenticationError.findByValue(iprot.readI32());
         struct.setNumberIsSet(true);
       }
       if (incoming.get(1)) {
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 7c23166..61c5960 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 (1.0.0-dev)
+ * Autogenerated by Thrift Compiler (0.9.0)
  *
  * 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 4236b80..fec2e3e 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 (1.0.0-dev)
+ * Autogenerated by Thrift Compiler (0.9.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -15,8 +15,6 @@ 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;
@@ -29,13 +27,10 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
-import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-21")
-public class AuthorizationException extends TException implements org.apache.thrift.TBase<AuthorizationException, AuthorizationException._Fields>, java.io.Serializable, Cloneable, Comparable<AuthorizationException> {
+public class AuthorizationException extends TException implements org.apache.thrift.TBase<AuthorizationException, AuthorizationException._Fields>, java.io.Serializable, Cloneable {
   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);
@@ -305,45 +300,33 @@ public class AuthorizationException extends TException implements org.apache.thr
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_number = true && (isSetNumber());
-    list.add(present_number);
-    if (present_number)
-      list.add(number.getValue());
-
-    boolean present_message = true && (isSetMessage());
-    list.add(present_message);
-    if (present_message)
-      list.add(message);
-
-    return list.hashCode();
+    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(other.isSetNumber());
+    lastComparison = Boolean.valueOf(isSetNumber()).compareTo(typedOther.isSetNumber());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetNumber()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.number, other.number);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.number, typedOther.number);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(other.isSetMessage());
+    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(typedOther.isSetMessage());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMessage()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, other.message);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, typedOther.message);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -428,7 +411,7 @@ public class AuthorizationException extends TException implements org.apache.thr
         switch (schemeField.id) {
           case 1: // NUMBER
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.number = org.openslx.imagemaster.thrift.iface.AuthorizationError.findByValue(iprot.readI32());
+              struct.number = AuthorizationError.findByValue(iprot.readI32());
               struct.setNumberIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -505,7 +488,7 @@ public class AuthorizationException extends TException implements org.apache.thr
       TTupleProtocol iprot = (TTupleProtocol) prot;
       BitSet incoming = iprot.readBitSet(2);
       if (incoming.get(0)) {
-        struct.number = org.openslx.imagemaster.thrift.iface.AuthorizationError.findByValue(iprot.readI32());
+        struct.number = AuthorizationError.findByValue(iprot.readI32());
         struct.setNumberIsSet(true);
       }
       if (incoming.get(1)) {
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 644af99..3cdedec 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 (1.0.0-dev)
+ * Autogenerated by Thrift Compiler (0.9.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -15,8 +15,6 @@ 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;
@@ -29,13 +27,10 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
-import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-21")
-public class DownloadInfos implements org.apache.thrift.TBase<DownloadInfos, DownloadInfos._Fields>, java.io.Serializable, Cloneable, Comparable<DownloadInfos> {
+public class DownloadInfos implements org.apache.thrift.TBase<DownloadInfos, DownloadInfos._Fields>, java.io.Serializable, Cloneable {
   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);
@@ -291,45 +286,33 @@ public class DownloadInfos implements org.apache.thrift.TBase<DownloadInfos, Dow
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_token = true && (isSetToken());
-    list.add(present_token);
-    if (present_token)
-      list.add(token);
-
-    boolean present_port = true;
-    list.add(present_port);
-    if (present_port)
-      list.add(port);
-
-    return list.hashCode();
+    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(other.isSetToken());
+    lastComparison = Boolean.valueOf(isSetToken()).compareTo(typedOther.isSetToken());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetToken()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, typedOther.token);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetPort()).compareTo(other.isSetPort());
+    lastComparison = Boolean.valueOf(isSetPort()).compareTo(typedOther.isSetPort());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetPort()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.port, other.port);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.port, typedOther.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
index c16b46d..a3a292f 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/FtpCredentials.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/FtpCredentials.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (1.0.0-dev)
+ * Autogenerated by Thrift Compiler (0.9.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -15,8 +15,6 @@ 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;
@@ -29,13 +27,10 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
-import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-21")
-public class FtpCredentials implements org.apache.thrift.TBase<FtpCredentials, FtpCredentials._Fields>, java.io.Serializable, Cloneable, Comparable<FtpCredentials> {
+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);
@@ -348,60 +343,43 @@ public class FtpCredentials implements org.apache.thrift.TBase<FtpCredentials, F
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_username = true && (isSetUsername());
-    list.add(present_username);
-    if (present_username)
-      list.add(username);
-
-    boolean present_password = true && (isSetPassword());
-    list.add(present_password);
-    if (present_password)
-      list.add(password);
-
-    boolean present_filename = true && (isSetFilename());
-    list.add(present_filename);
-    if (present_filename)
-      list.add(filename);
-
-    return list.hashCode();
+    return 0;
   }
 
-  @Override
   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(other.isSetUsername());
+    lastComparison = Boolean.valueOf(isSetUsername()).compareTo(typedOther.isSetUsername());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetUsername()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.username, other.username);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.username, typedOther.username);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetPassword()).compareTo(other.isSetPassword());
+    lastComparison = Boolean.valueOf(isSetPassword()).compareTo(typedOther.isSetPassword());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetPassword()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.password, other.password);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.password, typedOther.password);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetFilename()).compareTo(other.isSetFilename());
+    lastComparison = Boolean.valueOf(isSetFilename()).compareTo(typedOther.isSetFilename());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetFilename()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.filename, other.filename);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.filename, typedOther.filename);
       if (lastComparison != 0) {
         return lastComparison;
       }
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 bba4219..6672485 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 (1.0.0-dev)
+ * Autogenerated by Thrift Compiler (0.9.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -15,8 +15,6 @@ 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;
@@ -29,13 +27,10 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
-import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-21")
-public class ImageData implements org.apache.thrift.TBase<ImageData, ImageData._Fields>, java.io.Serializable, Cloneable, Comparable<ImageData> {
+public class ImageData implements org.apache.thrift.TBase<ImageData, ImageData._Fields>, java.io.Serializable, Cloneable {
   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);
@@ -881,195 +876,133 @@ public class ImageData implements org.apache.thrift.TBase<ImageData, ImageData._
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_uuid = true && (isSetUuid());
-    list.add(present_uuid);
-    if (present_uuid)
-      list.add(uuid);
-
-    boolean present_imageVersion = true;
-    list.add(present_imageVersion);
-    if (present_imageVersion)
-      list.add(imageVersion);
-
-    boolean present_imageName = true && (isSetImageName());
-    list.add(present_imageName);
-    if (present_imageName)
-      list.add(imageName);
-
-    boolean present_imageCreateTime = true;
-    list.add(present_imageCreateTime);
-    if (present_imageCreateTime)
-      list.add(imageCreateTime);
-
-    boolean present_imageUpdateTime = true;
-    list.add(present_imageUpdateTime);
-    if (present_imageUpdateTime)
-      list.add(imageUpdateTime);
-
-    boolean present_imageOwner = true && (isSetImageOwner());
-    list.add(present_imageOwner);
-    if (present_imageOwner)
-      list.add(imageOwner);
-
-    boolean present_contentOperatingSystem = true && (isSetContentOperatingSystem());
-    list.add(present_contentOperatingSystem);
-    if (present_contentOperatingSystem)
-      list.add(contentOperatingSystem);
-
-    boolean present_statusIsValid = true;
-    list.add(present_statusIsValid);
-    if (present_statusIsValid)
-      list.add(statusIsValid);
-
-    boolean present_statusIsDeleted = true;
-    list.add(present_statusIsDeleted);
-    if (present_statusIsDeleted)
-      list.add(statusIsDeleted);
-
-    boolean present_imageShortDescription = true && (isSetImageShortDescription());
-    list.add(present_imageShortDescription);
-    if (present_imageShortDescription)
-      list.add(imageShortDescription);
-
-    boolean present_imageLongDescription = true && (isSetImageLongDescription());
-    list.add(present_imageLongDescription);
-    if (present_imageLongDescription)
-      list.add(imageLongDescription);
-
-    boolean present_fileSize = true;
-    list.add(present_fileSize);
-    if (present_fileSize)
-      list.add(fileSize);
-
-    return list.hashCode();
+    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(other.isSetUuid());
+    lastComparison = Boolean.valueOf(isSetUuid()).compareTo(typedOther.isSetUuid());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetUuid()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.uuid, other.uuid);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.uuid, typedOther.uuid);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetImageVersion()).compareTo(other.isSetImageVersion());
+    lastComparison = Boolean.valueOf(isSetImageVersion()).compareTo(typedOther.isSetImageVersion());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetImageVersion()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imageVersion, other.imageVersion);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imageVersion, typedOther.imageVersion);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetImageName()).compareTo(other.isSetImageName());
+    lastComparison = Boolean.valueOf(isSetImageName()).compareTo(typedOther.isSetImageName());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetImageName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imageName, other.imageName);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imageName, typedOther.imageName);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetImageCreateTime()).compareTo(other.isSetImageCreateTime());
+    lastComparison = Boolean.valueOf(isSetImageCreateTime()).compareTo(typedOther.isSetImageCreateTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetImageCreateTime()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imageCreateTime, other.imageCreateTime);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imageCreateTime, typedOther.imageCreateTime);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetImageUpdateTime()).compareTo(other.isSetImageUpdateTime());
+    lastComparison = Boolean.valueOf(isSetImageUpdateTime()).compareTo(typedOther.isSetImageUpdateTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetImageUpdateTime()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imageUpdateTime, other.imageUpdateTime);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imageUpdateTime, typedOther.imageUpdateTime);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetImageOwner()).compareTo(other.isSetImageOwner());
+    lastComparison = Boolean.valueOf(isSetImageOwner()).compareTo(typedOther.isSetImageOwner());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetImageOwner()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imageOwner, other.imageOwner);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imageOwner, typedOther.imageOwner);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetContentOperatingSystem()).compareTo(other.isSetContentOperatingSystem());
+    lastComparison = Boolean.valueOf(isSetContentOperatingSystem()).compareTo(typedOther.isSetContentOperatingSystem());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetContentOperatingSystem()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.contentOperatingSystem, other.contentOperatingSystem);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.contentOperatingSystem, typedOther.contentOperatingSystem);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetStatusIsValid()).compareTo(other.isSetStatusIsValid());
+    lastComparison = Boolean.valueOf(isSetStatusIsValid()).compareTo(typedOther.isSetStatusIsValid());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetStatusIsValid()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.statusIsValid, other.statusIsValid);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.statusIsValid, typedOther.statusIsValid);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetStatusIsDeleted()).compareTo(other.isSetStatusIsDeleted());
+    lastComparison = Boolean.valueOf(isSetStatusIsDeleted()).compareTo(typedOther.isSetStatusIsDeleted());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetStatusIsDeleted()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.statusIsDeleted, other.statusIsDeleted);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.statusIsDeleted, typedOther.statusIsDeleted);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetImageShortDescription()).compareTo(other.isSetImageShortDescription());
+    lastComparison = Boolean.valueOf(isSetImageShortDescription()).compareTo(typedOther.isSetImageShortDescription());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetImageShortDescription()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imageShortDescription, other.imageShortDescription);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imageShortDescription, typedOther.imageShortDescription);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetImageLongDescription()).compareTo(other.isSetImageLongDescription());
+    lastComparison = Boolean.valueOf(isSetImageLongDescription()).compareTo(typedOther.isSetImageLongDescription());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetImageLongDescription()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imageLongDescription, other.imageLongDescription);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imageLongDescription, typedOther.imageLongDescription);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetFileSize()).compareTo(other.isSetFileSize());
+    lastComparison = Boolean.valueOf(isSetFileSize()).compareTo(typedOther.isSetFileSize());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetFileSize()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.fileSize, other.fileSize);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.fileSize, typedOther.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 949e081..c9e52ae 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 (1.0.0-dev)
+ * Autogenerated by Thrift Compiler (0.9.0)
  *
  * 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 82a7f2d..dbf28cd 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 (1.0.0-dev)
+ * Autogenerated by Thrift Compiler (0.9.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -15,8 +15,6 @@ 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;
@@ -29,13 +27,10 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
-import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-21")
-public class ImageDataException extends TException implements org.apache.thrift.TBase<ImageDataException, ImageDataException._Fields>, java.io.Serializable, Cloneable, Comparable<ImageDataException> {
+public class ImageDataException extends TException implements org.apache.thrift.TBase<ImageDataException, ImageDataException._Fields>, java.io.Serializable, Cloneable {
   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);
@@ -305,45 +300,33 @@ public class ImageDataException extends TException implements org.apache.thrift.
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_number = true && (isSetNumber());
-    list.add(present_number);
-    if (present_number)
-      list.add(number.getValue());
-
-    boolean present_message = true && (isSetMessage());
-    list.add(present_message);
-    if (present_message)
-      list.add(message);
-
-    return list.hashCode();
+    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(other.isSetNumber());
+    lastComparison = Boolean.valueOf(isSetNumber()).compareTo(typedOther.isSetNumber());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetNumber()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.number, other.number);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.number, typedOther.number);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(other.isSetMessage());
+    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(typedOther.isSetMessage());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMessage()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, other.message);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, typedOther.message);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -428,7 +411,7 @@ public class ImageDataException extends TException implements org.apache.thrift.
         switch (schemeField.id) {
           case 1: // NUMBER
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.number = org.openslx.imagemaster.thrift.iface.ImageDataError.findByValue(iprot.readI32());
+              struct.number = ImageDataError.findByValue(iprot.readI32());
               struct.setNumberIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -505,7 +488,7 @@ public class ImageDataException extends TException implements org.apache.thrift.
       TTupleProtocol iprot = (TTupleProtocol) prot;
       BitSet incoming = iprot.readBitSet(2);
       if (incoming.get(0)) {
-        struct.number = org.openslx.imagemaster.thrift.iface.ImageDataError.findByValue(iprot.readI32());
+        struct.number = ImageDataError.findByValue(iprot.readI32());
         struct.setNumberIsSet(true);
       }
       if (incoming.get(1)) {
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 7369921..7cef221 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 (1.0.0-dev)
+ * Autogenerated by Thrift Compiler (0.9.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -15,8 +15,6 @@ 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;
@@ -29,12 +27,9 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
-import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-21")
 public class ImageServer {
 
   public interface Iface {
@@ -53,27 +48,27 @@ public class ImageServer {
 
     public UploadInfos submitImage(String serverSessionId, ImageData imageDescription, List<Integer> crcSums) throws AuthorizationException, ImageDataException, UploadException, org.apache.thrift.TException;
 
-    public DownloadInfos getImage(String uuid, String serverSessionId, List<Integer> requestedBlocks) throws AuthorizationException, ImageDataException, org.apache.thrift.TException;
+    public DownloadInfos getImage(String uuid, String serverSessionId) throws AuthorizationException, ImageDataException, org.apache.thrift.TException;
 
   }
 
   public interface AsyncIface {
 
-    public void ping(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+    public void ping(org.apache.thrift.async.AsyncMethodCallback<AsyncClient.ping_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 authenticate(String username, String password, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.authenticate_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 getUserFromToken(String token, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getUserFromToken_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 startServerAuthentication(String organization, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.startServerAuthentication_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 isServerAuthenticated(String serverSessionId, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.isServerAuthenticated_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 serverAuthenticate(String organization, ByteBuffer challengeResponse, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.serverAuthenticate_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 submitImage(String serverSessionId, ImageData imageDescription, List<Integer> crcSums, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.submitImage_call> resultHandler) throws org.apache.thrift.TException;
 
-    public void getImage(String uuid, String serverSessionId, List<Integer> requestedBlocks, 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;
 
   }
 
@@ -282,18 +277,17 @@ public class ImageServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "submitImage failed: unknown result");
     }
 
-    public DownloadInfos getImage(String uuid, String serverSessionId, List<Integer> requestedBlocks) throws AuthorizationException, ImageDataException, org.apache.thrift.TException
+    public DownloadInfos getImage(String uuid, String serverSessionId) throws AuthorizationException, ImageDataException, org.apache.thrift.TException
     {
-      send_getImage(uuid, serverSessionId, requestedBlocks);
+      send_getImage(uuid, serverSessionId);
       return recv_getImage();
     }
 
-    public void send_getImage(String uuid, String serverSessionId, List<Integer> requestedBlocks) throws org.apache.thrift.TException
+    public void send_getImage(String uuid, String serverSessionId) throws org.apache.thrift.TException
     {
       getImage_args args = new getImage_args();
       args.setUuid(uuid);
       args.setServerSessionId(serverSessionId);
-      args.setRequestedBlocks(requestedBlocks);
       sendBase("getImage", args);
     }
 
@@ -331,7 +325,7 @@ public class ImageServer {
       super(protocolFactory, clientManager, transport);
     }
 
-    public void ping(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void ping(org.apache.thrift.async.AsyncMethodCallback<ping_call> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       ping_call method_call = new ping_call(resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -339,7 +333,7 @@ public class ImageServer {
     }
 
     public static class ping_call extends org.apache.thrift.async.TAsyncMethodCall {
-      public ping_call(org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public 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 {
         super(client, protocolFactory, transport, resultHandler, false);
       }
 
@@ -360,7 +354,7 @@ public class ImageServer {
       }
     }
 
-    public void authenticate(String username, String password, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void authenticate(String username, String password, org.apache.thrift.async.AsyncMethodCallback<authenticate_call> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       authenticate_call method_call = new authenticate_call(username, password, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -370,7 +364,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 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<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 {
         super(client, protocolFactory, transport, resultHandler, false);
         this.username = username;
         this.password = password;
@@ -395,7 +389,7 @@ public class ImageServer {
       }
     }
 
-    public void getUserFromToken(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void getUserFromToken(String token, org.apache.thrift.async.AsyncMethodCallback<getUserFromToken_call> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       getUserFromToken_call method_call = new getUserFromToken_call(token, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -404,7 +398,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 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<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 {
         super(client, protocolFactory, transport, resultHandler, false);
         this.token = token;
       }
@@ -427,7 +421,7 @@ public class ImageServer {
       }
     }
 
-    public void startServerAuthentication(String organization, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void startServerAuthentication(String organization, org.apache.thrift.async.AsyncMethodCallback<startServerAuthentication_call> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       startServerAuthentication_call method_call = new startServerAuthentication_call(organization, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -436,7 +430,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 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<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 {
         super(client, protocolFactory, transport, resultHandler, false);
         this.organization = organization;
       }
@@ -459,7 +453,7 @@ public class ImageServer {
       }
     }
 
-    public void isServerAuthenticated(String serverSessionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void isServerAuthenticated(String serverSessionId, org.apache.thrift.async.AsyncMethodCallback<isServerAuthenticated_call> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       isServerAuthenticated_call method_call = new isServerAuthenticated_call(serverSessionId, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -468,7 +462,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 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<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 {
         super(client, protocolFactory, transport, resultHandler, false);
         this.serverSessionId = serverSessionId;
       }
@@ -491,7 +485,7 @@ public class ImageServer {
       }
     }
 
-    public void serverAuthenticate(String organization, ByteBuffer challengeResponse, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void serverAuthenticate(String organization, ByteBuffer challengeResponse, org.apache.thrift.async.AsyncMethodCallback<serverAuthenticate_call> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       serverAuthenticate_call method_call = new serverAuthenticate_call(organization, challengeResponse, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -501,7 +495,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 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<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 {
         super(client, protocolFactory, transport, resultHandler, false);
         this.organization = organization;
         this.challengeResponse = challengeResponse;
@@ -526,7 +520,7 @@ public class ImageServer {
       }
     }
 
-    public void submitImage(String serverSessionId, ImageData imageDescription, List<Integer> crcSums, 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<submitImage_call> 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;
@@ -537,7 +531,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 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<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 {
         super(client, protocolFactory, transport, resultHandler, false);
         this.serverSessionId = serverSessionId;
         this.imageDescription = imageDescription;
@@ -564,9 +558,9 @@ public class ImageServer {
       }
     }
 
-    public void getImage(String uuid, String serverSessionId, List<Integer> requestedBlocks, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+    public void getImage(String uuid, String serverSessionId, org.apache.thrift.async.AsyncMethodCallback<getImage_call> resultHandler) throws org.apache.thrift.TException {
       checkReady();
-      getImage_call method_call = new getImage_call(uuid, serverSessionId, requestedBlocks, resultHandler, this, ___protocolFactory, ___transport);
+      getImage_call method_call = new getImage_call(uuid, serverSessionId, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
@@ -574,12 +568,10 @@ public class ImageServer {
     public static class getImage_call extends org.apache.thrift.async.TAsyncMethodCall {
       private String uuid;
       private String serverSessionId;
-      private List<Integer> requestedBlocks;
-      public getImage_call(String uuid, String serverSessionId, List<Integer> requestedBlocks, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public 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 {
         super(client, protocolFactory, transport, resultHandler, false);
         this.uuid = uuid;
         this.serverSessionId = serverSessionId;
-        this.requestedBlocks = requestedBlocks;
       }
 
       public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
@@ -587,7 +579,6 @@ public class ImageServer {
         getImage_args args = new getImage_args();
         args.setUuid(uuid);
         args.setServerSessionId(serverSessionId);
-        args.setRequestedBlocks(requestedBlocks);
         args.write(prot);
         prot.writeMessageEnd();
       }
@@ -808,7 +799,7 @@ public class ImageServer {
       public getImage_result getResult(I iface, getImage_args args) throws org.apache.thrift.TException {
         getImage_result result = new getImage_result();
         try {
-          result.success = iface.getImage(args.uuid, args.serverSessionId, args.requestedBlocks);
+          result.success = iface.getImage(args.uuid, args.serverSessionId);
         } catch (AuthorizationException failure) {
           result.failure = failure;
         } catch (ImageDataException failure2) {
@@ -820,492 +811,7 @@ public class ImageServer {
 
   }
 
-  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, args.requestedBlocks,resultHandler);
-      }
-    }
-
-  }
-
-  public static class ping_args implements org.apache.thrift.TBase<ping_args, ping_args._Fields>, java.io.Serializable, Cloneable, Comparable<ping_args>   {
+  public static class ping_args implements org.apache.thrift.TBase<ping_args, ping_args._Fields>, java.io.Serializable, Cloneable   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ping_args");
 
 
@@ -1435,18 +941,16 @@ public class ImageServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
-
-      return list.hashCode();
+      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;
     }
@@ -1553,7 +1057,7 @@ public class ImageServer {
 
   }
 
-  public static class ping_result implements org.apache.thrift.TBase<ping_result, ping_result._Fields>, java.io.Serializable, Cloneable, Comparable<ping_result>   {
+  public static class ping_result implements org.apache.thrift.TBase<ping_result, ping_result._Fields>, java.io.Serializable, Cloneable   {
     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);
@@ -1750,30 +1254,23 @@ public class ImageServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
-
-      boolean present_success = true;
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
-
-      return list.hashCode();
+      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(other.isSetSuccess());
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetSuccess()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -1914,7 +1411,7 @@ public class ImageServer {
 
   }
 
-  public static class authenticate_args implements org.apache.thrift.TBase<authenticate_args, authenticate_args._Fields>, java.io.Serializable, Cloneable, Comparable<authenticate_args>   {
+  public static class authenticate_args implements org.apache.thrift.TBase<authenticate_args, authenticate_args._Fields>, java.io.Serializable, Cloneable   {
     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);
@@ -2168,45 +1665,33 @@ public class ImageServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
-
-      boolean present_username = true && (isSetUsername());
-      list.add(present_username);
-      if (present_username)
-        list.add(username);
-
-      boolean present_password = true && (isSetPassword());
-      list.add(present_password);
-      if (present_password)
-        list.add(password);
-
-      return list.hashCode();
+      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(other.isSetUsername());
+      lastComparison = Boolean.valueOf(isSetUsername()).compareTo(typedOther.isSetUsername());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetUsername()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.username, other.username);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.username, typedOther.username);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetPassword()).compareTo(other.isSetPassword());
+      lastComparison = Boolean.valueOf(isSetPassword()).compareTo(typedOther.isSetPassword());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetPassword()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.password, other.password);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.password, typedOther.password);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -2380,7 +1865,7 @@ public class ImageServer {
 
   }
 
-  public static class authenticate_result implements org.apache.thrift.TBase<authenticate_result, authenticate_result._Fields>, java.io.Serializable, Cloneable, Comparable<authenticate_result>   {
+  public static class authenticate_result implements org.apache.thrift.TBase<authenticate_result, authenticate_result._Fields>, java.io.Serializable, Cloneable   {
     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);
@@ -2634,45 +2119,33 @@ public class ImageServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
-
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
-
-      boolean present_failure = true && (isSetFailure());
-      list.add(present_failure);
-      if (present_failure)
-        list.add(failure);
-
-      return list.hashCode();
+      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(other.isSetSuccess());
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetSuccess()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure());
+      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(typedOther.isSetFailure());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetFailure()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, other.failure);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, typedOther.failure);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -2853,7 +2326,7 @@ public class ImageServer {
 
   }
 
-  public static class getUserFromToken_args implements org.apache.thrift.TBase<getUserFromToken_args, getUserFromToken_args._Fields>, java.io.Serializable, Cloneable, Comparable<getUserFromToken_args>   {
+  public static class getUserFromToken_args implements org.apache.thrift.TBase<getUserFromToken_args, getUserFromToken_args._Fields>, java.io.Serializable, Cloneable   {
     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);
@@ -3048,30 +2521,23 @@ public class ImageServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
-
-      boolean present_token = true && (isSetToken());
-      list.add(present_token);
-      if (present_token)
-        list.add(token);
-
-      return list.hashCode();
+      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(other.isSetToken());
+      lastComparison = Boolean.valueOf(isSetToken()).compareTo(typedOther.isSetToken());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetToken()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, typedOther.token);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -3214,7 +2680,7 @@ public class ImageServer {
 
   }
 
-  public static class getUserFromToken_result implements org.apache.thrift.TBase<getUserFromToken_result, getUserFromToken_result._Fields>, java.io.Serializable, Cloneable, Comparable<getUserFromToken_result>   {
+  public static class getUserFromToken_result implements org.apache.thrift.TBase<getUserFromToken_result, getUserFromToken_result._Fields>, java.io.Serializable, Cloneable   {
     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);
@@ -3468,45 +2934,33 @@ public class ImageServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
-
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
-
-      boolean present_failure = true && (isSetFailure());
-      list.add(present_failure);
-      if (present_failure)
-        list.add(failure);
-
-      return list.hashCode();
+      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(other.isSetSuccess());
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetSuccess()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure());
+      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(typedOther.isSetFailure());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetFailure()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, other.failure);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, typedOther.failure);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -3687,7 +3141,7 @@ public class ImageServer {
 
   }
 
-  public static class startServerAuthentication_args implements org.apache.thrift.TBase<startServerAuthentication_args, startServerAuthentication_args._Fields>, java.io.Serializable, Cloneable, Comparable<startServerAuthentication_args>   {
+  public static class startServerAuthentication_args implements org.apache.thrift.TBase<startServerAuthentication_args, startServerAuthentication_args._Fields>, java.io.Serializable, Cloneable   {
     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);
@@ -3882,30 +3336,23 @@ public class ImageServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
-
-      boolean present_organization = true && (isSetOrganization());
-      list.add(present_organization);
-      if (present_organization)
-        list.add(organization);
-
-      return list.hashCode();
+      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(other.isSetOrganization());
+      lastComparison = Boolean.valueOf(isSetOrganization()).compareTo(typedOther.isSetOrganization());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetOrganization()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.organization, other.organization);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.organization, typedOther.organization);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -4048,7 +3495,7 @@ public class ImageServer {
 
   }
 
-  public static class startServerAuthentication_result implements org.apache.thrift.TBase<startServerAuthentication_result, startServerAuthentication_result._Fields>, java.io.Serializable, Cloneable, Comparable<startServerAuthentication_result>   {
+  public static class startServerAuthentication_result implements org.apache.thrift.TBase<startServerAuthentication_result, startServerAuthentication_result._Fields>, java.io.Serializable, Cloneable   {
     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);
@@ -4302,45 +3749,33 @@ public class ImageServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
-
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
-
-      boolean present_failure = true && (isSetFailure());
-      list.add(present_failure);
-      if (present_failure)
-        list.add(failure);
-
-      return list.hashCode();
+      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(other.isSetSuccess());
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetSuccess()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure());
+      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(typedOther.isSetFailure());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetFailure()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, other.failure);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, typedOther.failure);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -4516,7 +3951,7 @@ public class ImageServer {
 
   }
 
-  public static class isServerAuthenticated_args implements org.apache.thrift.TBase<isServerAuthenticated_args, isServerAuthenticated_args._Fields>, java.io.Serializable, Cloneable, Comparable<isServerAuthenticated_args>   {
+  public static class isServerAuthenticated_args implements org.apache.thrift.TBase<isServerAuthenticated_args, isServerAuthenticated_args._Fields>, java.io.Serializable, Cloneable   {
     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);
@@ -4711,30 +4146,23 @@ public class ImageServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
-
-      boolean present_serverSessionId = true && (isSetServerSessionId());
-      list.add(present_serverSessionId);
-      if (present_serverSessionId)
-        list.add(serverSessionId);
-
-      return list.hashCode();
+      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(other.isSetServerSessionId());
+      lastComparison = Boolean.valueOf(isSetServerSessionId()).compareTo(typedOther.isSetServerSessionId());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetServerSessionId()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverSessionId, other.serverSessionId);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverSessionId, typedOther.serverSessionId);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -4877,7 +4305,7 @@ public class ImageServer {
 
   }
 
-  public static class isServerAuthenticated_result implements org.apache.thrift.TBase<isServerAuthenticated_result, isServerAuthenticated_result._Fields>, java.io.Serializable, Cloneable, Comparable<isServerAuthenticated_result>   {
+  public static class isServerAuthenticated_result implements org.apache.thrift.TBase<isServerAuthenticated_result, isServerAuthenticated_result._Fields>, java.io.Serializable, Cloneable   {
     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);
@@ -5074,30 +4502,23 @@ public class ImageServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
-
-      boolean present_success = true;
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
-
-      return list.hashCode();
+      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(other.isSetSuccess());
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetSuccess()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -5238,7 +4659,7 @@ public class ImageServer {
 
   }
 
-  public static class serverAuthenticate_args implements org.apache.thrift.TBase<serverAuthenticate_args, serverAuthenticate_args._Fields>, java.io.Serializable, Cloneable, Comparable<serverAuthenticate_args>   {
+  public static class serverAuthenticate_args implements org.apache.thrift.TBase<serverAuthenticate_args, serverAuthenticate_args._Fields>, java.io.Serializable, Cloneable   {
     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);
@@ -5347,6 +4768,7 @@ public class ImageServer {
       }
       if (other.isSetChallengeResponse()) {
         this.challengeResponse = org.apache.thrift.TBaseHelper.copyBinary(other.challengeResponse);
+;
       }
     }
 
@@ -5502,45 +4924,33 @@ public class ImageServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
-
-      boolean present_organization = true && (isSetOrganization());
-      list.add(present_organization);
-      if (present_organization)
-        list.add(organization);
-
-      boolean present_challengeResponse = true && (isSetChallengeResponse());
-      list.add(present_challengeResponse);
-      if (present_challengeResponse)
-        list.add(challengeResponse);
-
-      return list.hashCode();
+      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(other.isSetOrganization());
+      lastComparison = Boolean.valueOf(isSetOrganization()).compareTo(typedOther.isSetOrganization());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetOrganization()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.organization, other.organization);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.organization, typedOther.organization);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetChallengeResponse()).compareTo(other.isSetChallengeResponse());
+      lastComparison = Boolean.valueOf(isSetChallengeResponse()).compareTo(typedOther.isSetChallengeResponse());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetChallengeResponse()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.challengeResponse, other.challengeResponse);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.challengeResponse, typedOther.challengeResponse);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -5714,7 +5124,7 @@ public class ImageServer {
 
   }
 
-  public static class serverAuthenticate_result implements org.apache.thrift.TBase<serverAuthenticate_result, serverAuthenticate_result._Fields>, java.io.Serializable, Cloneable, Comparable<serverAuthenticate_result>   {
+  public static class serverAuthenticate_result implements org.apache.thrift.TBase<serverAuthenticate_result, serverAuthenticate_result._Fields>, java.io.Serializable, Cloneable   {
     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);
@@ -5968,45 +5378,33 @@ public class ImageServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
-
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
-
-      boolean present_failure = true && (isSetFailure());
-      list.add(present_failure);
-      if (present_failure)
-        list.add(failure);
-
-      return list.hashCode();
+      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(other.isSetSuccess());
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetSuccess()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure());
+      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(typedOther.isSetFailure());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetFailure()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, other.failure);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, typedOther.failure);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -6187,7 +5585,7 @@ public class ImageServer {
 
   }
 
-  public static class submitImage_args implements org.apache.thrift.TBase<submitImage_args, submitImage_args._Fields>, java.io.Serializable, Cloneable, Comparable<submitImage_args>   {
+  public static class submitImage_args implements org.apache.thrift.TBase<submitImage_args, submitImage_args._Fields>, java.io.Serializable, Cloneable   {
     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);
@@ -6308,7 +5706,10 @@ public class ImageServer {
         this.imageDescription = new ImageData(other.imageDescription);
       }
       if (other.isSetCrcSums()) {
-        List<Integer> __this__crcSums = new ArrayList<Integer>(other.crcSums);
+        List<Integer> __this__crcSums = new ArrayList<Integer>();
+        for (Integer other_element : other.crcSums) {
+          __this__crcSums.add(other_element);
+        }
         this.crcSums = __this__crcSums;
       }
     }
@@ -6517,60 +5918,43 @@ public class ImageServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
-
-      boolean present_serverSessionId = true && (isSetServerSessionId());
-      list.add(present_serverSessionId);
-      if (present_serverSessionId)
-        list.add(serverSessionId);
-
-      boolean present_imageDescription = true && (isSetImageDescription());
-      list.add(present_imageDescription);
-      if (present_imageDescription)
-        list.add(imageDescription);
-
-      boolean present_crcSums = true && (isSetCrcSums());
-      list.add(present_crcSums);
-      if (present_crcSums)
-        list.add(crcSums);
-
-      return list.hashCode();
+      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(other.isSetServerSessionId());
+      lastComparison = Boolean.valueOf(isSetServerSessionId()).compareTo(typedOther.isSetServerSessionId());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetServerSessionId()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverSessionId, other.serverSessionId);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverSessionId, typedOther.serverSessionId);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetImageDescription()).compareTo(other.isSetImageDescription());
+      lastComparison = Boolean.valueOf(isSetImageDescription()).compareTo(typedOther.isSetImageDescription());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetImageDescription()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imageDescription, other.imageDescription);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imageDescription, typedOther.imageDescription);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetCrcSums()).compareTo(other.isSetCrcSums());
+      lastComparison = Boolean.valueOf(isSetCrcSums()).compareTo(typedOther.isSetCrcSums());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetCrcSums()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.crcSums, other.crcSums);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.crcSums, typedOther.crcSums);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -6686,11 +6070,11 @@ public class ImageServer {
                 {
                   org.apache.thrift.protocol.TList _list8 = iprot.readListBegin();
                   struct.crcSums = new ArrayList<Integer>(_list8.size);
-                  int _elem9;
-                  for (int _i10 = 0; _i10 < _list8.size; ++_i10)
+                  for (int _i9 = 0; _i9 < _list8.size; ++_i9)
                   {
-                    _elem9 = iprot.readI32();
-                    struct.crcSums.add(_elem9);
+                    int _elem10; // required
+                    _elem10 = iprot.readI32();
+                    struct.crcSums.add(_elem10);
                   }
                   iprot.readListEnd();
                 }
@@ -6798,11 +6182,11 @@ public class ImageServer {
           {
             org.apache.thrift.protocol.TList _list13 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32());
             struct.crcSums = new ArrayList<Integer>(_list13.size);
-            int _elem14;
-            for (int _i15 = 0; _i15 < _list13.size; ++_i15)
+            for (int _i14 = 0; _i14 < _list13.size; ++_i14)
             {
-              _elem14 = iprot.readI32();
-              struct.crcSums.add(_elem14);
+              int _elem15; // required
+              _elem15 = iprot.readI32();
+              struct.crcSums.add(_elem15);
             }
           }
           struct.setCrcSumsIsSet(true);
@@ -6812,7 +6196,7 @@ public class ImageServer {
 
   }
 
-  public static class submitImage_result implements org.apache.thrift.TBase<submitImage_result, submitImage_result._Fields>, java.io.Serializable, Cloneable, Comparable<submitImage_result>   {
+  public static class submitImage_result implements org.apache.thrift.TBase<submitImage_result, submitImage_result._Fields>, java.io.Serializable, Cloneable   {
     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);
@@ -7184,75 +6568,53 @@ public class ImageServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
-
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
-
-      boolean present_failure = true && (isSetFailure());
-      list.add(present_failure);
-      if (present_failure)
-        list.add(failure);
-
-      boolean present_failure2 = true && (isSetFailure2());
-      list.add(present_failure2);
-      if (present_failure2)
-        list.add(failure2);
-
-      boolean present_failure3 = true && (isSetFailure3());
-      list.add(present_failure3);
-      if (present_failure3)
-        list.add(failure3);
-
-      return list.hashCode();
+      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(other.isSetSuccess());
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetSuccess()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure());
+      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(typedOther.isSetFailure());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetFailure()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, other.failure);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, typedOther.failure);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFailure2()).compareTo(other.isSetFailure2());
+      lastComparison = Boolean.valueOf(isSetFailure2()).compareTo(typedOther.isSetFailure2());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetFailure2()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure2, other.failure2);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure2, typedOther.failure2);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFailure3()).compareTo(other.isSetFailure3());
+      lastComparison = Boolean.valueOf(isSetFailure3()).compareTo(typedOther.isSetFailure3());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetFailure3()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure3, other.failure3);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure3, typedOther.failure3);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -7499,12 +6861,11 @@ public class ImageServer {
 
   }
 
-  public static class getImage_args implements org.apache.thrift.TBase<getImage_args, getImage_args._Fields>, java.io.Serializable, Cloneable, Comparable<getImage_args>   {
+  public static class getImage_args implements org.apache.thrift.TBase<getImage_args, getImage_args._Fields>, java.io.Serializable, Cloneable   {
     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);
     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)2);
-    private static final org.apache.thrift.protocol.TField REQUESTED_BLOCKS_FIELD_DESC = new org.apache.thrift.protocol.TField("requestedBlocks", org.apache.thrift.protocol.TType.LIST, (short)3);
 
     private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
     static {
@@ -7514,13 +6875,11 @@ public class ImageServer {
 
     public String uuid; // required
     public String serverSessionId; // required
-    public List<Integer> requestedBlocks; // 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 {
       UUID((short)1, "uuid"),
-      SERVER_SESSION_ID((short)2, "serverSessionId"),
-      REQUESTED_BLOCKS((short)3, "requestedBlocks");
+      SERVER_SESSION_ID((short)2, "serverSessionId");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -7539,8 +6898,6 @@ public class ImageServer {
             return UUID;
           case 2: // SERVER_SESSION_ID
             return SERVER_SESSION_ID;
-          case 3: // REQUESTED_BLOCKS
-            return REQUESTED_BLOCKS;
           default:
             return null;
         }
@@ -7588,9 +6945,6 @@ public class ImageServer {
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING          , "UUID")));
       tmpMap.put(_Fields.SERVER_SESSION_ID, new org.apache.thrift.meta_data.FieldMetaData("serverSessionId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-      tmpMap.put(_Fields.REQUESTED_BLOCKS, new org.apache.thrift.meta_data.FieldMetaData("requestedBlocks", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-              new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getImage_args.class, metaDataMap);
     }
@@ -7600,13 +6954,11 @@ public class ImageServer {
 
     public getImage_args(
       String uuid,
-      String serverSessionId,
-      List<Integer> requestedBlocks)
+      String serverSessionId)
     {
       this();
       this.uuid = uuid;
       this.serverSessionId = serverSessionId;
-      this.requestedBlocks = requestedBlocks;
     }
 
     /**
@@ -7619,10 +6971,6 @@ public class ImageServer {
       if (other.isSetServerSessionId()) {
         this.serverSessionId = other.serverSessionId;
       }
-      if (other.isSetRequestedBlocks()) {
-        List<Integer> __this__requestedBlocks = new ArrayList<Integer>(other.requestedBlocks);
-        this.requestedBlocks = __this__requestedBlocks;
-      }
     }
 
     public getImage_args deepCopy() {
@@ -7633,7 +6981,6 @@ public class ImageServer {
     public void clear() {
       this.uuid = null;
       this.serverSessionId = null;
-      this.requestedBlocks = null;
     }
 
     public String getUuid() {
@@ -7684,45 +7031,6 @@ public class ImageServer {
       }
     }
 
-    public int getRequestedBlocksSize() {
-      return (this.requestedBlocks == null) ? 0 : this.requestedBlocks.size();
-    }
-
-    public java.util.Iterator<Integer> getRequestedBlocksIterator() {
-      return (this.requestedBlocks == null) ? null : this.requestedBlocks.iterator();
-    }
-
-    public void addToRequestedBlocks(int elem) {
-      if (this.requestedBlocks == null) {
-        this.requestedBlocks = new ArrayList<Integer>();
-      }
-      this.requestedBlocks.add(elem);
-    }
-
-    public List<Integer> getRequestedBlocks() {
-      return this.requestedBlocks;
-    }
-
-    public getImage_args setRequestedBlocks(List<Integer> requestedBlocks) {
-      this.requestedBlocks = requestedBlocks;
-      return this;
-    }
-
-    public void unsetRequestedBlocks() {
-      this.requestedBlocks = null;
-    }
-
-    /** Returns true if field requestedBlocks is set (has been assigned a value) and false otherwise */
-    public boolean isSetRequestedBlocks() {
-      return this.requestedBlocks != null;
-    }
-
-    public void setRequestedBlocksIsSet(boolean value) {
-      if (!value) {
-        this.requestedBlocks = null;
-      }
-    }
-
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
       case UUID:
@@ -7741,14 +7049,6 @@ public class ImageServer {
         }
         break;
 
-      case REQUESTED_BLOCKS:
-        if (value == null) {
-          unsetRequestedBlocks();
-        } else {
-          setRequestedBlocks((List<Integer>)value);
-        }
-        break;
-
       }
     }
 
@@ -7760,9 +7060,6 @@ public class ImageServer {
       case SERVER_SESSION_ID:
         return getServerSessionId();
 
-      case REQUESTED_BLOCKS:
-        return getRequestedBlocks();
-
       }
       throw new IllegalStateException();
     }
@@ -7778,8 +7075,6 @@ public class ImageServer {
         return isSetUuid();
       case SERVER_SESSION_ID:
         return isSetServerSessionId();
-      case REQUESTED_BLOCKS:
-        return isSetRequestedBlocks();
       }
       throw new IllegalStateException();
     }
@@ -7815,74 +7110,38 @@ public class ImageServer {
           return false;
       }
 
-      boolean this_present_requestedBlocks = true && this.isSetRequestedBlocks();
-      boolean that_present_requestedBlocks = true && that.isSetRequestedBlocks();
-      if (this_present_requestedBlocks || that_present_requestedBlocks) {
-        if (!(this_present_requestedBlocks && that_present_requestedBlocks))
-          return false;
-        if (!this.requestedBlocks.equals(that.requestedBlocks))
-          return false;
-      }
-
       return true;
     }
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
-
-      boolean present_uuid = true && (isSetUuid());
-      list.add(present_uuid);
-      if (present_uuid)
-        list.add(uuid);
-
-      boolean present_serverSessionId = true && (isSetServerSessionId());
-      list.add(present_serverSessionId);
-      if (present_serverSessionId)
-        list.add(serverSessionId);
-
-      boolean present_requestedBlocks = true && (isSetRequestedBlocks());
-      list.add(present_requestedBlocks);
-      if (present_requestedBlocks)
-        list.add(requestedBlocks);
-
-      return list.hashCode();
+      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(other.isSetUuid());
+      lastComparison = Boolean.valueOf(isSetUuid()).compareTo(typedOther.isSetUuid());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetUuid()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.uuid, other.uuid);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.uuid, typedOther.uuid);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetServerSessionId()).compareTo(other.isSetServerSessionId());
+      lastComparison = Boolean.valueOf(isSetServerSessionId()).compareTo(typedOther.isSetServerSessionId());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetServerSessionId()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverSessionId, other.serverSessionId);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
-      lastComparison = Boolean.valueOf(isSetRequestedBlocks()).compareTo(other.isSetRequestedBlocks());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetRequestedBlocks()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.requestedBlocks, other.requestedBlocks);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverSessionId, typedOther.serverSessionId);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -7922,14 +7181,6 @@ public class ImageServer {
         sb.append(this.serverSessionId);
       }
       first = false;
-      if (!first) sb.append(", ");
-      sb.append("requestedBlocks:");
-      if (this.requestedBlocks == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.requestedBlocks);
-      }
-      first = false;
       sb.append(")");
       return sb.toString();
     }
@@ -7989,24 +7240,6 @@ public class ImageServer {
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
-            case 3: // REQUESTED_BLOCKS
-              if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
-                {
-                  org.apache.thrift.protocol.TList _list16 = iprot.readListBegin();
-                  struct.requestedBlocks = new ArrayList<Integer>(_list16.size);
-                  int _elem17;
-                  for (int _i18 = 0; _i18 < _list16.size; ++_i18)
-                  {
-                    _elem17 = iprot.readI32();
-                    struct.requestedBlocks.add(_elem17);
-                  }
-                  iprot.readListEnd();
-                }
-                struct.setRequestedBlocksIsSet(true);
-              } else { 
-                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
             default:
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
           }
@@ -8032,18 +7265,6 @@ public class ImageServer {
           oprot.writeString(struct.serverSessionId);
           oprot.writeFieldEnd();
         }
-        if (struct.requestedBlocks != null) {
-          oprot.writeFieldBegin(REQUESTED_BLOCKS_FIELD_DESC);
-          {
-            oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, struct.requestedBlocks.size()));
-            for (int _iter19 : struct.requestedBlocks)
-            {
-              oprot.writeI32(_iter19);
-            }
-            oprot.writeListEnd();
-          }
-          oprot.writeFieldEnd();
-        }
         oprot.writeFieldStop();
         oprot.writeStructEnd();
       }
@@ -8068,31 +7289,19 @@ public class ImageServer {
         if (struct.isSetServerSessionId()) {
           optionals.set(1);
         }
-        if (struct.isSetRequestedBlocks()) {
-          optionals.set(2);
-        }
-        oprot.writeBitSet(optionals, 3);
+        oprot.writeBitSet(optionals, 2);
         if (struct.isSetUuid()) {
           oprot.writeString(struct.uuid);
         }
         if (struct.isSetServerSessionId()) {
           oprot.writeString(struct.serverSessionId);
         }
-        if (struct.isSetRequestedBlocks()) {
-          {
-            oprot.writeI32(struct.requestedBlocks.size());
-            for (int _iter20 : struct.requestedBlocks)
-            {
-              oprot.writeI32(_iter20);
-            }
-          }
-        }
       }
 
       @Override
       public void read(org.apache.thrift.protocol.TProtocol prot, getImage_args struct) throws org.apache.thrift.TException {
         TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(3);
+        BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           struct.uuid = iprot.readString();
           struct.setUuidIsSet(true);
@@ -8101,25 +7310,12 @@ public class ImageServer {
           struct.serverSessionId = iprot.readString();
           struct.setServerSessionIdIsSet(true);
         }
-        if (incoming.get(2)) {
-          {
-            org.apache.thrift.protocol.TList _list21 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32());
-            struct.requestedBlocks = new ArrayList<Integer>(_list21.size);
-            int _elem22;
-            for (int _i23 = 0; _i23 < _list21.size; ++_i23)
-            {
-              _elem22 = iprot.readI32();
-              struct.requestedBlocks.add(_elem22);
-            }
-          }
-          struct.setRequestedBlocksIsSet(true);
-        }
       }
     }
 
   }
 
-  public static class getImage_result implements org.apache.thrift.TBase<getImage_result, getImage_result._Fields>, java.io.Serializable, Cloneable, Comparable<getImage_result>   {
+  public static class getImage_result implements org.apache.thrift.TBase<getImage_result, getImage_result._Fields>, java.io.Serializable, Cloneable   {
     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);
@@ -8432,60 +7628,43 @@ public class ImageServer {
 
     @Override
     public int hashCode() {
-      List<Object> list = new ArrayList<Object>();
-
-      boolean present_success = true && (isSetSuccess());
-      list.add(present_success);
-      if (present_success)
-        list.add(success);
-
-      boolean present_failure = true && (isSetFailure());
-      list.add(present_failure);
-      if (present_failure)
-        list.add(failure);
-
-      boolean present_failure2 = true && (isSetFailure2());
-      list.add(present_failure2);
-      if (present_failure2)
-        list.add(failure2);
-
-      return list.hashCode();
+      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(other.isSetSuccess());
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetSuccess()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure());
+      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(typedOther.isSetFailure());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetFailure()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, other.failure);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, typedOther.failure);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFailure2()).compareTo(other.isSetFailure2());
+      lastComparison = Boolean.valueOf(isSetFailure2()).compareTo(typedOther.isSetFailure2());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetFailure2()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure2, other.failure2);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure2, typedOther.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 e9bd2bc..50a6e5d 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 (1.0.0-dev)
+ * Autogenerated by Thrift Compiler (0.9.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -15,8 +15,6 @@ 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;
@@ -29,13 +27,10 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
-import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-21")
-public class InvalidTokenException extends TException implements org.apache.thrift.TBase<InvalidTokenException, InvalidTokenException._Fields>, java.io.Serializable, Cloneable, Comparable<InvalidTokenException> {
+public class InvalidTokenException extends TException implements org.apache.thrift.TBase<InvalidTokenException, InvalidTokenException._Fields>, java.io.Serializable, Cloneable {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InvalidTokenException");
 
 
@@ -165,18 +160,16 @@ public class InvalidTokenException extends TException implements org.apache.thri
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    return list.hashCode();
+    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 cd1132f..406ed80 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 (1.0.0-dev)
+ * Autogenerated by Thrift Compiler (0.9.0)
  *
  * 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 d540470..ee78ac1 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 (1.0.0-dev)
+ * Autogenerated by Thrift Compiler (0.9.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -15,8 +15,6 @@ 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;
@@ -29,13 +27,10 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
-import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-21")
-public class ServerAuthenticationException extends TException implements org.apache.thrift.TBase<ServerAuthenticationException, ServerAuthenticationException._Fields>, java.io.Serializable, Cloneable, Comparable<ServerAuthenticationException> {
+public class ServerAuthenticationException extends TException implements org.apache.thrift.TBase<ServerAuthenticationException, ServerAuthenticationException._Fields>, java.io.Serializable, Cloneable {
   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);
@@ -305,45 +300,33 @@ public class ServerAuthenticationException extends TException implements org.apa
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_number = true && (isSetNumber());
-    list.add(present_number);
-    if (present_number)
-      list.add(number.getValue());
-
-    boolean present_message = true && (isSetMessage());
-    list.add(present_message);
-    if (present_message)
-      list.add(message);
-
-    return list.hashCode();
+    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(other.isSetNumber());
+    lastComparison = Boolean.valueOf(isSetNumber()).compareTo(typedOther.isSetNumber());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetNumber()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.number, other.number);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.number, typedOther.number);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(other.isSetMessage());
+    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(typedOther.isSetMessage());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMessage()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, other.message);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, typedOther.message);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -428,7 +411,7 @@ public class ServerAuthenticationException extends TException implements org.apa
         switch (schemeField.id) {
           case 1: // NUMBER
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.number = org.openslx.imagemaster.thrift.iface.ServerAuthenticationError.findByValue(iprot.readI32());
+              struct.number = ServerAuthenticationError.findByValue(iprot.readI32());
               struct.setNumberIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -505,7 +488,7 @@ public class ServerAuthenticationException extends TException implements org.apa
       TTupleProtocol iprot = (TTupleProtocol) prot;
       BitSet incoming = iprot.readBitSet(2);
       if (incoming.get(0)) {
-        struct.number = org.openslx.imagemaster.thrift.iface.ServerAuthenticationError.findByValue(iprot.readI32());
+        struct.number = ServerAuthenticationError.findByValue(iprot.readI32());
         struct.setNumberIsSet(true);
       }
       if (incoming.get(1)) {
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 b980b32..ce5482a 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 (1.0.0-dev)
+ * Autogenerated by Thrift Compiler (0.9.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -15,8 +15,6 @@ 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;
@@ -29,13 +27,10 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
-import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-21")
-public class ServerSessionData implements org.apache.thrift.TBase<ServerSessionData, ServerSessionData._Fields>, java.io.Serializable, Cloneable, Comparable<ServerSessionData> {
+public class ServerSessionData implements org.apache.thrift.TBase<ServerSessionData, ServerSessionData._Fields>, java.io.Serializable, Cloneable {
   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);
@@ -230,30 +225,23 @@ public class ServerSessionData implements org.apache.thrift.TBase<ServerSessionD
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_sessionId = true && (isSetSessionId());
-    list.add(present_sessionId);
-    if (present_sessionId)
-      list.add(sessionId);
-
-    return list.hashCode();
+    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(other.isSetSessionId());
+    lastComparison = Boolean.valueOf(isSetSessionId()).compareTo(typedOther.isSetSessionId());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetSessionId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sessionId, other.sessionId);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sessionId, typedOther.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 df21051..a1a30e1 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 (1.0.0-dev)
+ * Autogenerated by Thrift Compiler (0.9.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -15,8 +15,6 @@ 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;
@@ -29,13 +27,10 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
-import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-21")
-public class SessionData implements org.apache.thrift.TBase<SessionData, SessionData._Fields>, java.io.Serializable, Cloneable, Comparable<SessionData> {
+public class SessionData implements org.apache.thrift.TBase<SessionData, SessionData._Fields>, java.io.Serializable, Cloneable {
   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);
@@ -348,60 +343,43 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_sessionId = true && (isSetSessionId());
-    list.add(present_sessionId);
-    if (present_sessionId)
-      list.add(sessionId);
-
-    boolean present_authToken = true && (isSetAuthToken());
-    list.add(present_authToken);
-    if (present_authToken)
-      list.add(authToken);
-
-    boolean present_serverAddress = true && (isSetServerAddress());
-    list.add(present_serverAddress);
-    if (present_serverAddress)
-      list.add(serverAddress);
-
-    return list.hashCode();
+    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(other.isSetSessionId());
+    lastComparison = Boolean.valueOf(isSetSessionId()).compareTo(typedOther.isSetSessionId());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetSessionId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sessionId, other.sessionId);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sessionId, typedOther.sessionId);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetAuthToken()).compareTo(other.isSetAuthToken());
+    lastComparison = Boolean.valueOf(isSetAuthToken()).compareTo(typedOther.isSetAuthToken());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetAuthToken()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.authToken, other.authToken);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.authToken, typedOther.authToken);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetServerAddress()).compareTo(other.isSetServerAddress());
+    lastComparison = Boolean.valueOf(isSetServerAddress()).compareTo(typedOther.isSetServerAddress());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetServerAddress()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverAddress, other.serverAddress);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverAddress, typedOther.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 1c45965..02a8f9e 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 (1.0.0-dev)
+ * Autogenerated by Thrift Compiler (0.9.0)
  *
  * 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/UploadException.java b/src/main/java/org/openslx/imagemaster/thrift/iface/UploadException.java
index 48abaec..eeaee66 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 (1.0.0-dev)
+ * Autogenerated by Thrift Compiler (0.9.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -15,8 +15,6 @@ 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;
@@ -29,13 +27,10 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
-import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-21")
-public class UploadException extends TException implements org.apache.thrift.TBase<UploadException, UploadException._Fields>, java.io.Serializable, Cloneable, Comparable<UploadException> {
+public class UploadException extends TException implements org.apache.thrift.TBase<UploadException, UploadException._Fields>, java.io.Serializable, Cloneable {
   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);
@@ -305,45 +300,33 @@ public class UploadException extends TException implements org.apache.thrift.TBa
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_number = true && (isSetNumber());
-    list.add(present_number);
-    if (present_number)
-      list.add(number.getValue());
-
-    boolean present_message = true && (isSetMessage());
-    list.add(present_message);
-    if (present_message)
-      list.add(message);
-
-    return list.hashCode();
+    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(other.isSetNumber());
+    lastComparison = Boolean.valueOf(isSetNumber()).compareTo(typedOther.isSetNumber());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetNumber()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.number, other.number);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.number, typedOther.number);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(other.isSetMessage());
+    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(typedOther.isSetMessage());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMessage()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, other.message);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, typedOther.message);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -428,7 +411,7 @@ public class UploadException extends TException implements org.apache.thrift.TBa
         switch (schemeField.id) {
           case 1: // NUMBER
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.number = org.openslx.imagemaster.thrift.iface.UploadError.findByValue(iprot.readI32());
+              struct.number = UploadError.findByValue(iprot.readI32());
               struct.setNumberIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -505,7 +488,7 @@ public class UploadException extends TException implements org.apache.thrift.TBa
       TTupleProtocol iprot = (TTupleProtocol) prot;
       BitSet incoming = iprot.readBitSet(2);
       if (incoming.get(0)) {
-        struct.number = org.openslx.imagemaster.thrift.iface.UploadError.findByValue(iprot.readI32());
+        struct.number = UploadError.findByValue(iprot.readI32());
         struct.setNumberIsSet(true);
       }
       if (incoming.get(1)) {
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 ef75646..be49273 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 (1.0.0-dev)
+ * Autogenerated by Thrift Compiler (0.9.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -15,8 +15,6 @@ 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;
@@ -29,13 +27,10 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
-import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-21")
-public class UploadInfos implements org.apache.thrift.TBase<UploadInfos, UploadInfos._Fields>, java.io.Serializable, Cloneable, Comparable<UploadInfos> {
+public class UploadInfos implements org.apache.thrift.TBase<UploadInfos, UploadInfos._Fields>, java.io.Serializable, Cloneable {
   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);
@@ -169,7 +164,10 @@ public class UploadInfos implements org.apache.thrift.TBase<UploadInfos, UploadI
     }
     this.port = other.port;
     if (other.isSetMissingBlocks()) {
-      List<Integer> __this__missingBlocks = new ArrayList<Integer>(other.missingBlocks);
+      List<Integer> __this__missingBlocks = new ArrayList<Integer>();
+      for (Integer other_element : other.missingBlocks) {
+        __this__missingBlocks.add(other_element);
+      }
       this.missingBlocks = __this__missingBlocks;
     }
     this.allBlocksValid = other.allBlocksValid;
@@ -426,75 +424,53 @@ public class UploadInfos implements org.apache.thrift.TBase<UploadInfos, UploadI
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_token = true && (isSetToken());
-    list.add(present_token);
-    if (present_token)
-      list.add(token);
-
-    boolean present_port = true;
-    list.add(present_port);
-    if (present_port)
-      list.add(port);
-
-    boolean present_missingBlocks = true && (isSetMissingBlocks());
-    list.add(present_missingBlocks);
-    if (present_missingBlocks)
-      list.add(missingBlocks);
-
-    boolean present_allBlocksValid = true;
-    list.add(present_allBlocksValid);
-    if (present_allBlocksValid)
-      list.add(allBlocksValid);
-
-    return list.hashCode();
+    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(other.isSetToken());
+    lastComparison = Boolean.valueOf(isSetToken()).compareTo(typedOther.isSetToken());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetToken()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, typedOther.token);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetPort()).compareTo(other.isSetPort());
+    lastComparison = Boolean.valueOf(isSetPort()).compareTo(typedOther.isSetPort());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetPort()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.port, other.port);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.port, typedOther.port);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMissingBlocks()).compareTo(other.isSetMissingBlocks());
+    lastComparison = Boolean.valueOf(isSetMissingBlocks()).compareTo(typedOther.isSetMissingBlocks());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMissingBlocks()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.missingBlocks, other.missingBlocks);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.missingBlocks, typedOther.missingBlocks);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetAllBlocksValid()).compareTo(other.isSetAllBlocksValid());
+    lastComparison = Boolean.valueOf(isSetAllBlocksValid()).compareTo(typedOther.isSetAllBlocksValid());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetAllBlocksValid()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.allBlocksValid, other.allBlocksValid);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.allBlocksValid, typedOther.allBlocksValid);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -608,11 +584,11 @@ public class UploadInfos implements org.apache.thrift.TBase<UploadInfos, UploadI
               {
                 org.apache.thrift.protocol.TList _list0 = iprot.readListBegin();
                 struct.missingBlocks = new ArrayList<Integer>(_list0.size);
-                int _elem1;
-                for (int _i2 = 0; _i2 < _list0.size; ++_i2)
+                for (int _i1 = 0; _i1 < _list0.size; ++_i1)
                 {
-                  _elem1 = iprot.readI32();
-                  struct.missingBlocks.add(_elem1);
+                  int _elem2; // required
+                  _elem2 = iprot.readI32();
+                  struct.missingBlocks.add(_elem2);
                 }
                 iprot.readListEnd();
               }
@@ -734,11 +710,11 @@ public class UploadInfos implements org.apache.thrift.TBase<UploadInfos, UploadI
         {
           org.apache.thrift.protocol.TList _list5 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32());
           struct.missingBlocks = new ArrayList<Integer>(_list5.size);
-          int _elem6;
-          for (int _i7 = 0; _i7 < _list5.size; ++_i7)
+          for (int _i6 = 0; _i6 < _list5.size; ++_i6)
           {
-            _elem6 = iprot.readI32();
-            struct.missingBlocks.add(_elem6);
+            int _elem7; // required
+            _elem7 = iprot.readI32();
+            struct.missingBlocks.add(_elem7);
           }
         }
         struct.setMissingBlocksIsSet(true);
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 f16dd57..98f329d 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 (1.0.0-dev)
+ * Autogenerated by Thrift Compiler (0.9.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -15,8 +15,6 @@ 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;
@@ -29,13 +27,10 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
-import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (1.0.0-dev)", date = "2014-7-21")
-public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fields>, java.io.Serializable, Cloneable, Comparable<UserInfo> {
+public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fields>, java.io.Serializable, Cloneable {
   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);
@@ -407,75 +402,53 @@ public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fie
 
   @Override
   public int hashCode() {
-    List<Object> list = new ArrayList<Object>();
-
-    boolean present_userId = true && (isSetUserId());
-    list.add(present_userId);
-    if (present_userId)
-      list.add(userId);
-
-    boolean present_firstName = true && (isSetFirstName());
-    list.add(present_firstName);
-    if (present_firstName)
-      list.add(firstName);
-
-    boolean present_lastName = true && (isSetLastName());
-    list.add(present_lastName);
-    if (present_lastName)
-      list.add(lastName);
-
-    boolean present_eMail = true && (isSetEMail());
-    list.add(present_eMail);
-    if (present_eMail)
-      list.add(eMail);
-
-    return list.hashCode();
+    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(other.isSetUserId());
+    lastComparison = Boolean.valueOf(isSetUserId()).compareTo(typedOther.isSetUserId());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetUserId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.userId, other.userId);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.userId, typedOther.userId);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetFirstName()).compareTo(other.isSetFirstName());
+    lastComparison = Boolean.valueOf(isSetFirstName()).compareTo(typedOther.isSetFirstName());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetFirstName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.firstName, other.firstName);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.firstName, typedOther.firstName);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetLastName()).compareTo(other.isSetLastName());
+    lastComparison = Boolean.valueOf(isSetLastName()).compareTo(typedOther.isSetLastName());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetLastName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lastName, other.lastName);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lastName, typedOther.lastName);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetEMail()).compareTo(other.isSetEMail());
+    lastComparison = Boolean.valueOf(isSetEMail()).compareTo(typedOther.isSetEMail());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetEMail()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.eMail, other.eMail);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.eMail, typedOther.eMail);
       if (lastComparison != 0) {
         return lastComparison;
       }