Update proxy-vole dependency in pom.xml, run thrift compiler

19 files changed, 2170 insertions, 370 deletions

diff --git a/pom.xml b/pom.xml
index 60fa968..a8bbaba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,18 +14,31 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 
-  <distributionManagement>
-    <repository>
-      <id>mltk-repo</id>
-      <name>mltk-services repo</name>
-      <url>http://mltk-services.ruf.uni-freiburg.de:8081/nexus/content/repositories/releases/</url>
-    </repository>
-    <snapshotRepository>
-      <id>mltk-repo</id>
-      <name>mltk-services repo</name>
-      <url>http://mltk-services.ruf.uni-freiburg.de:8081/nexus/content/repositories/snapshots/</url>
-    </snapshotRepository>
-  </distributionManagement>
+	<repositories>
+		<repository>
+			<snapshots>
+				<enabled>true</enabled>
+				<updatePolicy>always</updatePolicy>
+				<checksumPolicy>warn</checksumPolicy>
+			</snapshots>
+			<id>mltk-repo</id>
+			<name>mltk repo</name>
+			<url>http://mltk-services.ruf.uni-freiburg.de:8081/nexus/content/repositories/snapshots/</url>
+		</repository>
+	</repositories>
+
+	<distributionManagement>
+		<repository>
+			<id>mltk-repo</id>
+			<name>mltk-services repo</name>
+			<url>http://mltk-services.ruf.uni-freiburg.de:8081/nexus/content/repositories/releases/</url>
+		</repository>
+		<snapshotRepository>
+			<id>mltk-repo</id>
+			<name>mltk-services repo</name>
+			<url>http://mltk-services.ruf.uni-freiburg.de:8081/nexus/content/repositories/snapshots/</url>
+		</snapshotRepository>
+	</distributionManagement>
 
 	<build>
 		<plugins>
@@ -49,11 +62,6 @@
 					</execution>
 				</executions>
 				<configuration>
-<!-- 					<archive>
-						<manifest>
-							<mainClass>org.openslx.satellitedaemon.App</mainClass>
-						</manifest>
-					</archive> -->
 					<descriptorRefs>
 						<descriptorRef>jar-with-dependencies</descriptorRef>
 					</descriptorRefs>
@@ -108,10 +116,11 @@
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
-			<groupId>com.googlecode.vestige</groupId>
-  			<artifactId>proxy_vole</artifactId>
-  			<version>0.0.3-SNAPSHOT</version>
+			<groupId>org.openslx</groupId>
+			<artifactId>proxy_vole</artifactId>
+			<version>0.0.3-SNAPSHOT</version>
+			<scope>compile</scope>
 		</dependency>
-		
+
 	</dependencies>
 </project>
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 0c2835d..965ddd2 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/AuthenticationError.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/AuthenticationError.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/AuthenticationException.java b/src/main/java/org/openslx/imagemaster/thrift/iface/AuthenticationException.java
index bd4bb0b..5efc66c 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/AuthenticationException.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/AuthenticationException.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -15,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.protocol.TProtocolException;
 import org.apache.thrift.EncodingUtils;
 import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -30,7 +32,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class AuthenticationException extends TException implements org.apache.thrift.TBase<AuthenticationException, AuthenticationException._Fields>, java.io.Serializable, Cloneable {
+public class AuthenticationException extends TException implements org.apache.thrift.TBase<AuthenticationException, AuthenticationException._Fields>, java.io.Serializable, Cloneable, Comparable<AuthenticationException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AuthenticationException");
 
   private static final org.apache.thrift.protocol.TField NUMBER_FIELD_DESC = new org.apache.thrift.protocol.TField("number", org.apache.thrift.protocol.TType.I32, (short)1);
@@ -303,30 +305,30 @@ public class AuthenticationException extends TException implements org.apache.th
     return 0;
   }
 
+  @Override
   public int compareTo(AuthenticationException other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    AuthenticationException typedOther = (AuthenticationException)other;
 
-    lastComparison = Boolean.valueOf(isSetNumber()).compareTo(typedOther.isSetNumber());
+    lastComparison = Boolean.valueOf(isSetNumber()).compareTo(other.isSetNumber());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetNumber()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.number, typedOther.number);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.number, other.number);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(typedOther.isSetMessage());
+    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(other.isSetMessage());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMessage()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, typedOther.message);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, other.message);
       if (lastComparison != 0) {
         return lastComparison;
       }
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/AuthorizationError.java b/src/main/java/org/openslx/imagemaster/thrift/iface/AuthorizationError.java
index 61c5960..a49ad92 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/AuthorizationError.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/AuthorizationError.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/AuthorizationException.java b/src/main/java/org/openslx/imagemaster/thrift/iface/AuthorizationException.java
index fec2e3e..5f798ac 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/AuthorizationException.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/AuthorizationException.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -15,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.protocol.TProtocolException;
 import org.apache.thrift.EncodingUtils;
 import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -30,7 +32,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class AuthorizationException extends TException implements org.apache.thrift.TBase<AuthorizationException, AuthorizationException._Fields>, java.io.Serializable, Cloneable {
+public class AuthorizationException extends TException implements org.apache.thrift.TBase<AuthorizationException, AuthorizationException._Fields>, java.io.Serializable, Cloneable, Comparable<AuthorizationException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("AuthorizationException");
 
   private static final org.apache.thrift.protocol.TField NUMBER_FIELD_DESC = new org.apache.thrift.protocol.TField("number", org.apache.thrift.protocol.TType.I32, (short)1);
@@ -303,30 +305,30 @@ public class AuthorizationException extends TException implements org.apache.thr
     return 0;
   }
 
+  @Override
   public int compareTo(AuthorizationException other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    AuthorizationException typedOther = (AuthorizationException)other;
 
-    lastComparison = Boolean.valueOf(isSetNumber()).compareTo(typedOther.isSetNumber());
+    lastComparison = Boolean.valueOf(isSetNumber()).compareTo(other.isSetNumber());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetNumber()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.number, typedOther.number);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.number, other.number);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(typedOther.isSetMessage());
+    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(other.isSetMessage());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMessage()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, typedOther.message);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, other.message);
       if (lastComparison != 0) {
         return lastComparison;
       }
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/DownloadData.java b/src/main/java/org/openslx/imagemaster/thrift/iface/DownloadData.java
index 8c038cf..2dda1f7 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/DownloadData.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/DownloadData.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -15,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.protocol.TProtocolException;
 import org.apache.thrift.EncodingUtils;
 import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -30,7 +32,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class DownloadData implements org.apache.thrift.TBase<DownloadData, DownloadData._Fields>, java.io.Serializable, Cloneable {
+public class DownloadData implements org.apache.thrift.TBase<DownloadData, DownloadData._Fields>, java.io.Serializable, Cloneable, Comparable<DownloadData> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DownloadData");
 
   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);
@@ -153,10 +155,7 @@ public class DownloadData implements org.apache.thrift.TBase<DownloadData, Downl
     }
     this.port = other.port;
     if (other.isSetCrcSums()) {
-      List<Integer> __this__crcSums = new ArrayList<Integer>();
-      for (Integer other_element : other.crcSums) {
-        __this__crcSums.add(other_element);
-      }
+      List<Integer> __this__crcSums = new ArrayList<Integer>(other.crcSums);
       this.crcSums = __this__crcSums;
     }
   }
@@ -368,40 +367,40 @@ public class DownloadData implements org.apache.thrift.TBase<DownloadData, Downl
     return 0;
   }
 
+  @Override
   public int compareTo(DownloadData other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    DownloadData typedOther = (DownloadData)other;
 
-    lastComparison = Boolean.valueOf(isSetToken()).compareTo(typedOther.isSetToken());
+    lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetToken()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, typedOther.token);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetPort()).compareTo(typedOther.isSetPort());
+    lastComparison = Boolean.valueOf(isSetPort()).compareTo(other.isSetPort());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetPort()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.port, typedOther.port);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.port, other.port);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetCrcSums()).compareTo(typedOther.isSetCrcSums());
+    lastComparison = Boolean.valueOf(isSetCrcSums()).compareTo(other.isSetCrcSums());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetCrcSums()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.crcSums, typedOther.crcSums);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.crcSums, other.crcSums);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -513,7 +512,7 @@ public class DownloadData implements org.apache.thrift.TBase<DownloadData, Downl
                 struct.crcSums = new ArrayList<Integer>(_list8.size);
                 for (int _i9 = 0; _i9 < _list8.size; ++_i9)
                 {
-                  int _elem10; // required
+                  int _elem10;
                   _elem10 = iprot.readI32();
                   struct.crcSums.add(_elem10);
                 }
@@ -622,7 +621,7 @@ public class DownloadData implements org.apache.thrift.TBase<DownloadData, Downl
           struct.crcSums = new ArrayList<Integer>(_list13.size);
           for (int _i14 = 0; _i14 < _list13.size; ++_i14)
           {
-            int _elem15; // required
+            int _elem15;
             _elem15 = iprot.readI32();
             struct.crcSums.add(_elem15);
           }
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/DownloadException.java b/src/main/java/org/openslx/imagemaster/thrift/iface/DownloadException.java
index efc2448..46404b9 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/DownloadException.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/DownloadException.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -15,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.protocol.TProtocolException;
 import org.apache.thrift.EncodingUtils;
 import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -30,7 +32,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class DownloadException extends TException implements org.apache.thrift.TBase<DownloadException, DownloadException._Fields>, java.io.Serializable, Cloneable {
+public class DownloadException extends TException implements org.apache.thrift.TBase<DownloadException, DownloadException._Fields>, java.io.Serializable, Cloneable, Comparable<DownloadException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DownloadException");
 
   private static final org.apache.thrift.protocol.TField NUMBER_FIELD_DESC = new org.apache.thrift.protocol.TField("number", org.apache.thrift.protocol.TType.I32, (short)1);
@@ -303,30 +305,30 @@ public class DownloadException extends TException implements org.apache.thrift.T
     return 0;
   }
 
+  @Override
   public int compareTo(DownloadException other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    DownloadException typedOther = (DownloadException)other;
 
-    lastComparison = Boolean.valueOf(isSetNumber()).compareTo(typedOther.isSetNumber());
+    lastComparison = Boolean.valueOf(isSetNumber()).compareTo(other.isSetNumber());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetNumber()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.number, typedOther.number);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.number, other.number);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(typedOther.isSetMessage());
+    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(other.isSetMessage());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMessage()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, typedOther.message);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, other.message);
       if (lastComparison != 0) {
         return lastComparison;
       }
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/ImageData.java b/src/main/java/org/openslx/imagemaster/thrift/iface/ImageData.java
index b1c91fa..aeeb15b 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/ImageData.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/ImageData.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -15,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.protocol.TProtocolException;
 import org.apache.thrift.EncodingUtils;
 import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -30,7 +32,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class ImageData implements org.apache.thrift.TBase<ImageData, ImageData._Fields>, java.io.Serializable, Cloneable {
+public class ImageData implements org.apache.thrift.TBase<ImageData, ImageData._Fields>, java.io.Serializable, Cloneable, Comparable<ImageData> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ImageData");
 
   private static final org.apache.thrift.protocol.TField UUID_FIELD_DESC = new org.apache.thrift.protocol.TField("uuid", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -820,120 +822,120 @@ public class ImageData implements org.apache.thrift.TBase<ImageData, ImageData._
     return 0;
   }
 
+  @Override
   public int compareTo(ImageData other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    ImageData typedOther = (ImageData)other;
 
-    lastComparison = Boolean.valueOf(isSetUuid()).compareTo(typedOther.isSetUuid());
+    lastComparison = Boolean.valueOf(isSetUuid()).compareTo(other.isSetUuid());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetUuid()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.uuid, typedOther.uuid);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.uuid, other.uuid);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetRevision()).compareTo(typedOther.isSetRevision());
+    lastComparison = Boolean.valueOf(isSetRevision()).compareTo(other.isSetRevision());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetRevision()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.revision, typedOther.revision);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.revision, other.revision);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetTitle()).compareTo(typedOther.isSetTitle());
+    lastComparison = Boolean.valueOf(isSetTitle()).compareTo(other.isSetTitle());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetTitle()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.title, typedOther.title);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.title, other.title);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetCreateTime()).compareTo(typedOther.isSetCreateTime());
+    lastComparison = Boolean.valueOf(isSetCreateTime()).compareTo(other.isSetCreateTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetCreateTime()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.createTime, typedOther.createTime);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.createTime, other.createTime);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetUpdateTime()).compareTo(typedOther.isSetUpdateTime());
+    lastComparison = Boolean.valueOf(isSetUpdateTime()).compareTo(other.isSetUpdateTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetUpdateTime()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.updateTime, typedOther.updateTime);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.updateTime, other.updateTime);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetOwnerLogin()).compareTo(typedOther.isSetOwnerLogin());
+    lastComparison = Boolean.valueOf(isSetOwnerLogin()).compareTo(other.isSetOwnerLogin());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetOwnerLogin()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ownerLogin, typedOther.ownerLogin);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ownerLogin, other.ownerLogin);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetOperatingSystem()).compareTo(typedOther.isSetOperatingSystem());
+    lastComparison = Boolean.valueOf(isSetOperatingSystem()).compareTo(other.isSetOperatingSystem());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetOperatingSystem()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.operatingSystem, typedOther.operatingSystem);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.operatingSystem, other.operatingSystem);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetIsValid()).compareTo(typedOther.isSetIsValid());
+    lastComparison = Boolean.valueOf(isSetIsValid()).compareTo(other.isSetIsValid());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetIsValid()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.isValid, typedOther.isValid);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.isValid, other.isValid);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetIsDeleted()).compareTo(typedOther.isSetIsDeleted());
+    lastComparison = Boolean.valueOf(isSetIsDeleted()).compareTo(other.isSetIsDeleted());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetIsDeleted()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.isDeleted, typedOther.isDeleted);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.isDeleted, other.isDeleted);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetDescription()).compareTo(typedOther.isSetDescription());
+    lastComparison = Boolean.valueOf(isSetDescription()).compareTo(other.isSetDescription());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetDescription()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.description, typedOther.description);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.description, other.description);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetFileSize()).compareTo(typedOther.isSetFileSize());
+    lastComparison = Boolean.valueOf(isSetFileSize()).compareTo(other.isSetFileSize());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetFileSize()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.fileSize, typedOther.fileSize);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.fileSize, other.fileSize);
       if (lastComparison != 0) {
         return lastComparison;
       }
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/ImageDataError.java b/src/main/java/org/openslx/imagemaster/thrift/iface/ImageDataError.java
index c9e52ae..fdd7b81 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/ImageDataError.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/ImageDataError.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/ImageDataException.java b/src/main/java/org/openslx/imagemaster/thrift/iface/ImageDataException.java
index dbf28cd..a5ac923 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/ImageDataException.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/ImageDataException.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -15,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.protocol.TProtocolException;
 import org.apache.thrift.EncodingUtils;
 import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -30,7 +32,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class ImageDataException extends TException implements org.apache.thrift.TBase<ImageDataException, ImageDataException._Fields>, java.io.Serializable, Cloneable {
+public class ImageDataException extends TException implements org.apache.thrift.TBase<ImageDataException, ImageDataException._Fields>, java.io.Serializable, Cloneable, Comparable<ImageDataException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ImageDataException");
 
   private static final org.apache.thrift.protocol.TField NUMBER_FIELD_DESC = new org.apache.thrift.protocol.TField("number", org.apache.thrift.protocol.TType.I32, (short)1);
@@ -303,30 +305,30 @@ public class ImageDataException extends TException implements org.apache.thrift.
     return 0;
   }
 
+  @Override
   public int compareTo(ImageDataException other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    ImageDataException typedOther = (ImageDataException)other;
 
-    lastComparison = Boolean.valueOf(isSetNumber()).compareTo(typedOther.isSetNumber());
+    lastComparison = Boolean.valueOf(isSetNumber()).compareTo(other.isSetNumber());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetNumber()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.number, typedOther.number);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.number, other.number);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(typedOther.isSetMessage());
+    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(other.isSetMessage());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMessage()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, typedOther.message);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, other.message);
       if (lastComparison != 0) {
         return lastComparison;
       }
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/ImageServer.java b/src/main/java/org/openslx/imagemaster/thrift/iface/ImageServer.java
index 434cdcd..82ff930 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/ImageServer.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/ImageServer.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -15,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.protocol.TProtocolException;
 import org.apache.thrift.EncodingUtils;
 import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -62,37 +64,41 @@ public class ImageServer {
 
     public boolean updateSatelliteAddress(String serverSessionId, String address) throws org.apache.thrift.TException;
 
+    public ServerSessionData addSession(String localPassword, UserInfo userInfo) throws org.apache.thrift.TException;
+
   }
 
   public interface AsyncIface {
 
-    public void ping(org.apache.thrift.async.AsyncMethodCallback<AsyncClient.ping_call> resultHandler) throws org.apache.thrift.TException;
+    public void ping(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
+
+    public void authenticate(String login, String password, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
-    public void authenticate(String login, String password, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.authenticate_call> resultHandler) throws org.apache.thrift.TException;
+    public void getOrganizations(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
-    public void getOrganizations(org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getOrganizations_call> resultHandler) throws org.apache.thrift.TException;
+    public void findUser(String sessionId, String organizationId, String searchTerm, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
-    public void findUser(String sessionId, String organizationId, String searchTerm, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.findUser_call> resultHandler) throws org.apache.thrift.TException;
+    public void getPublicImages(String sessionId, int page, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
-    public void getPublicImages(String sessionId, int page, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getPublicImages_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 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 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 serverAuthenticate(String organizationId, ByteBuffer challengeResponse, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
-    public void serverAuthenticate(String organizationId, 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 serverSessionId, String uuid, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
-    public void getImage(String serverSessionId, String uuid, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.getImage_call> resultHandler) throws org.apache.thrift.TException;
+    public void publishUser(String serverSessionId, UserInfo user, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
-    public void publishUser(String serverSessionId, UserInfo user, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.publishUser_call> resultHandler) throws org.apache.thrift.TException;
+    public void registerSatellite(String organizationId, String address, String modulus, String exponent, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
-    public void registerSatellite(String organizationId, String address, String modulus, String exponent, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.registerSatellite_call> resultHandler) throws org.apache.thrift.TException;
+    public void updateSatelliteAddress(String serverSessionId, String address, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
-    public void updateSatelliteAddress(String serverSessionId, String address, org.apache.thrift.async.AsyncMethodCallback<AsyncClient.updateSatelliteAddress_call> resultHandler) throws org.apache.thrift.TException;
+    public void addSession(String localPassword, UserInfo userInfo, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException;
 
   }
 
@@ -485,6 +491,30 @@ public class ImageServer {
       throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "updateSatelliteAddress failed: unknown result");
     }
 
+    public ServerSessionData addSession(String localPassword, UserInfo userInfo) throws org.apache.thrift.TException
+    {
+      send_addSession(localPassword, userInfo);
+      return recv_addSession();
+    }
+
+    public void send_addSession(String localPassword, UserInfo userInfo) throws org.apache.thrift.TException
+    {
+      addSession_args args = new addSession_args();
+      args.setLocalPassword(localPassword);
+      args.setUserInfo(userInfo);
+      sendBase("addSession", args);
+    }
+
+    public ServerSessionData recv_addSession() throws org.apache.thrift.TException
+    {
+      addSession_result result = new addSession_result();
+      receiveBase(result, "addSession");
+      if (result.isSetSuccess()) {
+        return result.success;
+      }
+      throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "addSession failed: unknown result");
+    }
+
   }
   public static class AsyncClient extends org.apache.thrift.async.TAsyncClient implements AsyncIface {
     public static class Factory implements org.apache.thrift.async.TAsyncClientFactory<AsyncClient> {
@@ -503,7 +533,7 @@ public class ImageServer {
       super(protocolFactory, clientManager, transport);
     }
 
-    public void ping(org.apache.thrift.async.AsyncMethodCallback<ping_call> resultHandler) throws org.apache.thrift.TException {
+    public void ping(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
       checkReady();
       ping_call method_call = new ping_call(resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -511,7 +541,7 @@ public class ImageServer {
     }
 
     public static class ping_call extends org.apache.thrift.async.TAsyncMethodCall {
-      public ping_call(org.apache.thrift.async.AsyncMethodCallback<ping_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public ping_call(org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
       }
 
@@ -532,7 +562,7 @@ public class ImageServer {
       }
     }
 
-    public void authenticate(String login, String password, org.apache.thrift.async.AsyncMethodCallback<authenticate_call> resultHandler) throws org.apache.thrift.TException {
+    public void authenticate(String login, String password, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
       checkReady();
       authenticate_call method_call = new authenticate_call(login, password, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -542,7 +572,7 @@ public class ImageServer {
     public static class authenticate_call extends org.apache.thrift.async.TAsyncMethodCall {
       private String login;
       private String password;
-      public authenticate_call(String login, String password, org.apache.thrift.async.AsyncMethodCallback<authenticate_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public authenticate_call(String login, String password, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.login = login;
         this.password = password;
@@ -567,7 +597,7 @@ public class ImageServer {
       }
     }
 
-    public void getOrganizations(org.apache.thrift.async.AsyncMethodCallback<getOrganizations_call> resultHandler) throws org.apache.thrift.TException {
+    public void getOrganizations(org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
       checkReady();
       getOrganizations_call method_call = new getOrganizations_call(resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -575,7 +605,7 @@ public class ImageServer {
     }
 
     public static class getOrganizations_call extends org.apache.thrift.async.TAsyncMethodCall {
-      public getOrganizations_call(org.apache.thrift.async.AsyncMethodCallback<getOrganizations_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public getOrganizations_call(org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
       }
 
@@ -596,7 +626,7 @@ public class ImageServer {
       }
     }
 
-    public void findUser(String sessionId, String organizationId, String searchTerm, org.apache.thrift.async.AsyncMethodCallback<findUser_call> resultHandler) throws org.apache.thrift.TException {
+    public void findUser(String sessionId, String organizationId, String searchTerm, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
       checkReady();
       findUser_call method_call = new findUser_call(sessionId, organizationId, searchTerm, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -607,7 +637,7 @@ public class ImageServer {
       private String sessionId;
       private String organizationId;
       private String searchTerm;
-      public findUser_call(String sessionId, String organizationId, String searchTerm, org.apache.thrift.async.AsyncMethodCallback<findUser_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public findUser_call(String sessionId, String organizationId, String searchTerm, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.sessionId = sessionId;
         this.organizationId = organizationId;
@@ -634,7 +664,7 @@ public class ImageServer {
       }
     }
 
-    public void getPublicImages(String sessionId, int page, org.apache.thrift.async.AsyncMethodCallback<getPublicImages_call> resultHandler) throws org.apache.thrift.TException {
+    public void getPublicImages(String sessionId, int page, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
       checkReady();
       getPublicImages_call method_call = new getPublicImages_call(sessionId, page, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -644,7 +674,7 @@ public class ImageServer {
     public static class getPublicImages_call extends org.apache.thrift.async.TAsyncMethodCall {
       private String sessionId;
       private int page;
-      public getPublicImages_call(String sessionId, int page, org.apache.thrift.async.AsyncMethodCallback<getPublicImages_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public getPublicImages_call(String sessionId, int page, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.sessionId = sessionId;
         this.page = page;
@@ -669,7 +699,7 @@ public class ImageServer {
       }
     }
 
-    public void getUserFromToken(String token, org.apache.thrift.async.AsyncMethodCallback<getUserFromToken_call> resultHandler) throws org.apache.thrift.TException {
+    public void getUserFromToken(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
       checkReady();
       getUserFromToken_call method_call = new getUserFromToken_call(token, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -678,7 +708,7 @@ public class ImageServer {
 
     public static class getUserFromToken_call extends org.apache.thrift.async.TAsyncMethodCall {
       private String token;
-      public getUserFromToken_call(String token, org.apache.thrift.async.AsyncMethodCallback<getUserFromToken_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public getUserFromToken_call(String token, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.token = token;
       }
@@ -701,7 +731,7 @@ public class ImageServer {
       }
     }
 
-    public void isServerAuthenticated(String serverSessionId, org.apache.thrift.async.AsyncMethodCallback<isServerAuthenticated_call> resultHandler) throws org.apache.thrift.TException {
+    public void isServerAuthenticated(String serverSessionId, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
       checkReady();
       isServerAuthenticated_call method_call = new isServerAuthenticated_call(serverSessionId, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -710,7 +740,7 @@ public class ImageServer {
 
     public static class isServerAuthenticated_call extends org.apache.thrift.async.TAsyncMethodCall {
       private String serverSessionId;
-      public isServerAuthenticated_call(String serverSessionId, org.apache.thrift.async.AsyncMethodCallback<isServerAuthenticated_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public isServerAuthenticated_call(String serverSessionId, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.serverSessionId = serverSessionId;
       }
@@ -733,7 +763,7 @@ public class ImageServer {
       }
     }
 
-    public void startServerAuthentication(String organization, org.apache.thrift.async.AsyncMethodCallback<startServerAuthentication_call> resultHandler) throws org.apache.thrift.TException {
+    public void startServerAuthentication(String organization, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
       checkReady();
       startServerAuthentication_call method_call = new startServerAuthentication_call(organization, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -742,7 +772,7 @@ public class ImageServer {
 
     public static class startServerAuthentication_call extends org.apache.thrift.async.TAsyncMethodCall {
       private String organization;
-      public startServerAuthentication_call(String organization, org.apache.thrift.async.AsyncMethodCallback<startServerAuthentication_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public startServerAuthentication_call(String organization, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.organization = organization;
       }
@@ -765,7 +795,7 @@ public class ImageServer {
       }
     }
 
-    public void serverAuthenticate(String organizationId, ByteBuffer challengeResponse, org.apache.thrift.async.AsyncMethodCallback<serverAuthenticate_call> resultHandler) throws org.apache.thrift.TException {
+    public void serverAuthenticate(String organizationId, ByteBuffer challengeResponse, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
       checkReady();
       serverAuthenticate_call method_call = new serverAuthenticate_call(organizationId, challengeResponse, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -775,7 +805,7 @@ public class ImageServer {
     public static class serverAuthenticate_call extends org.apache.thrift.async.TAsyncMethodCall {
       private String organizationId;
       private ByteBuffer challengeResponse;
-      public serverAuthenticate_call(String organizationId, ByteBuffer challengeResponse, org.apache.thrift.async.AsyncMethodCallback<serverAuthenticate_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public serverAuthenticate_call(String organizationId, ByteBuffer challengeResponse, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.organizationId = organizationId;
         this.challengeResponse = challengeResponse;
@@ -800,7 +830,7 @@ public class ImageServer {
       }
     }
 
-    public void submitImage(String serverSessionId, ImageData imageDescription, List<Integer> crcSums, org.apache.thrift.async.AsyncMethodCallback<submitImage_call> resultHandler) throws org.apache.thrift.TException {
+    public void submitImage(String serverSessionId, ImageData imageDescription, List<Integer> crcSums, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
       checkReady();
       submitImage_call method_call = new submitImage_call(serverSessionId, imageDescription, crcSums, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -811,7 +841,7 @@ public class ImageServer {
       private String serverSessionId;
       private ImageData imageDescription;
       private List<Integer> crcSums;
-      public submitImage_call(String serverSessionId, ImageData imageDescription, List<Integer> crcSums, org.apache.thrift.async.AsyncMethodCallback<submitImage_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public submitImage_call(String serverSessionId, ImageData imageDescription, List<Integer> crcSums, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.serverSessionId = serverSessionId;
         this.imageDescription = imageDescription;
@@ -838,7 +868,7 @@ public class ImageServer {
       }
     }
 
-    public void getImage(String serverSessionId, String uuid, org.apache.thrift.async.AsyncMethodCallback<getImage_call> resultHandler) throws org.apache.thrift.TException {
+    public void getImage(String serverSessionId, String uuid, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
       checkReady();
       getImage_call method_call = new getImage_call(serverSessionId, uuid, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -848,7 +878,7 @@ public class ImageServer {
     public static class getImage_call extends org.apache.thrift.async.TAsyncMethodCall {
       private String serverSessionId;
       private String uuid;
-      public getImage_call(String serverSessionId, String uuid, org.apache.thrift.async.AsyncMethodCallback<getImage_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public getImage_call(String serverSessionId, String uuid, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.serverSessionId = serverSessionId;
         this.uuid = uuid;
@@ -873,7 +903,7 @@ public class ImageServer {
       }
     }
 
-    public void publishUser(String serverSessionId, UserInfo user, org.apache.thrift.async.AsyncMethodCallback<publishUser_call> resultHandler) throws org.apache.thrift.TException {
+    public void publishUser(String serverSessionId, UserInfo user, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
       checkReady();
       publishUser_call method_call = new publishUser_call(serverSessionId, user, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -883,7 +913,7 @@ public class ImageServer {
     public static class publishUser_call extends org.apache.thrift.async.TAsyncMethodCall {
       private String serverSessionId;
       private UserInfo user;
-      public publishUser_call(String serverSessionId, UserInfo user, org.apache.thrift.async.AsyncMethodCallback<publishUser_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public publishUser_call(String serverSessionId, UserInfo user, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.serverSessionId = serverSessionId;
         this.user = user;
@@ -908,7 +938,7 @@ public class ImageServer {
       }
     }
 
-    public void registerSatellite(String organizationId, String address, String modulus, String exponent, org.apache.thrift.async.AsyncMethodCallback<registerSatellite_call> resultHandler) throws org.apache.thrift.TException {
+    public void registerSatellite(String organizationId, String address, String modulus, String exponent, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
       checkReady();
       registerSatellite_call method_call = new registerSatellite_call(organizationId, address, modulus, exponent, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -920,7 +950,7 @@ public class ImageServer {
       private String address;
       private String modulus;
       private String exponent;
-      public registerSatellite_call(String organizationId, String address, String modulus, String exponent, org.apache.thrift.async.AsyncMethodCallback<registerSatellite_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public registerSatellite_call(String organizationId, String address, String modulus, String exponent, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.organizationId = organizationId;
         this.address = address;
@@ -949,7 +979,7 @@ public class ImageServer {
       }
     }
 
-    public void updateSatelliteAddress(String serverSessionId, String address, org.apache.thrift.async.AsyncMethodCallback<updateSatelliteAddress_call> resultHandler) throws org.apache.thrift.TException {
+    public void updateSatelliteAddress(String serverSessionId, String address, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
       checkReady();
       updateSatelliteAddress_call method_call = new updateSatelliteAddress_call(serverSessionId, address, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -959,7 +989,7 @@ public class ImageServer {
     public static class updateSatelliteAddress_call extends org.apache.thrift.async.TAsyncMethodCall {
       private String serverSessionId;
       private String address;
-      public updateSatelliteAddress_call(String serverSessionId, String address, org.apache.thrift.async.AsyncMethodCallback<updateSatelliteAddress_call> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public updateSatelliteAddress_call(String serverSessionId, String address, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.serverSessionId = serverSessionId;
         this.address = address;
@@ -984,6 +1014,41 @@ public class ImageServer {
       }
     }
 
+    public void addSession(String localPassword, UserInfo userInfo, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException {
+      checkReady();
+      addSession_call method_call = new addSession_call(localPassword, userInfo, resultHandler, this, ___protocolFactory, ___transport);
+      this.___currentMethod = method_call;
+      ___manager.call(method_call);
+    }
+
+    public static class addSession_call extends org.apache.thrift.async.TAsyncMethodCall {
+      private String localPassword;
+      private UserInfo userInfo;
+      public addSession_call(String localPassword, UserInfo userInfo, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+        super(client, protocolFactory, transport, resultHandler, false);
+        this.localPassword = localPassword;
+        this.userInfo = userInfo;
+      }
+
+      public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException {
+        prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("addSession", org.apache.thrift.protocol.TMessageType.CALL, 0));
+        addSession_args args = new addSession_args();
+        args.setLocalPassword(localPassword);
+        args.setUserInfo(userInfo);
+        args.write(prot);
+        prot.writeMessageEnd();
+      }
+
+      public ServerSessionData getResult() throws org.apache.thrift.TException {
+        if (getState() != org.apache.thrift.async.TAsyncMethodCall.State.RESPONSE_READ) {
+          throw new IllegalStateException("Method call not finished!");
+        }
+        org.apache.thrift.transport.TMemoryInputTransport memoryTransport = new org.apache.thrift.transport.TMemoryInputTransport(getFrameBuffer().array());
+        org.apache.thrift.protocol.TProtocol prot = client.getProtocolFactory().getProtocol(memoryTransport);
+        return (new Client(prot)).recv_addSession();
+      }
+    }
+
   }
 
   public static class Processor<I extends Iface> extends org.apache.thrift.TBaseProcessor<I> implements org.apache.thrift.TProcessor {
@@ -1011,6 +1076,7 @@ public class ImageServer {
       processMap.put("publishUser", new publishUser());
       processMap.put("registerSatellite", new registerSatellite());
       processMap.put("updateSatelliteAddress", new updateSatelliteAddress());
+      processMap.put("addSession", new addSession());
       return processMap;
     }
 
@@ -1341,9 +1407,899 @@ public class ImageServer {
       }
     }
 
+    public static class addSession<I extends Iface> extends org.apache.thrift.ProcessFunction<I, addSession_args> {
+      public addSession() {
+        super("addSession");
+      }
+
+      public addSession_args getEmptyArgsInstance() {
+        return new addSession_args();
+      }
+
+      protected boolean isOneway() {
+        return false;
+      }
+
+      public addSession_result getResult(I iface, addSession_args args) throws org.apache.thrift.TException {
+        addSession_result result = new addSession_result();
+        result.success = iface.addSession(args.localPassword, args.userInfo);
+        return result;
+      }
+    }
+
+  }
+
+  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("getOrganizations", new getOrganizations());
+      processMap.put("findUser", new findUser());
+      processMap.put("getPublicImages", new getPublicImages());
+      processMap.put("getUserFromToken", new getUserFromToken());
+      processMap.put("isServerAuthenticated", new isServerAuthenticated());
+      processMap.put("startServerAuthentication", new startServerAuthentication());
+      processMap.put("serverAuthenticate", new serverAuthenticate());
+      processMap.put("submitImage", new submitImage());
+      processMap.put("getImage", new getImage());
+      processMap.put("publishUser", new publishUser());
+      processMap.put("registerSatellite", new registerSatellite());
+      processMap.put("updateSatelliteAddress", new updateSatelliteAddress());
+      processMap.put("addSession", new addSession());
+      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.login, args.password,resultHandler);
+      }
+    }
+
+    public static class getOrganizations<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getOrganizations_args, List<OrganizationData>> {
+      public getOrganizations() {
+        super("getOrganizations");
+      }
+
+      public getOrganizations_args getEmptyArgsInstance() {
+        return new getOrganizations_args();
+      }
+
+      public AsyncMethodCallback<List<OrganizationData>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+        final org.apache.thrift.AsyncProcessFunction fcall = this;
+        return new AsyncMethodCallback<List<OrganizationData>>() { 
+          public void onComplete(List<OrganizationData> o) {
+            getOrganizations_result result = new getOrganizations_result();
+            result.success = o;
+            try {
+              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+              return;
+            } catch (Exception e) {
+              LOGGER.error("Exception writing to internal frame buffer", e);
+            }
+            fb.close();
+          }
+          public void onError(Exception e) {
+            byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+            org.apache.thrift.TBase msg;
+            getOrganizations_result result = new getOrganizations_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, getOrganizations_args args, org.apache.thrift.async.AsyncMethodCallback<List<OrganizationData>> resultHandler) throws TException {
+        iface.getOrganizations(resultHandler);
+      }
+    }
+
+    public static class findUser<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, findUser_args, List<UserInfo>> {
+      public findUser() {
+        super("findUser");
+      }
+
+      public findUser_args getEmptyArgsInstance() {
+        return new findUser_args();
+      }
+
+      public AsyncMethodCallback<List<UserInfo>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+        final org.apache.thrift.AsyncProcessFunction fcall = this;
+        return new AsyncMethodCallback<List<UserInfo>>() { 
+          public void onComplete(List<UserInfo> o) {
+            findUser_result result = new findUser_result();
+            result.success = o;
+            try {
+              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+              return;
+            } catch (Exception e) {
+              LOGGER.error("Exception writing to internal frame buffer", e);
+            }
+            fb.close();
+          }
+          public void onError(Exception e) {
+            byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+            org.apache.thrift.TBase msg;
+            findUser_result result = new findUser_result();
+            if (e instanceof AuthorizationException) {
+                        result.failure = (AuthorizationException) 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, findUser_args args, org.apache.thrift.async.AsyncMethodCallback<List<UserInfo>> resultHandler) throws TException {
+        iface.findUser(args.sessionId, args.organizationId, args.searchTerm,resultHandler);
+      }
+    }
+
+    public static class getPublicImages<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, getPublicImages_args, List<ImageData>> {
+      public getPublicImages() {
+        super("getPublicImages");
+      }
+
+      public getPublicImages_args getEmptyArgsInstance() {
+        return new getPublicImages_args();
+      }
+
+      public AsyncMethodCallback<List<ImageData>> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+        final org.apache.thrift.AsyncProcessFunction fcall = this;
+        return new AsyncMethodCallback<List<ImageData>>() { 
+          public void onComplete(List<ImageData> o) {
+            getPublicImages_result result = new getPublicImages_result();
+            result.success = o;
+            try {
+              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+              return;
+            } catch (Exception e) {
+              LOGGER.error("Exception writing to internal frame buffer", e);
+            }
+            fb.close();
+          }
+          public void onError(Exception e) {
+            byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+            org.apache.thrift.TBase msg;
+            getPublicImages_result result = new getPublicImages_result();
+            if (e instanceof AuthorizationException) {
+                        result.failure = (AuthorizationException) 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, getPublicImages_args args, org.apache.thrift.async.AsyncMethodCallback<List<ImageData>> resultHandler) throws TException {
+        iface.getPublicImages(args.sessionId, args.page,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 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 startServerAuthentication<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, startServerAuthentication_args, ByteBuffer> {
+      public startServerAuthentication() {
+        super("startServerAuthentication");
+      }
+
+      public startServerAuthentication_args getEmptyArgsInstance() {
+        return new startServerAuthentication_args();
+      }
+
+      public AsyncMethodCallback<ByteBuffer> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+        final org.apache.thrift.AsyncProcessFunction fcall = this;
+        return new AsyncMethodCallback<ByteBuffer>() { 
+          public void onComplete(ByteBuffer o) {
+            startServerAuthentication_result result = new startServerAuthentication_result();
+            result.success = o;
+            try {
+              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+              return;
+            } catch (Exception e) {
+              LOGGER.error("Exception writing to internal frame buffer", e);
+            }
+            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 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, startServerAuthentication_args args, org.apache.thrift.async.AsyncMethodCallback<ByteBuffer> resultHandler) throws TException {
+        iface.startServerAuthentication(args.organization,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 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, serverAuthenticate_args args, org.apache.thrift.async.AsyncMethodCallback<ServerSessionData> resultHandler) throws TException {
+        iface.serverAuthenticate(args.organizationId, args.challengeResponse,resultHandler);
+      }
+    }
+
+    public static class submitImage<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, submitImage_args, UploadData> {
+      public submitImage() {
+        super("submitImage");
+      }
+
+      public submitImage_args getEmptyArgsInstance() {
+        return new submitImage_args();
+      }
+
+      public AsyncMethodCallback<UploadData> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+        final org.apache.thrift.AsyncProcessFunction fcall = this;
+        return new AsyncMethodCallback<UploadData>() { 
+          public void onComplete(UploadData 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<UploadData> 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, DownloadData> {
+      public getImage() {
+        super("getImage");
+      }
+
+      public getImage_args getEmptyArgsInstance() {
+        return new getImage_args();
+      }
+
+      public AsyncMethodCallback<DownloadData> getResultHandler(final AsyncFrameBuffer fb, final int seqid) {
+        final org.apache.thrift.AsyncProcessFunction fcall = this;
+        return new AsyncMethodCallback<DownloadData>() { 
+          public void onComplete(DownloadData 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<DownloadData> resultHandler) throws TException {
+        iface.getImage(args.serverSessionId, args.uuid,resultHandler);
+      }
+    }
+
+    public static class publishUser<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, publishUser_args, Boolean> {
+      public publishUser() {
+        super("publishUser");
+      }
+
+      public publishUser_args getEmptyArgsInstance() {
+        return new publishUser_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) {
+            publishUser_result result = new publishUser_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;
+            publishUser_result result = new publishUser_result();
+            if (e instanceof AuthorizationException) {
+                        result.failure = (AuthorizationException) 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, publishUser_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
+        iface.publishUser(args.serverSessionId, args.user,resultHandler);
+      }
+    }
+
+    public static class registerSatellite<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, registerSatellite_args, Boolean> {
+      public registerSatellite() {
+        super("registerSatellite");
+      }
+
+      public registerSatellite_args getEmptyArgsInstance() {
+        return new registerSatellite_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) {
+            registerSatellite_result result = new registerSatellite_result();
+            result.success = o;
+            result.setSuccessIsSet(true);
+            try {
+              fcall.sendResponse(fb,result, org.apache.thrift.protocol.TMessageType.REPLY,seqid);
+              return;
+            } catch (Exception e) {
+              LOGGER.error("Exception writing to internal frame buffer", e);
+            }
+            fb.close();
+          }
+          public void onError(Exception e) {
+            byte msgType = org.apache.thrift.protocol.TMessageType.REPLY;
+            org.apache.thrift.TBase msg;
+            registerSatellite_result result = new registerSatellite_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, registerSatellite_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
+        iface.registerSatellite(args.organizationId, args.address, args.modulus, args.exponent,resultHandler);
+      }
+    }
+
+    public static class updateSatelliteAddress<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, updateSatelliteAddress_args, Boolean> {
+      public updateSatelliteAddress() {
+        super("updateSatelliteAddress");
+      }
+
+      public updateSatelliteAddress_args getEmptyArgsInstance() {
+        return new updateSatelliteAddress_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) {
+            updateSatelliteAddress_result result = new updateSatelliteAddress_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;
+            updateSatelliteAddress_result result = new updateSatelliteAddress_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, updateSatelliteAddress_args args, org.apache.thrift.async.AsyncMethodCallback<Boolean> resultHandler) throws TException {
+        iface.updateSatelliteAddress(args.serverSessionId, args.address,resultHandler);
+      }
+    }
+
+    public static class addSession<I extends AsyncIface> extends org.apache.thrift.AsyncProcessFunction<I, addSession_args, ServerSessionData> {
+      public addSession() {
+        super("addSession");
+      }
+
+      public addSession_args getEmptyArgsInstance() {
+        return new addSession_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) {
+            addSession_result result = new addSession_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;
+            addSession_result result = new addSession_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, addSession_args args, org.apache.thrift.async.AsyncMethodCallback<ServerSessionData> resultHandler) throws TException {
+        iface.addSession(args.localPassword, args.userInfo,resultHandler);
+      }
+    }
+
   }
 
-  public static class ping_args implements org.apache.thrift.TBase<ping_args, ping_args._Fields>, java.io.Serializable, Cloneable   {
+  public static class ping_args implements org.apache.thrift.TBase<ping_args, ping_args._Fields>, java.io.Serializable, Cloneable, Comparable<ping_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ping_args");
 
 
@@ -1476,13 +2432,13 @@ public class ImageServer {
       return 0;
     }
 
+    @Override
     public int compareTo(ping_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      ping_args typedOther = (ping_args)other;
 
       return 0;
     }
@@ -1589,7 +2545,7 @@ public class ImageServer {
 
   }
 
-  public static class ping_result implements org.apache.thrift.TBase<ping_result, ping_result._Fields>, java.io.Serializable, Cloneable   {
+  public static class ping_result implements org.apache.thrift.TBase<ping_result, ping_result._Fields>, java.io.Serializable, Cloneable, Comparable<ping_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ping_result");
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.BOOL, (short)0);
@@ -1789,20 +2745,20 @@ public class ImageServer {
       return 0;
     }
 
+    @Override
     public int compareTo(ping_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      ping_result typedOther = (ping_result)other;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetSuccess()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -1943,7 +2899,7 @@ public class ImageServer {
 
   }
 
-  public static class authenticate_args implements org.apache.thrift.TBase<authenticate_args, authenticate_args._Fields>, java.io.Serializable, Cloneable   {
+  public static class authenticate_args implements org.apache.thrift.TBase<authenticate_args, authenticate_args._Fields>, java.io.Serializable, Cloneable, Comparable<authenticate_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("authenticate_args");
 
     private static final org.apache.thrift.protocol.TField LOGIN_FIELD_DESC = new org.apache.thrift.protocol.TField("login", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -2200,30 +3156,30 @@ public class ImageServer {
       return 0;
     }
 
+    @Override
     public int compareTo(authenticate_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      authenticate_args typedOther = (authenticate_args)other;
 
-      lastComparison = Boolean.valueOf(isSetLogin()).compareTo(typedOther.isSetLogin());
+      lastComparison = Boolean.valueOf(isSetLogin()).compareTo(other.isSetLogin());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetLogin()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.login, typedOther.login);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.login, other.login);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetPassword()).compareTo(typedOther.isSetPassword());
+      lastComparison = Boolean.valueOf(isSetPassword()).compareTo(other.isSetPassword());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetPassword()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.password, typedOther.password);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.password, other.password);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -2397,7 +3353,7 @@ public class ImageServer {
 
   }
 
-  public static class authenticate_result implements org.apache.thrift.TBase<authenticate_result, authenticate_result._Fields>, java.io.Serializable, Cloneable   {
+  public static class authenticate_result implements org.apache.thrift.TBase<authenticate_result, authenticate_result._Fields>, java.io.Serializable, Cloneable, Comparable<authenticate_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("authenticate_result");
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0);
@@ -2654,30 +3610,30 @@ public class ImageServer {
       return 0;
     }
 
+    @Override
     public int compareTo(authenticate_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      authenticate_result typedOther = (authenticate_result)other;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetSuccess()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(typedOther.isSetFailure());
+      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetFailure()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, typedOther.failure);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, other.failure);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -2858,7 +3814,7 @@ public class ImageServer {
 
   }
 
-  public static class getOrganizations_args implements org.apache.thrift.TBase<getOrganizations_args, getOrganizations_args._Fields>, java.io.Serializable, Cloneable   {
+  public static class getOrganizations_args implements org.apache.thrift.TBase<getOrganizations_args, getOrganizations_args._Fields>, java.io.Serializable, Cloneable, Comparable<getOrganizations_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getOrganizations_args");
 
 
@@ -2991,13 +3947,13 @@ public class ImageServer {
       return 0;
     }
 
+    @Override
     public int compareTo(getOrganizations_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      getOrganizations_args typedOther = (getOrganizations_args)other;
 
       return 0;
     }
@@ -3104,7 +4060,7 @@ public class ImageServer {
 
   }
 
-  public static class getOrganizations_result implements org.apache.thrift.TBase<getOrganizations_result, getOrganizations_result._Fields>, java.io.Serializable, Cloneable   {
+  public static class getOrganizations_result implements org.apache.thrift.TBase<getOrganizations_result, getOrganizations_result._Fields>, java.io.Serializable, Cloneable, Comparable<getOrganizations_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getOrganizations_result");
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0);
@@ -3201,7 +4157,7 @@ public class ImageServer {
      */
     public getOrganizations_result(getOrganizations_result other) {
       if (other.isSetSuccess()) {
-        List<OrganizationData> __this__success = new ArrayList<OrganizationData>();
+        List<OrganizationData> __this__success = new ArrayList<OrganizationData>(other.success.size());
         for (OrganizationData other_element : other.success) {
           __this__success.add(new OrganizationData(other_element));
         }
@@ -3322,20 +4278,20 @@ public class ImageServer {
       return 0;
     }
 
+    @Override
     public int compareTo(getOrganizations_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      getOrganizations_result typedOther = (getOrganizations_result)other;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetSuccess()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -3417,7 +4373,7 @@ public class ImageServer {
                   struct.success = new ArrayList<OrganizationData>(_list16.size);
                   for (int _i17 = 0; _i17 < _list16.size; ++_i17)
                   {
-                    OrganizationData _elem18; // required
+                    OrganizationData _elem18;
                     _elem18 = new OrganizationData();
                     _elem18.read(iprot);
                     struct.success.add(_elem18);
@@ -3499,7 +4455,7 @@ public class ImageServer {
             struct.success = new ArrayList<OrganizationData>(_list21.size);
             for (int _i22 = 0; _i22 < _list21.size; ++_i22)
             {
-              OrganizationData _elem23; // required
+              OrganizationData _elem23;
               _elem23 = new OrganizationData();
               _elem23.read(iprot);
               struct.success.add(_elem23);
@@ -3512,7 +4468,7 @@ public class ImageServer {
 
   }
 
-  public static class findUser_args implements org.apache.thrift.TBase<findUser_args, findUser_args._Fields>, java.io.Serializable, Cloneable   {
+  public static class findUser_args implements org.apache.thrift.TBase<findUser_args, findUser_args._Fields>, java.io.Serializable, Cloneable, Comparable<findUser_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("findUser_args");
 
     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);
@@ -3828,40 +4784,40 @@ public class ImageServer {
       return 0;
     }
 
+    @Override
     public int compareTo(findUser_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      findUser_args typedOther = (findUser_args)other;
 
-      lastComparison = Boolean.valueOf(isSetSessionId()).compareTo(typedOther.isSetSessionId());
+      lastComparison = Boolean.valueOf(isSetSessionId()).compareTo(other.isSetSessionId());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetSessionId()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sessionId, typedOther.sessionId);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sessionId, other.sessionId);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetOrganizationId()).compareTo(typedOther.isSetOrganizationId());
+      lastComparison = Boolean.valueOf(isSetOrganizationId()).compareTo(other.isSetOrganizationId());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetOrganizationId()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.organizationId, typedOther.organizationId);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.organizationId, other.organizationId);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetSearchTerm()).compareTo(typedOther.isSetSearchTerm());
+      lastComparison = Boolean.valueOf(isSetSearchTerm()).compareTo(other.isSetSearchTerm());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetSearchTerm()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.searchTerm, typedOther.searchTerm);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.searchTerm, other.searchTerm);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -4066,7 +5022,7 @@ public class ImageServer {
 
   }
 
-  public static class findUser_result implements org.apache.thrift.TBase<findUser_result, findUser_result._Fields>, java.io.Serializable, Cloneable   {
+  public static class findUser_result implements org.apache.thrift.TBase<findUser_result, findUser_result._Fields>, java.io.Serializable, Cloneable, Comparable<findUser_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("findUser_result");
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0);
@@ -4172,7 +5128,7 @@ public class ImageServer {
      */
     public findUser_result(findUser_result other) {
       if (other.isSetSuccess()) {
-        List<UserInfo> __this__success = new ArrayList<UserInfo>();
+        List<UserInfo> __this__success = new ArrayList<UserInfo>(other.success.size());
         for (UserInfo other_element : other.success) {
           __this__success.add(new UserInfo(other_element));
         }
@@ -4343,30 +5299,30 @@ public class ImageServer {
       return 0;
     }
 
+    @Override
     public int compareTo(findUser_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      findUser_result typedOther = (findUser_result)other;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetSuccess()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(typedOther.isSetFailure());
+      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetFailure()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, typedOther.failure);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, other.failure);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -4456,7 +5412,7 @@ public class ImageServer {
                   struct.success = new ArrayList<UserInfo>(_list24.size);
                   for (int _i25 = 0; _i25 < _list24.size; ++_i25)
                   {
-                    UserInfo _elem26; // required
+                    UserInfo _elem26;
                     _elem26 = new UserInfo();
                     _elem26.read(iprot);
                     struct.success.add(_elem26);
@@ -4558,7 +5514,7 @@ public class ImageServer {
             struct.success = new ArrayList<UserInfo>(_list29.size);
             for (int _i30 = 0; _i30 < _list29.size; ++_i30)
             {
-              UserInfo _elem31; // required
+              UserInfo _elem31;
               _elem31 = new UserInfo();
               _elem31.read(iprot);
               struct.success.add(_elem31);
@@ -4576,7 +5532,7 @@ public class ImageServer {
 
   }
 
-  public static class getPublicImages_args implements org.apache.thrift.TBase<getPublicImages_args, getPublicImages_args._Fields>, java.io.Serializable, Cloneable   {
+  public static class getPublicImages_args implements org.apache.thrift.TBase<getPublicImages_args, getPublicImages_args._Fields>, java.io.Serializable, Cloneable, Comparable<getPublicImages_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getPublicImages_args");
 
     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);
@@ -4835,30 +5791,30 @@ public class ImageServer {
       return 0;
     }
 
+    @Override
     public int compareTo(getPublicImages_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      getPublicImages_args typedOther = (getPublicImages_args)other;
 
-      lastComparison = Boolean.valueOf(isSetSessionId()).compareTo(typedOther.isSetSessionId());
+      lastComparison = Boolean.valueOf(isSetSessionId()).compareTo(other.isSetSessionId());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetSessionId()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sessionId, typedOther.sessionId);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sessionId, other.sessionId);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetPage()).compareTo(typedOther.isSetPage());
+      lastComparison = Boolean.valueOf(isSetPage()).compareTo(other.isSetPage());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetPage()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.page, typedOther.page);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.page, other.page);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -5028,7 +5984,7 @@ public class ImageServer {
 
   }
 
-  public static class getPublicImages_result implements org.apache.thrift.TBase<getPublicImages_result, getPublicImages_result._Fields>, java.io.Serializable, Cloneable   {
+  public static class getPublicImages_result implements org.apache.thrift.TBase<getPublicImages_result, getPublicImages_result._Fields>, java.io.Serializable, Cloneable, Comparable<getPublicImages_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getPublicImages_result");
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.LIST, (short)0);
@@ -5134,7 +6090,7 @@ public class ImageServer {
      */
     public getPublicImages_result(getPublicImages_result other) {
       if (other.isSetSuccess()) {
-        List<ImageData> __this__success = new ArrayList<ImageData>();
+        List<ImageData> __this__success = new ArrayList<ImageData>(other.success.size());
         for (ImageData other_element : other.success) {
           __this__success.add(new ImageData(other_element));
         }
@@ -5305,30 +6261,30 @@ public class ImageServer {
       return 0;
     }
 
+    @Override
     public int compareTo(getPublicImages_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      getPublicImages_result typedOther = (getPublicImages_result)other;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetSuccess()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(typedOther.isSetFailure());
+      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetFailure()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, typedOther.failure);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, other.failure);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -5418,7 +6374,7 @@ public class ImageServer {
                   struct.success = new ArrayList<ImageData>(_list32.size);
                   for (int _i33 = 0; _i33 < _list32.size; ++_i33)
                   {
-                    ImageData _elem34; // required
+                    ImageData _elem34;
                     _elem34 = new ImageData();
                     _elem34.read(iprot);
                     struct.success.add(_elem34);
@@ -5520,7 +6476,7 @@ public class ImageServer {
             struct.success = new ArrayList<ImageData>(_list37.size);
             for (int _i38 = 0; _i38 < _list37.size; ++_i38)
             {
-              ImageData _elem39; // required
+              ImageData _elem39;
               _elem39 = new ImageData();
               _elem39.read(iprot);
               struct.success.add(_elem39);
@@ -5538,7 +6494,7 @@ public class ImageServer {
 
   }
 
-  public static class getUserFromToken_args implements org.apache.thrift.TBase<getUserFromToken_args, getUserFromToken_args._Fields>, java.io.Serializable, Cloneable   {
+  public static class getUserFromToken_args implements org.apache.thrift.TBase<getUserFromToken_args, getUserFromToken_args._Fields>, java.io.Serializable, Cloneable, Comparable<getUserFromToken_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getUserFromToken_args");
 
     private static final org.apache.thrift.protocol.TField TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -5736,20 +6692,20 @@ public class ImageServer {
       return 0;
     }
 
+    @Override
     public int compareTo(getUserFromToken_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      getUserFromToken_args typedOther = (getUserFromToken_args)other;
 
-      lastComparison = Boolean.valueOf(isSetToken()).compareTo(typedOther.isSetToken());
+      lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetToken()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, typedOther.token);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -5892,7 +6848,7 @@ public class ImageServer {
 
   }
 
-  public static class getUserFromToken_result implements org.apache.thrift.TBase<getUserFromToken_result, getUserFromToken_result._Fields>, java.io.Serializable, Cloneable   {
+  public static class getUserFromToken_result implements org.apache.thrift.TBase<getUserFromToken_result, getUserFromToken_result._Fields>, java.io.Serializable, Cloneable, Comparable<getUserFromToken_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getUserFromToken_result");
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0);
@@ -6149,30 +7105,30 @@ public class ImageServer {
       return 0;
     }
 
+    @Override
     public int compareTo(getUserFromToken_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      getUserFromToken_result typedOther = (getUserFromToken_result)other;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetSuccess()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(typedOther.isSetFailure());
+      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetFailure()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, typedOther.failure);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, other.failure);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -6353,7 +7309,7 @@ public class ImageServer {
 
   }
 
-  public static class isServerAuthenticated_args implements org.apache.thrift.TBase<isServerAuthenticated_args, isServerAuthenticated_args._Fields>, java.io.Serializable, Cloneable   {
+  public static class isServerAuthenticated_args implements org.apache.thrift.TBase<isServerAuthenticated_args, isServerAuthenticated_args._Fields>, java.io.Serializable, Cloneable, Comparable<isServerAuthenticated_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("isServerAuthenticated_args");
 
     private static final org.apache.thrift.protocol.TField SERVER_SESSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("serverSessionId", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -6551,20 +7507,20 @@ public class ImageServer {
       return 0;
     }
 
+    @Override
     public int compareTo(isServerAuthenticated_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      isServerAuthenticated_args typedOther = (isServerAuthenticated_args)other;
 
-      lastComparison = Boolean.valueOf(isSetServerSessionId()).compareTo(typedOther.isSetServerSessionId());
+      lastComparison = Boolean.valueOf(isSetServerSessionId()).compareTo(other.isSetServerSessionId());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetServerSessionId()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverSessionId, typedOther.serverSessionId);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverSessionId, other.serverSessionId);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -6707,7 +7663,7 @@ public class ImageServer {
 
   }
 
-  public static class isServerAuthenticated_result implements org.apache.thrift.TBase<isServerAuthenticated_result, isServerAuthenticated_result._Fields>, java.io.Serializable, Cloneable   {
+  public static class isServerAuthenticated_result implements org.apache.thrift.TBase<isServerAuthenticated_result, isServerAuthenticated_result._Fields>, java.io.Serializable, Cloneable, Comparable<isServerAuthenticated_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("isServerAuthenticated_result");
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.BOOL, (short)0);
@@ -6907,20 +7863,20 @@ public class ImageServer {
       return 0;
     }
 
+    @Override
     public int compareTo(isServerAuthenticated_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      isServerAuthenticated_result typedOther = (isServerAuthenticated_result)other;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetSuccess()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -7061,7 +8017,7 @@ public class ImageServer {
 
   }
 
-  public static class startServerAuthentication_args implements org.apache.thrift.TBase<startServerAuthentication_args, startServerAuthentication_args._Fields>, java.io.Serializable, Cloneable   {
+  public static class startServerAuthentication_args implements org.apache.thrift.TBase<startServerAuthentication_args, startServerAuthentication_args._Fields>, java.io.Serializable, Cloneable, Comparable<startServerAuthentication_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("startServerAuthentication_args");
 
     private static final org.apache.thrift.protocol.TField ORGANIZATION_FIELD_DESC = new org.apache.thrift.protocol.TField("organization", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -7259,20 +8215,20 @@ public class ImageServer {
       return 0;
     }
 
+    @Override
     public int compareTo(startServerAuthentication_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      startServerAuthentication_args typedOther = (startServerAuthentication_args)other;
 
-      lastComparison = Boolean.valueOf(isSetOrganization()).compareTo(typedOther.isSetOrganization());
+      lastComparison = Boolean.valueOf(isSetOrganization()).compareTo(other.isSetOrganization());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetOrganization()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.organization, typedOther.organization);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.organization, other.organization);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -7415,7 +8371,7 @@ public class ImageServer {
 
   }
 
-  public static class startServerAuthentication_result implements org.apache.thrift.TBase<startServerAuthentication_result, startServerAuthentication_result._Fields>, java.io.Serializable, Cloneable   {
+  public static class startServerAuthentication_result implements org.apache.thrift.TBase<startServerAuthentication_result, startServerAuthentication_result._Fields>, java.io.Serializable, Cloneable, Comparable<startServerAuthentication_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("startServerAuthentication_result");
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRING, (short)0);
@@ -7683,30 +8639,30 @@ public class ImageServer {
       return 0;
     }
 
+    @Override
     public int compareTo(startServerAuthentication_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      startServerAuthentication_result typedOther = (startServerAuthentication_result)other;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetSuccess()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(typedOther.isSetFailure());
+      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetFailure()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, typedOther.failure);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, other.failure);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -7882,7 +8838,7 @@ public class ImageServer {
 
   }
 
-  public static class serverAuthenticate_args implements org.apache.thrift.TBase<serverAuthenticate_args, serverAuthenticate_args._Fields>, java.io.Serializable, Cloneable   {
+  public static class serverAuthenticate_args implements org.apache.thrift.TBase<serverAuthenticate_args, serverAuthenticate_args._Fields>, java.io.Serializable, Cloneable, Comparable<serverAuthenticate_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("serverAuthenticate_args");
 
     private static final org.apache.thrift.protocol.TField ORGANIZATION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("organizationId", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -8150,30 +9106,30 @@ public class ImageServer {
       return 0;
     }
 
+    @Override
     public int compareTo(serverAuthenticate_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      serverAuthenticate_args typedOther = (serverAuthenticate_args)other;
 
-      lastComparison = Boolean.valueOf(isSetOrganizationId()).compareTo(typedOther.isSetOrganizationId());
+      lastComparison = Boolean.valueOf(isSetOrganizationId()).compareTo(other.isSetOrganizationId());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetOrganizationId()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.organizationId, typedOther.organizationId);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.organizationId, other.organizationId);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetChallengeResponse()).compareTo(typedOther.isSetChallengeResponse());
+      lastComparison = Boolean.valueOf(isSetChallengeResponse()).compareTo(other.isSetChallengeResponse());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetChallengeResponse()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.challengeResponse, typedOther.challengeResponse);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.challengeResponse, other.challengeResponse);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -8347,7 +9303,7 @@ public class ImageServer {
 
   }
 
-  public static class serverAuthenticate_result implements org.apache.thrift.TBase<serverAuthenticate_result, serverAuthenticate_result._Fields>, java.io.Serializable, Cloneable   {
+  public static class serverAuthenticate_result implements org.apache.thrift.TBase<serverAuthenticate_result, serverAuthenticate_result._Fields>, java.io.Serializable, Cloneable, Comparable<serverAuthenticate_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("serverAuthenticate_result");
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0);
@@ -8604,30 +9560,30 @@ public class ImageServer {
       return 0;
     }
 
+    @Override
     public int compareTo(serverAuthenticate_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      serverAuthenticate_result typedOther = (serverAuthenticate_result)other;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetSuccess()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(typedOther.isSetFailure());
+      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetFailure()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, typedOther.failure);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, other.failure);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -8808,7 +9764,7 @@ public class ImageServer {
 
   }
 
-  public static class submitImage_args implements org.apache.thrift.TBase<submitImage_args, submitImage_args._Fields>, java.io.Serializable, Cloneable   {
+  public static class submitImage_args implements org.apache.thrift.TBase<submitImage_args, submitImage_args._Fields>, java.io.Serializable, Cloneable, Comparable<submitImage_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("submitImage_args");
 
     private static final org.apache.thrift.protocol.TField SERVER_SESSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("serverSessionId", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -8929,10 +9885,7 @@ public class ImageServer {
         this.imageDescription = new ImageData(other.imageDescription);
       }
       if (other.isSetCrcSums()) {
-        List<Integer> __this__crcSums = new ArrayList<Integer>();
-        for (Integer other_element : other.crcSums) {
-          __this__crcSums.add(other_element);
-        }
+        List<Integer> __this__crcSums = new ArrayList<Integer>(other.crcSums);
         this.crcSums = __this__crcSums;
       }
     }
@@ -9144,40 +10097,40 @@ public class ImageServer {
       return 0;
     }
 
+    @Override
     public int compareTo(submitImage_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      submitImage_args typedOther = (submitImage_args)other;
 
-      lastComparison = Boolean.valueOf(isSetServerSessionId()).compareTo(typedOther.isSetServerSessionId());
+      lastComparison = Boolean.valueOf(isSetServerSessionId()).compareTo(other.isSetServerSessionId());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetServerSessionId()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverSessionId, typedOther.serverSessionId);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverSessionId, other.serverSessionId);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetImageDescription()).compareTo(typedOther.isSetImageDescription());
+      lastComparison = Boolean.valueOf(isSetImageDescription()).compareTo(other.isSetImageDescription());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetImageDescription()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imageDescription, typedOther.imageDescription);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.imageDescription, other.imageDescription);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetCrcSums()).compareTo(typedOther.isSetCrcSums());
+      lastComparison = Boolean.valueOf(isSetCrcSums()).compareTo(other.isSetCrcSums());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetCrcSums()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.crcSums, typedOther.crcSums);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.crcSums, other.crcSums);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -9295,7 +10248,7 @@ public class ImageServer {
                   struct.crcSums = new ArrayList<Integer>(_list40.size);
                   for (int _i41 = 0; _i41 < _list40.size; ++_i41)
                   {
-                    int _elem42; // required
+                    int _elem42;
                     _elem42 = iprot.readI32();
                     struct.crcSums.add(_elem42);
                   }
@@ -9407,7 +10360,7 @@ public class ImageServer {
             struct.crcSums = new ArrayList<Integer>(_list45.size);
             for (int _i46 = 0; _i46 < _list45.size; ++_i46)
             {
-              int _elem47; // required
+              int _elem47;
               _elem47 = iprot.readI32();
               struct.crcSums.add(_elem47);
             }
@@ -9419,7 +10372,7 @@ public class ImageServer {
 
   }
 
-  public static class submitImage_result implements org.apache.thrift.TBase<submitImage_result, submitImage_result._Fields>, java.io.Serializable, Cloneable   {
+  public static class submitImage_result implements org.apache.thrift.TBase<submitImage_result, submitImage_result._Fields>, java.io.Serializable, Cloneable, Comparable<submitImage_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("submitImage_result");
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0);
@@ -9794,50 +10747,50 @@ public class ImageServer {
       return 0;
     }
 
+    @Override
     public int compareTo(submitImage_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      submitImage_result typedOther = (submitImage_result)other;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetSuccess()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(typedOther.isSetFailure());
+      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetFailure()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, typedOther.failure);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, other.failure);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFailure2()).compareTo(typedOther.isSetFailure2());
+      lastComparison = Boolean.valueOf(isSetFailure2()).compareTo(other.isSetFailure2());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetFailure2()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure2, typedOther.failure2);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure2, other.failure2);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFailure3()).compareTo(typedOther.isSetFailure3());
+      lastComparison = Boolean.valueOf(isSetFailure3()).compareTo(other.isSetFailure3());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetFailure3()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure3, typedOther.failure3);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure3, other.failure3);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -10084,7 +11037,7 @@ public class ImageServer {
 
   }
 
-  public static class getImage_args implements org.apache.thrift.TBase<getImage_args, getImage_args._Fields>, java.io.Serializable, Cloneable   {
+  public static class getImage_args implements org.apache.thrift.TBase<getImage_args, getImage_args._Fields>, java.io.Serializable, Cloneable, Comparable<getImage_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getImage_args");
 
     private static final org.apache.thrift.protocol.TField SERVER_SESSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("serverSessionId", org.apache.thrift.protocol.TType.STRING, (short)2);
@@ -10341,30 +11294,30 @@ public class ImageServer {
       return 0;
     }
 
+    @Override
     public int compareTo(getImage_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      getImage_args typedOther = (getImage_args)other;
 
-      lastComparison = Boolean.valueOf(isSetServerSessionId()).compareTo(typedOther.isSetServerSessionId());
+      lastComparison = Boolean.valueOf(isSetServerSessionId()).compareTo(other.isSetServerSessionId());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetServerSessionId()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverSessionId, typedOther.serverSessionId);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverSessionId, other.serverSessionId);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetUuid()).compareTo(typedOther.isSetUuid());
+      lastComparison = Boolean.valueOf(isSetUuid()).compareTo(other.isSetUuid());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetUuid()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.uuid, typedOther.uuid);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.uuid, other.uuid);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -10538,7 +11491,7 @@ public class ImageServer {
 
   }
 
-  public static class getImage_result implements org.apache.thrift.TBase<getImage_result, getImage_result._Fields>, java.io.Serializable, Cloneable   {
+  public static class getImage_result implements org.apache.thrift.TBase<getImage_result, getImage_result._Fields>, java.io.Serializable, Cloneable, Comparable<getImage_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("getImage_result");
 
     private static final org.apache.thrift.protocol.TField SUCCESS_FIELD_DESC = new org.apache.thrift.protocol.TField("success", org.apache.thrift.protocol.TType.STRUCT, (short)0);
@@ -10854,40 +11807,40 @@ public class ImageServer {
       return 0;
     }
 
+    @Override
     public int compareTo(getImage_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      getImage_result typedOther = (getImage_result)other;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetSuccess()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(typedOther.isSetFailure());
+      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetFailure()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, typedOther.failure);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, other.failure);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFailure2()).compareTo(typedOther.isSetFailure2());
+      lastComparison = Boolean.valueOf(isSetFailure2()).compareTo(other.isSetFailure2());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetFailure2()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure2, typedOther.failure2);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure2, other.failure2);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -11101,7 +12054,7 @@ public class ImageServer {
 
   }
 
-  public static class publishUser_args implements org.apache.thrift.TBase<publishUser_args, publishUser_args._Fields>, java.io.Serializable, Cloneable   {
+  public static class publishUser_args implements org.apache.thrift.TBase<publishUser_args, publishUser_args._Fields>, java.io.Serializable, Cloneable, Comparable<publishUser_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("publishUser_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);
@@ -11358,30 +12311,30 @@ public class ImageServer {
       return 0;
     }
 
+    @Override
     public int compareTo(publishUser_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      publishUser_args typedOther = (publishUser_args)other;
 
-      lastComparison = Boolean.valueOf(isSetServerSessionId()).compareTo(typedOther.isSetServerSessionId());
+      lastComparison = Boolean.valueOf(isSetServerSessionId()).compareTo(other.isSetServerSessionId());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetServerSessionId()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverSessionId, typedOther.serverSessionId);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverSessionId, other.serverSessionId);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetUser()).compareTo(typedOther.isSetUser());
+      lastComparison = Boolean.valueOf(isSetUser()).compareTo(other.isSetUser());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetUser()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.user, typedOther.user);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.user, other.user);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -11560,7 +12513,7 @@ public class ImageServer {
 
   }
 
-  public static class publishUser_result implements org.apache.thrift.TBase<publishUser_result, publishUser_result._Fields>, java.io.Serializable, Cloneable   {
+  public static class publishUser_result implements org.apache.thrift.TBase<publishUser_result, publishUser_result._Fields>, java.io.Serializable, Cloneable, Comparable<publishUser_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("publishUser_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);
@@ -11819,30 +12772,30 @@ public class ImageServer {
       return 0;
     }
 
+    @Override
     public int compareTo(publishUser_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      publishUser_result typedOther = (publishUser_result)other;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetSuccess()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(typedOther.isSetFailure());
+      lastComparison = Boolean.valueOf(isSetFailure()).compareTo(other.isSetFailure());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetFailure()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, typedOther.failure);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.failure, other.failure);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -12016,7 +12969,7 @@ public class ImageServer {
 
   }
 
-  public static class registerSatellite_args implements org.apache.thrift.TBase<registerSatellite_args, registerSatellite_args._Fields>, java.io.Serializable, Cloneable   {
+  public static class registerSatellite_args implements org.apache.thrift.TBase<registerSatellite_args, registerSatellite_args._Fields>, java.io.Serializable, Cloneable, Comparable<registerSatellite_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("registerSatellite_args");
 
     private static final org.apache.thrift.protocol.TField ORGANIZATION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("organizationId", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -12391,50 +13344,50 @@ public class ImageServer {
       return 0;
     }
 
+    @Override
     public int compareTo(registerSatellite_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      registerSatellite_args typedOther = (registerSatellite_args)other;
 
-      lastComparison = Boolean.valueOf(isSetOrganizationId()).compareTo(typedOther.isSetOrganizationId());
+      lastComparison = Boolean.valueOf(isSetOrganizationId()).compareTo(other.isSetOrganizationId());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetOrganizationId()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.organizationId, typedOther.organizationId);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.organizationId, other.organizationId);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetAddress()).compareTo(typedOther.isSetAddress());
+      lastComparison = Boolean.valueOf(isSetAddress()).compareTo(other.isSetAddress());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetAddress()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.address, typedOther.address);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.address, other.address);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetModulus()).compareTo(typedOther.isSetModulus());
+      lastComparison = Boolean.valueOf(isSetModulus()).compareTo(other.isSetModulus());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetModulus()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.modulus, typedOther.modulus);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.modulus, other.modulus);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetExponent()).compareTo(typedOther.isSetExponent());
+      lastComparison = Boolean.valueOf(isSetExponent()).compareTo(other.isSetExponent());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetExponent()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.exponent, typedOther.exponent);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.exponent, other.exponent);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -12670,7 +13623,7 @@ public class ImageServer {
 
   }
 
-  public static class registerSatellite_result implements org.apache.thrift.TBase<registerSatellite_result, registerSatellite_result._Fields>, java.io.Serializable, Cloneable   {
+  public static class registerSatellite_result implements org.apache.thrift.TBase<registerSatellite_result, registerSatellite_result._Fields>, java.io.Serializable, Cloneable, Comparable<registerSatellite_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("registerSatellite_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);
@@ -12870,20 +13823,20 @@ public class ImageServer {
       return 0;
     }
 
+    @Override
     public int compareTo(registerSatellite_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      registerSatellite_result typedOther = (registerSatellite_result)other;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetSuccess()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -13024,7 +13977,7 @@ public class ImageServer {
 
   }
 
-  public static class updateSatelliteAddress_args implements org.apache.thrift.TBase<updateSatelliteAddress_args, updateSatelliteAddress_args._Fields>, java.io.Serializable, Cloneable   {
+  public static class updateSatelliteAddress_args implements org.apache.thrift.TBase<updateSatelliteAddress_args, updateSatelliteAddress_args._Fields>, java.io.Serializable, Cloneable, Comparable<updateSatelliteAddress_args>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("updateSatelliteAddress_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);
@@ -13281,30 +14234,30 @@ public class ImageServer {
       return 0;
     }
 
+    @Override
     public int compareTo(updateSatelliteAddress_args other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      updateSatelliteAddress_args typedOther = (updateSatelliteAddress_args)other;
 
-      lastComparison = Boolean.valueOf(isSetServerSessionId()).compareTo(typedOther.isSetServerSessionId());
+      lastComparison = Boolean.valueOf(isSetServerSessionId()).compareTo(other.isSetServerSessionId());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetServerSessionId()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverSessionId, typedOther.serverSessionId);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverSessionId, other.serverSessionId);
         if (lastComparison != 0) {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetAddress()).compareTo(typedOther.isSetAddress());
+      lastComparison = Boolean.valueOf(isSetAddress()).compareTo(other.isSetAddress());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetAddress()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.address, typedOther.address);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.address, other.address);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -13478,7 +14431,7 @@ public class ImageServer {
 
   }
 
-  public static class updateSatelliteAddress_result implements org.apache.thrift.TBase<updateSatelliteAddress_result, updateSatelliteAddress_result._Fields>, java.io.Serializable, Cloneable   {
+  public static class updateSatelliteAddress_result implements org.apache.thrift.TBase<updateSatelliteAddress_result, updateSatelliteAddress_result._Fields>, java.io.Serializable, Cloneable, Comparable<updateSatelliteAddress_result>   {
     private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("updateSatelliteAddress_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);
@@ -13678,20 +14631,20 @@ public class ImageServer {
       return 0;
     }
 
+    @Override
     public int compareTo(updateSatelliteAddress_result other) {
       if (!getClass().equals(other.getClass())) {
         return getClass().getName().compareTo(other.getClass().getName());
       }
 
       int lastComparison = 0;
-      updateSatelliteAddress_result typedOther = (updateSatelliteAddress_result)other;
 
-      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(typedOther.isSetSuccess());
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
       if (lastComparison != 0) {
         return lastComparison;
       }
       if (isSetSuccess()) {
-        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, typedOther.success);
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -13832,4 +14785,822 @@ public class ImageServer {
 
   }
 
+  public static class addSession_args implements org.apache.thrift.TBase<addSession_args, addSession_args._Fields>, java.io.Serializable, Cloneable, Comparable<addSession_args>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("addSession_args");
+
+    private static final org.apache.thrift.protocol.TField LOCAL_PASSWORD_FIELD_DESC = new org.apache.thrift.protocol.TField("localPassword", org.apache.thrift.protocol.TType.STRING, (short)1);
+    private static final org.apache.thrift.protocol.TField USER_INFO_FIELD_DESC = new org.apache.thrift.protocol.TField("userInfo", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+
+    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+    static {
+      schemes.put(StandardScheme.class, new addSession_argsStandardSchemeFactory());
+      schemes.put(TupleScheme.class, new addSession_argsTupleSchemeFactory());
+    }
+
+    public String localPassword; // required
+    public UserInfo userInfo; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      LOCAL_PASSWORD((short)1, "localPassword"),
+      USER_INFO((short)2, "userInfo");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 1: // LOCAL_PASSWORD
+            return LOCAL_PASSWORD;
+          case 2: // USER_INFO
+            return USER_INFO;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.LOCAL_PASSWORD, new org.apache.thrift.meta_data.FieldMetaData("localPassword", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
+      tmpMap.put(_Fields.USER_INFO, new org.apache.thrift.meta_data.FieldMetaData("userInfo", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, UserInfo.class)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(addSession_args.class, metaDataMap);
+    }
+
+    public addSession_args() {
+    }
+
+    public addSession_args(
+      String localPassword,
+      UserInfo userInfo)
+    {
+      this();
+      this.localPassword = localPassword;
+      this.userInfo = userInfo;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public addSession_args(addSession_args other) {
+      if (other.isSetLocalPassword()) {
+        this.localPassword = other.localPassword;
+      }
+      if (other.isSetUserInfo()) {
+        this.userInfo = new UserInfo(other.userInfo);
+      }
+    }
+
+    public addSession_args deepCopy() {
+      return new addSession_args(this);
+    }
+
+    @Override
+    public void clear() {
+      this.localPassword = null;
+      this.userInfo = null;
+    }
+
+    public String getLocalPassword() {
+      return this.localPassword;
+    }
+
+    public addSession_args setLocalPassword(String localPassword) {
+      this.localPassword = localPassword;
+      return this;
+    }
+
+    public void unsetLocalPassword() {
+      this.localPassword = null;
+    }
+
+    /** Returns true if field localPassword is set (has been assigned a value) and false otherwise */
+    public boolean isSetLocalPassword() {
+      return this.localPassword != null;
+    }
+
+    public void setLocalPasswordIsSet(boolean value) {
+      if (!value) {
+        this.localPassword = null;
+      }
+    }
+
+    public UserInfo getUserInfo() {
+      return this.userInfo;
+    }
+
+    public addSession_args setUserInfo(UserInfo userInfo) {
+      this.userInfo = userInfo;
+      return this;
+    }
+
+    public void unsetUserInfo() {
+      this.userInfo = null;
+    }
+
+    /** Returns true if field userInfo is set (has been assigned a value) and false otherwise */
+    public boolean isSetUserInfo() {
+      return this.userInfo != null;
+    }
+
+    public void setUserInfoIsSet(boolean value) {
+      if (!value) {
+        this.userInfo = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case LOCAL_PASSWORD:
+        if (value == null) {
+          unsetLocalPassword();
+        } else {
+          setLocalPassword((String)value);
+        }
+        break;
+
+      case USER_INFO:
+        if (value == null) {
+          unsetUserInfo();
+        } else {
+          setUserInfo((UserInfo)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case LOCAL_PASSWORD:
+        return getLocalPassword();
+
+      case USER_INFO:
+        return getUserInfo();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case LOCAL_PASSWORD:
+        return isSetLocalPassword();
+      case USER_INFO:
+        return isSetUserInfo();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof addSession_args)
+        return this.equals((addSession_args)that);
+      return false;
+    }
+
+    public boolean equals(addSession_args that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_localPassword = true && this.isSetLocalPassword();
+      boolean that_present_localPassword = true && that.isSetLocalPassword();
+      if (this_present_localPassword || that_present_localPassword) {
+        if (!(this_present_localPassword && that_present_localPassword))
+          return false;
+        if (!this.localPassword.equals(that.localPassword))
+          return false;
+      }
+
+      boolean this_present_userInfo = true && this.isSetUserInfo();
+      boolean that_present_userInfo = true && that.isSetUserInfo();
+      if (this_present_userInfo || that_present_userInfo) {
+        if (!(this_present_userInfo && that_present_userInfo))
+          return false;
+        if (!this.userInfo.equals(that.userInfo))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    @Override
+    public int compareTo(addSession_args other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+
+      lastComparison = Boolean.valueOf(isSetLocalPassword()).compareTo(other.isSetLocalPassword());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetLocalPassword()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.localPassword, other.localPassword);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      lastComparison = Boolean.valueOf(isSetUserInfo()).compareTo(other.isSetUserInfo());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetUserInfo()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.userInfo, other.userInfo);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+    }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("addSession_args(");
+      boolean first = true;
+
+      sb.append("localPassword:");
+      if (this.localPassword == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.localPassword);
+      }
+      first = false;
+      if (!first) sb.append(", ");
+      sb.append("userInfo:");
+      if (this.userInfo == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.userInfo);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+      // check for sub-struct validity
+      if (userInfo != null) {
+        userInfo.validate();
+      }
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private static class addSession_argsStandardSchemeFactory implements SchemeFactory {
+      public addSession_argsStandardScheme getScheme() {
+        return new addSession_argsStandardScheme();
+      }
+    }
+
+    private static class addSession_argsStandardScheme extends StandardScheme<addSession_args> {
+
+      public void read(org.apache.thrift.protocol.TProtocol iprot, addSession_args struct) throws org.apache.thrift.TException {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+            break;
+          }
+          switch (schemeField.id) {
+            case 1: // LOCAL_PASSWORD
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+                struct.localPassword = iprot.readString();
+                struct.setLocalPasswordIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            case 2: // USER_INFO
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.userInfo = new UserInfo();
+                struct.userInfo.read(iprot);
+                struct.setUserInfoIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
+        }
+        iprot.readStructEnd();
+
+        // check for required fields of primitive type, which can't be checked in the validate method
+        struct.validate();
+      }
+
+      public void write(org.apache.thrift.protocol.TProtocol oprot, addSession_args struct) throws org.apache.thrift.TException {
+        struct.validate();
+
+        oprot.writeStructBegin(STRUCT_DESC);
+        if (struct.localPassword != null) {
+          oprot.writeFieldBegin(LOCAL_PASSWORD_FIELD_DESC);
+          oprot.writeString(struct.localPassword);
+          oprot.writeFieldEnd();
+        }
+        if (struct.userInfo != null) {
+          oprot.writeFieldBegin(USER_INFO_FIELD_DESC);
+          struct.userInfo.write(oprot);
+          oprot.writeFieldEnd();
+        }
+        oprot.writeFieldStop();
+        oprot.writeStructEnd();
+      }
+
+    }
+
+    private static class addSession_argsTupleSchemeFactory implements SchemeFactory {
+      public addSession_argsTupleScheme getScheme() {
+        return new addSession_argsTupleScheme();
+      }
+    }
+
+    private static class addSession_argsTupleScheme extends TupleScheme<addSession_args> {
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol prot, addSession_args struct) throws org.apache.thrift.TException {
+        TTupleProtocol oprot = (TTupleProtocol) prot;
+        BitSet optionals = new BitSet();
+        if (struct.isSetLocalPassword()) {
+          optionals.set(0);
+        }
+        if (struct.isSetUserInfo()) {
+          optionals.set(1);
+        }
+        oprot.writeBitSet(optionals, 2);
+        if (struct.isSetLocalPassword()) {
+          oprot.writeString(struct.localPassword);
+        }
+        if (struct.isSetUserInfo()) {
+          struct.userInfo.write(oprot);
+        }
+      }
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol prot, addSession_args struct) throws org.apache.thrift.TException {
+        TTupleProtocol iprot = (TTupleProtocol) prot;
+        BitSet incoming = iprot.readBitSet(2);
+        if (incoming.get(0)) {
+          struct.localPassword = iprot.readString();
+          struct.setLocalPasswordIsSet(true);
+        }
+        if (incoming.get(1)) {
+          struct.userInfo = new UserInfo();
+          struct.userInfo.read(iprot);
+          struct.setUserInfoIsSet(true);
+        }
+      }
+    }
+
+  }
+
+  public static class addSession_result implements org.apache.thrift.TBase<addSession_result, addSession_result._Fields>, java.io.Serializable, Cloneable, Comparable<addSession_result>   {
+    private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("addSession_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);
+
+    private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+    static {
+      schemes.put(StandardScheme.class, new addSession_resultStandardSchemeFactory());
+      schemes.put(TupleScheme.class, new addSession_resultTupleSchemeFactory());
+    }
+
+    public ServerSessionData success; // required
+
+    /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+    public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+      SUCCESS((short)0, "success");
+
+      private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+      static {
+        for (_Fields field : EnumSet.allOf(_Fields.class)) {
+          byName.put(field.getFieldName(), field);
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, or null if its not found.
+       */
+      public static _Fields findByThriftId(int fieldId) {
+        switch(fieldId) {
+          case 0: // SUCCESS
+            return SUCCESS;
+          default:
+            return null;
+        }
+      }
+
+      /**
+       * Find the _Fields constant that matches fieldId, throwing an exception
+       * if it is not found.
+       */
+      public static _Fields findByThriftIdOrThrow(int fieldId) {
+        _Fields fields = findByThriftId(fieldId);
+        if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+        return fields;
+      }
+
+      /**
+       * Find the _Fields constant that matches name, or null if its not found.
+       */
+      public static _Fields findByName(String name) {
+        return byName.get(name);
+      }
+
+      private final short _thriftId;
+      private final String _fieldName;
+
+      _Fields(short thriftId, String fieldName) {
+        _thriftId = thriftId;
+        _fieldName = fieldName;
+      }
+
+      public short getThriftFieldId() {
+        return _thriftId;
+      }
+
+      public String getFieldName() {
+        return _fieldName;
+      }
+    }
+
+    // isset id assignments
+    public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
+    static {
+      Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+      tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+          new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ServerSessionData.class)));
+      metaDataMap = Collections.unmodifiableMap(tmpMap);
+      org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(addSession_result.class, metaDataMap);
+    }
+
+    public addSession_result() {
+    }
+
+    public addSession_result(
+      ServerSessionData success)
+    {
+      this();
+      this.success = success;
+    }
+
+    /**
+     * Performs a deep copy on <i>other</i>.
+     */
+    public addSession_result(addSession_result other) {
+      if (other.isSetSuccess()) {
+        this.success = new ServerSessionData(other.success);
+      }
+    }
+
+    public addSession_result deepCopy() {
+      return new addSession_result(this);
+    }
+
+    @Override
+    public void clear() {
+      this.success = null;
+    }
+
+    public ServerSessionData getSuccess() {
+      return this.success;
+    }
+
+    public addSession_result setSuccess(ServerSessionData success) {
+      this.success = success;
+      return this;
+    }
+
+    public void unsetSuccess() {
+      this.success = null;
+    }
+
+    /** Returns true if field success is set (has been assigned a value) and false otherwise */
+    public boolean isSetSuccess() {
+      return this.success != null;
+    }
+
+    public void setSuccessIsSet(boolean value) {
+      if (!value) {
+        this.success = null;
+      }
+    }
+
+    public void setFieldValue(_Fields field, Object value) {
+      switch (field) {
+      case SUCCESS:
+        if (value == null) {
+          unsetSuccess();
+        } else {
+          setSuccess((ServerSessionData)value);
+        }
+        break;
+
+      }
+    }
+
+    public Object getFieldValue(_Fields field) {
+      switch (field) {
+      case SUCCESS:
+        return getSuccess();
+
+      }
+      throw new IllegalStateException();
+    }
+
+    /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+    public boolean isSet(_Fields field) {
+      if (field == null) {
+        throw new IllegalArgumentException();
+      }
+
+      switch (field) {
+      case SUCCESS:
+        return isSetSuccess();
+      }
+      throw new IllegalStateException();
+    }
+
+    @Override
+    public boolean equals(Object that) {
+      if (that == null)
+        return false;
+      if (that instanceof addSession_result)
+        return this.equals((addSession_result)that);
+      return false;
+    }
+
+    public boolean equals(addSession_result that) {
+      if (that == null)
+        return false;
+
+      boolean this_present_success = true && this.isSetSuccess();
+      boolean that_present_success = true && that.isSetSuccess();
+      if (this_present_success || that_present_success) {
+        if (!(this_present_success && that_present_success))
+          return false;
+        if (!this.success.equals(that.success))
+          return false;
+      }
+
+      return true;
+    }
+
+    @Override
+    public int hashCode() {
+      return 0;
+    }
+
+    @Override
+    public int compareTo(addSession_result other) {
+      if (!getClass().equals(other.getClass())) {
+        return getClass().getName().compareTo(other.getClass().getName());
+      }
+
+      int lastComparison = 0;
+
+      lastComparison = Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess());
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+      if (isSetSuccess()) {
+        lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.success, other.success);
+        if (lastComparison != 0) {
+          return lastComparison;
+        }
+      }
+      return 0;
+    }
+
+    public _Fields fieldForId(int fieldId) {
+      return _Fields.findByThriftId(fieldId);
+    }
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+      schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+      schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+      }
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder("addSession_result(");
+      boolean first = true;
+
+      sb.append("success:");
+      if (this.success == null) {
+        sb.append("null");
+      } else {
+        sb.append(this.success);
+      }
+      first = false;
+      sb.append(")");
+      return sb.toString();
+    }
+
+    public void validate() throws org.apache.thrift.TException {
+      // check for required fields
+      // check for sub-struct validity
+      if (success != null) {
+        success.validate();
+      }
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
+      try {
+        write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
+      try {
+        read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
+      } catch (org.apache.thrift.TException te) {
+        throw new java.io.IOException(te);
+      }
+    }
+
+    private static class addSession_resultStandardSchemeFactory implements SchemeFactory {
+      public addSession_resultStandardScheme getScheme() {
+        return new addSession_resultStandardScheme();
+      }
+    }
+
+    private static class addSession_resultStandardScheme extends StandardScheme<addSession_result> {
+
+      public void read(org.apache.thrift.protocol.TProtocol iprot, addSession_result struct) throws org.apache.thrift.TException {
+        org.apache.thrift.protocol.TField schemeField;
+        iprot.readStructBegin();
+        while (true)
+        {
+          schemeField = iprot.readFieldBegin();
+          if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+            break;
+          }
+          switch (schemeField.id) {
+            case 0: // SUCCESS
+              if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+                struct.success = new ServerSessionData();
+                struct.success.read(iprot);
+                struct.setSuccessIsSet(true);
+              } else { 
+                org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+              }
+              break;
+            default:
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+          }
+          iprot.readFieldEnd();
+        }
+        iprot.readStructEnd();
+
+        // check for required fields of primitive type, which can't be checked in the validate method
+        struct.validate();
+      }
+
+      public void write(org.apache.thrift.protocol.TProtocol oprot, addSession_result struct) throws org.apache.thrift.TException {
+        struct.validate();
+
+        oprot.writeStructBegin(STRUCT_DESC);
+        if (struct.success != null) {
+          oprot.writeFieldBegin(SUCCESS_FIELD_DESC);
+          struct.success.write(oprot);
+          oprot.writeFieldEnd();
+        }
+        oprot.writeFieldStop();
+        oprot.writeStructEnd();
+      }
+
+    }
+
+    private static class addSession_resultTupleSchemeFactory implements SchemeFactory {
+      public addSession_resultTupleScheme getScheme() {
+        return new addSession_resultTupleScheme();
+      }
+    }
+
+    private static class addSession_resultTupleScheme extends TupleScheme<addSession_result> {
+
+      @Override
+      public void write(org.apache.thrift.protocol.TProtocol prot, addSession_result struct) throws org.apache.thrift.TException {
+        TTupleProtocol oprot = (TTupleProtocol) prot;
+        BitSet optionals = new BitSet();
+        if (struct.isSetSuccess()) {
+          optionals.set(0);
+        }
+        oprot.writeBitSet(optionals, 1);
+        if (struct.isSetSuccess()) {
+          struct.success.write(oprot);
+        }
+      }
+
+      @Override
+      public void read(org.apache.thrift.protocol.TProtocol prot, addSession_result struct) throws org.apache.thrift.TException {
+        TTupleProtocol iprot = (TTupleProtocol) prot;
+        BitSet incoming = iprot.readBitSet(1);
+        if (incoming.get(0)) {
+          struct.success = new ServerSessionData();
+          struct.success.read(iprot);
+          struct.setSuccessIsSet(true);
+        }
+      }
+    }
+
+  }
+
 }
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/InvalidTokenException.java b/src/main/java/org/openslx/imagemaster/thrift/iface/InvalidTokenException.java
index 50a6e5d..e163c4f 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/InvalidTokenException.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/InvalidTokenException.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -15,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.protocol.TProtocolException;
 import org.apache.thrift.EncodingUtils;
 import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -30,7 +32,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class InvalidTokenException extends TException implements org.apache.thrift.TBase<InvalidTokenException, InvalidTokenException._Fields>, java.io.Serializable, Cloneable {
+public class InvalidTokenException extends TException implements org.apache.thrift.TBase<InvalidTokenException, InvalidTokenException._Fields>, java.io.Serializable, Cloneable, Comparable<InvalidTokenException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("InvalidTokenException");
 
 
@@ -163,13 +165,13 @@ public class InvalidTokenException extends TException implements org.apache.thri
     return 0;
   }
 
+  @Override
   public int compareTo(InvalidTokenException other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    InvalidTokenException typedOther = (InvalidTokenException)other;
 
     return 0;
   }
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/OrganizationData.java b/src/main/java/org/openslx/imagemaster/thrift/iface/OrganizationData.java
index f7cea30..2177c37 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/OrganizationData.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/OrganizationData.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -15,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.protocol.TProtocolException;
 import org.apache.thrift.EncodingUtils;
 import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -30,7 +32,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class OrganizationData implements org.apache.thrift.TBase<OrganizationData, OrganizationData._Fields>, java.io.Serializable, Cloneable {
+public class OrganizationData implements org.apache.thrift.TBase<OrganizationData, OrganizationData._Fields>, java.io.Serializable, Cloneable, Comparable<OrganizationData> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("OrganizationData");
 
   private static final org.apache.thrift.protocol.TField ORGANIZATION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("organizationId", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -163,10 +165,7 @@ public class OrganizationData implements org.apache.thrift.TBase<OrganizationDat
       this.ecpUrl = other.ecpUrl;
     }
     if (other.isSetSuffixList()) {
-      List<String> __this__suffixList = new ArrayList<String>();
-      for (String other_element : other.suffixList) {
-        __this__suffixList.add(other_element);
-      }
+      List<String> __this__suffixList = new ArrayList<String>(other.suffixList);
       this.suffixList = __this__suffixList;
     }
   }
@@ -425,50 +424,50 @@ public class OrganizationData implements org.apache.thrift.TBase<OrganizationDat
     return 0;
   }
 
+  @Override
   public int compareTo(OrganizationData other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    OrganizationData typedOther = (OrganizationData)other;
 
-    lastComparison = Boolean.valueOf(isSetOrganizationId()).compareTo(typedOther.isSetOrganizationId());
+    lastComparison = Boolean.valueOf(isSetOrganizationId()).compareTo(other.isSetOrganizationId());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetOrganizationId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.organizationId, typedOther.organizationId);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.organizationId, other.organizationId);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetDisplayName()).compareTo(typedOther.isSetDisplayName());
+    lastComparison = Boolean.valueOf(isSetDisplayName()).compareTo(other.isSetDisplayName());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetDisplayName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.displayName, typedOther.displayName);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.displayName, other.displayName);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetEcpUrl()).compareTo(typedOther.isSetEcpUrl());
+    lastComparison = Boolean.valueOf(isSetEcpUrl()).compareTo(other.isSetEcpUrl());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetEcpUrl()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ecpUrl, typedOther.ecpUrl);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ecpUrl, other.ecpUrl);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetSuffixList()).compareTo(typedOther.isSetSuffixList());
+    lastComparison = Boolean.valueOf(isSetSuffixList()).compareTo(other.isSetSuffixList());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetSuffixList()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.suffixList, typedOther.suffixList);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.suffixList, other.suffixList);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -598,7 +597,7 @@ public class OrganizationData implements org.apache.thrift.TBase<OrganizationDat
                 struct.suffixList = new ArrayList<String>(_list0.size);
                 for (int _i1 = 0; _i1 < _list0.size; ++_i1)
                 {
-                  String _elem2; // required
+                  String _elem2;
                   _elem2 = iprot.readString();
                   struct.suffixList.add(_elem2);
                 }
@@ -724,7 +723,7 @@ public class OrganizationData implements org.apache.thrift.TBase<OrganizationDat
           struct.suffixList = new ArrayList<String>(_list5.size);
           for (int _i6 = 0; _i6 < _list5.size; ++_i6)
           {
-            String _elem7; // required
+            String _elem7;
             _elem7 = iprot.readString();
             struct.suffixList.add(_elem7);
           }
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/ServerSessionData.java b/src/main/java/org/openslx/imagemaster/thrift/iface/ServerSessionData.java
index ce5482a..8f8893a 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/ServerSessionData.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/ServerSessionData.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -15,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.protocol.TProtocolException;
 import org.apache.thrift.EncodingUtils;
 import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -30,7 +32,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class ServerSessionData implements org.apache.thrift.TBase<ServerSessionData, ServerSessionData._Fields>, java.io.Serializable, Cloneable {
+public class ServerSessionData implements org.apache.thrift.TBase<ServerSessionData, ServerSessionData._Fields>, java.io.Serializable, Cloneable, Comparable<ServerSessionData> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ServerSessionData");
 
   private static final org.apache.thrift.protocol.TField SESSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("sessionId", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -228,20 +230,20 @@ public class ServerSessionData implements org.apache.thrift.TBase<ServerSessionD
     return 0;
   }
 
+  @Override
   public int compareTo(ServerSessionData other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    ServerSessionData typedOther = (ServerSessionData)other;
 
-    lastComparison = Boolean.valueOf(isSetSessionId()).compareTo(typedOther.isSetSessionId());
+    lastComparison = Boolean.valueOf(isSetSessionId()).compareTo(other.isSetSessionId());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetSessionId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sessionId, typedOther.sessionId);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sessionId, other.sessionId);
       if (lastComparison != 0) {
         return lastComparison;
       }
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/SessionData.java b/src/main/java/org/openslx/imagemaster/thrift/iface/SessionData.java
index a1a30e1..711abeb 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/SessionData.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/SessionData.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -15,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.protocol.TProtocolException;
 import org.apache.thrift.EncodingUtils;
 import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -30,7 +32,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class SessionData implements org.apache.thrift.TBase<SessionData, SessionData._Fields>, java.io.Serializable, Cloneable {
+public class SessionData implements org.apache.thrift.TBase<SessionData, SessionData._Fields>, java.io.Serializable, Cloneable, Comparable<SessionData> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SessionData");
 
   private static final org.apache.thrift.protocol.TField SESSION_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("sessionId", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -346,40 +348,40 @@ public class SessionData implements org.apache.thrift.TBase<SessionData, Session
     return 0;
   }
 
+  @Override
   public int compareTo(SessionData other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    SessionData typedOther = (SessionData)other;
 
-    lastComparison = Boolean.valueOf(isSetSessionId()).compareTo(typedOther.isSetSessionId());
+    lastComparison = Boolean.valueOf(isSetSessionId()).compareTo(other.isSetSessionId());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetSessionId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sessionId, typedOther.sessionId);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.sessionId, other.sessionId);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetAuthToken()).compareTo(typedOther.isSetAuthToken());
+    lastComparison = Boolean.valueOf(isSetAuthToken()).compareTo(other.isSetAuthToken());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetAuthToken()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.authToken, typedOther.authToken);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.authToken, other.authToken);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetServerAddress()).compareTo(typedOther.isSetServerAddress());
+    lastComparison = Boolean.valueOf(isSetServerAddress()).compareTo(other.isSetServerAddress());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetServerAddress()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverAddress, typedOther.serverAddress);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.serverAddress, other.serverAddress);
       if (lastComparison != 0) {
         return lastComparison;
       }
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/UploadData.java b/src/main/java/org/openslx/imagemaster/thrift/iface/UploadData.java
index 45a589e..314920e 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/UploadData.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/UploadData.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -15,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.protocol.TProtocolException;
 import org.apache.thrift.EncodingUtils;
 import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -30,7 +32,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class UploadData implements org.apache.thrift.TBase<UploadData, UploadData._Fields>, java.io.Serializable, Cloneable {
+public class UploadData implements org.apache.thrift.TBase<UploadData, UploadData._Fields>, java.io.Serializable, Cloneable, Comparable<UploadData> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UploadData");
 
   private static final org.apache.thrift.protocol.TField TOKEN_FIELD_DESC = new org.apache.thrift.protocol.TField("token", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -289,30 +291,30 @@ public class UploadData implements org.apache.thrift.TBase<UploadData, UploadDat
     return 0;
   }
 
+  @Override
   public int compareTo(UploadData other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    UploadData typedOther = (UploadData)other;
 
-    lastComparison = Boolean.valueOf(isSetToken()).compareTo(typedOther.isSetToken());
+    lastComparison = Boolean.valueOf(isSetToken()).compareTo(other.isSetToken());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetToken()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, typedOther.token);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.token, other.token);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetPort()).compareTo(typedOther.isSetPort());
+    lastComparison = Boolean.valueOf(isSetPort()).compareTo(other.isSetPort());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetPort()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.port, typedOther.port);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.port, other.port);
       if (lastComparison != 0) {
         return lastComparison;
       }
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/UploadError.java b/src/main/java/org/openslx/imagemaster/thrift/iface/UploadError.java
index bcac7e1..963ff1c 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/UploadError.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/UploadError.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/UploadException.java b/src/main/java/org/openslx/imagemaster/thrift/iface/UploadException.java
index eeaee66..bc4c150 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/UploadException.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/UploadException.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -15,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.protocol.TProtocolException;
 import org.apache.thrift.EncodingUtils;
 import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -30,7 +32,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class UploadException extends TException implements org.apache.thrift.TBase<UploadException, UploadException._Fields>, java.io.Serializable, Cloneable {
+public class UploadException extends TException implements org.apache.thrift.TBase<UploadException, UploadException._Fields>, java.io.Serializable, Cloneable, Comparable<UploadException> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UploadException");
 
   private static final org.apache.thrift.protocol.TField NUMBER_FIELD_DESC = new org.apache.thrift.protocol.TField("number", org.apache.thrift.protocol.TType.I32, (short)1);
@@ -303,30 +305,30 @@ public class UploadException extends TException implements org.apache.thrift.TBa
     return 0;
   }
 
+  @Override
   public int compareTo(UploadException other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    UploadException typedOther = (UploadException)other;
 
-    lastComparison = Boolean.valueOf(isSetNumber()).compareTo(typedOther.isSetNumber());
+    lastComparison = Boolean.valueOf(isSetNumber()).compareTo(other.isSetNumber());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetNumber()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.number, typedOther.number);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.number, other.number);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(typedOther.isSetMessage());
+    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(other.isSetMessage());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetMessage()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, typedOther.message);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.message, other.message);
       if (lastComparison != 0) {
         return lastComparison;
       }
diff --git a/src/main/java/org/openslx/imagemaster/thrift/iface/UserInfo.java b/src/main/java/org/openslx/imagemaster/thrift/iface/UserInfo.java
index d5c3a69..2d9581b 100644
--- a/src/main/java/org/openslx/imagemaster/thrift/iface/UserInfo.java
+++ b/src/main/java/org/openslx/imagemaster/thrift/iface/UserInfo.java
@@ -1,5 +1,5 @@
 /**
- * Autogenerated by Thrift Compiler (0.9.0)
+ * Autogenerated by Thrift Compiler (0.9.1)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -15,6 +15,8 @@ import org.apache.thrift.protocol.TTupleProtocol;
 import org.apache.thrift.protocol.TProtocolException;
 import org.apache.thrift.EncodingUtils;
 import org.apache.thrift.TException;
+import org.apache.thrift.async.AsyncMethodCallback;
+import org.apache.thrift.server.AbstractNonblockingServer.*;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -30,7 +32,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fields>, java.io.Serializable, Cloneable {
+public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fields>, java.io.Serializable, Cloneable, Comparable<UserInfo> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UserInfo");
 
   private static final org.apache.thrift.protocol.TField USER_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("userId", org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -464,60 +466,60 @@ public class UserInfo implements org.apache.thrift.TBase<UserInfo, UserInfo._Fie
     return 0;
   }
 
+  @Override
   public int compareTo(UserInfo other) {
     if (!getClass().equals(other.getClass())) {
       return getClass().getName().compareTo(other.getClass().getName());
     }
 
     int lastComparison = 0;
-    UserInfo typedOther = (UserInfo)other;
 
-    lastComparison = Boolean.valueOf(isSetUserId()).compareTo(typedOther.isSetUserId());
+    lastComparison = Boolean.valueOf(isSetUserId()).compareTo(other.isSetUserId());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetUserId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.userId, typedOther.userId);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.userId, other.userId);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetFirstName()).compareTo(typedOther.isSetFirstName());
+    lastComparison = Boolean.valueOf(isSetFirstName()).compareTo(other.isSetFirstName());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetFirstName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.firstName, typedOther.firstName);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.firstName, other.firstName);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetLastName()).compareTo(typedOther.isSetLastName());
+    lastComparison = Boolean.valueOf(isSetLastName()).compareTo(other.isSetLastName());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetLastName()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lastName, typedOther.lastName);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.lastName, other.lastName);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetEMail()).compareTo(typedOther.isSetEMail());
+    lastComparison = Boolean.valueOf(isSetEMail()).compareTo(other.isSetEMail());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetEMail()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.eMail, typedOther.eMail);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.eMail, other.eMail);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetOrganizationId()).compareTo(typedOther.isSetOrganizationId());
+    lastComparison = Boolean.valueOf(isSetOrganizationId()).compareTo(other.isSetOrganizationId());
     if (lastComparison != 0) {
       return lastComparison;
     }
     if (isSetOrganizationId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.organizationId, typedOther.organizationId);
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.organizationId, other.organizationId);
       if (lastComparison != 0) {
         return lastComparison;
       }